summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-05-02 08:29:20 +0000
committerDaniel Willmann <d.willmann@samsung.com>2013-02-15 14:26:39 +0000
commita0dbc4e0c6d7ae765a7be8474e6b3e2f659b232c (patch)
tree70bda85e99b119918c1cc1c81233be6b5c8e2b9d
parent0b2ec7e05687da0fe8b270048cf917a3e804106f (diff)
downloadelementary-a0dbc4e0c6d7ae765a7be8474e6b3e2f659b232c.tar.gz
backport fix.
SVN revision: 70616
-rw-r--r--ChangeLog7
-rw-r--r--src/lib/elm_config.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ae5cc216e..7c2760fe9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@
* Genlist : Realize move items during tree effect only when the item is
not in the queue.
-2012-04-30 Jérôme Pinot
+2012-04-30 Jérôme Pinot
* Add missing files in the tarballs.
+
+2012-05-02 Carsten Haitzler (The Rasterman)
+
+ * Fix possible problems with other subsystems depending on X11 display
+ being closed (XCloseDisplay not close() on socket fd).
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index f8665ff7e..0c953bec4 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -2054,7 +2054,7 @@ _elm_config_sub_shutdown(void)
#undef ENGINE_COMPARE
{
#ifdef HAVE_ELEMENTARY_X
- ecore_x_disconnect();
+ ecore_x_shutdown();
#endif
}
}