aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormallum <mallum@b067294f-1dea-0310-9683-c47a78595994>2006-07-27 19:38:28 +0000
committermallum <mallum@b067294f-1dea-0310-9683-c47a78595994>2006-07-27 19:38:28 +0000
commite71f2fa4406b35c4d14f37526c8aeeb47b77ba41 (patch)
tree9ccd5ba3ef4490eebd64721536cd156fdef53554
parentcd55fb76cef69b378b9acd7a2c2fa1decdb4694d (diff)
downloadxsettings-daemon-e71f2fa4406b35c4d14f37526c8aeeb47b77ba41.tar.gz
xsettings-daemon-e71f2fa4406b35c4d14f37526c8aeeb47b77ba41.tar.bz2
xsettings-daemon-e71f2fa4406b35c4d14f37526c8aeeb47b77ba41.zip
2006-07-27 Matthew Allum <mallum@openedhand.com>
* settings-daemon.c: (main): fork before calling gtk_init() git-svn-id: https://svn.o-hand.com/repos/matchbox/trunk/settings-daemon@1366 b067294f-1dea-0310-9683-c47a78595994
-rw-r--r--ChangeLog5
-rw-r--r--settings-daemon.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index dcce365..f1dfa5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-27 Matthew Allum <mallum@openedhand.com>
+
+ * settings-daemon.c: (main):
+ fork before calling gtk_init()
+
2005-10-14 Ross Burton <ross@burtonini.com>
* settings-daemon.c:
diff --git a/settings-daemon.c b/settings-daemon.c
index c3e67dd..434ad78 100644
--- a/settings-daemon.c
+++ b/settings-daemon.c
@@ -660,9 +660,6 @@ main(int argc, char **argv)
int i, n_screens;
pid_t p;
- g_type_init();
- gdk_init(&argc, &argv);
-
if (!(argc > 1 && !strcmp(argv[1],"-n")))
{
@@ -688,6 +685,8 @@ main(int argc, char **argv)
}
}
+ gdk_init(&argc, &argv);
+
loop = g_main_loop_new(NULL, FALSE);
display = gdk_display_get_default ();