[EGIT] [core/enlightenment] enlightenment-0.17 28/85: gtk rcfiles atom should only be triggered on first startup

[Mike Blumenkrantz]

cedric pushed a commit to branch enlightenment-0.17.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=8e23f8cbef0c9bc2d956e2f625e3ae165cd9d35c

commit 8e23f8cbef0c9bc2d956e2f625e3ae165cd9d35c
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Fri May 9 22:43:51 2014 -0400

    gtk rcfiles atom should only be triggered on first startup
---
 src/bin/e_xsettings.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_xsettings.c b/src/bin/e_xsettings.c
index 3b3338d..72811ee 100644
--- a/src/bin/e_xsettings.c
+++ b/src/bin/e_xsettings.c
@@ -430,7 +430,6 @@ _e_xsettings_error_cb(void *data, Eio_File *handler 
__UNUSED__, int error __UNUS
    else
      _e_xsettings_string_set(_setting_theme_name, NULL);
    _e_xsettings_update();
-   _e_xsettings_gtk_rcfiles_update();
 }
 
 static void
@@ -447,7 +446,6 @@ _e_xsettings_done_cb(void *data __UNUSED__, Eio_File 
*handler __UNUSED__, const
    eio_op = NULL;
    setting = EINA_FALSE;
    _e_xsettings_update();
-   _e_xsettings_gtk_rcfiles_update();
 }
 
 static void
@@ -630,7 +628,11 @@ e_xsettings_init(void)
    _atom_gtk_rcfiles = ecore_x_atom_get("_GTK_READ_RCFILES");
 
    if (e_config->xsettings.enabled)
-     _e_xsettings_start();
+     {
+        _e_xsettings_start();
+        if (!getenv("E_RESTART"))
+          _e_xsettings_gtk_rcfiles_update();
+     }
 
    return 1;
 }
@@ -669,7 +671,6 @@ e_xsettings_config_update(void)
         _e_xsettings_font_set();
         _e_xsettings_update();
         _e_xsettings_gtk_icon_update();
-        _e_xsettings_gtk_rcfiles_update();
         reset = EINA_TRUE;
      }
    event_ignore++;

--