and remove popr set that should be in 0.1 sec timeout.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@68700 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 57a9756..4a1935c 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -250,7 +250,7 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_transit.h> // OK
 #include <elm_video.h> // XXX: needs work. see elm_video.h
 #include <elm_web.h>
-#include <elm_win.h>
+#include <elm_win.h> // OK
 
 /* include deprecated calls last of all */
 #include <elm_deprecated.h>

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 865f5ac..1b2407c 100644 (file)
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -1413,10 +1413,6 @@ elm_config_all_flush(void)
 #ifdef HAVE_ELEMENTARY_X
    if (_prop_all_update_timer) ecore_timer_del(_prop_all_update_timer);
    _prop_all_update_timer = ecore_timer_add(0.1, _prop_all_update_cb, NULL);
-   //FIXME: below two lines looks unnecessary.
-   _prop_config_set();
-   ecore_x_window_prop_string_set(_root_1st, _atom[ATOM_E_PROFILE],
-                                  _elm_profile);
 #endif
 }
 
@@ -1592,9 +1588,9 @@ _elm_config_shutdown(void)
    if (_prop_all_update_timer)
      {
         ecore_timer_del(_prop_all_update_timer);
+        _prop_all_update_timer = NULL;
         _prop_all_update_cb(NULL);
      }
-   _prop_all_update_timer = NULL;
    if (_prop_change_delay_timer) ecore_timer_del(_prop_change_delay_timer);
    _prop_change_delay_timer = NULL;
 #endif