packages: ConsoleKit/ConsoleKit-reorder-initialization.patch (NEW) - don't ...

megabajt megabajt at pld-linux.org
Wed Mar 17 08:46:35 CET 2010


Author: megabajt                     Date: Wed Mar 17 07:46:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't take bus name until ready (https://bugs.freedesktop.org/show_bug.cgi?id=25744)

---- Files affected:
packages/ConsoleKit:
   ConsoleKit-reorder-initialization.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ConsoleKit/ConsoleKit-reorder-initialization.patch
diff -u /dev/null packages/ConsoleKit/ConsoleKit-reorder-initialization.patch:1.1
--- /dev/null	Wed Mar 17 08:46:35 2010
+++ packages/ConsoleKit/ConsoleKit-reorder-initialization.patch	Wed Mar 17 08:46:30 2010
@@ -0,0 +1,40 @@
+diff -up ConsoleKit-0.4.1/src/main.c.reorder-initialization ConsoleKit-0.4.1/src/main.c
+--- ConsoleKit-0.4.1/src/main.c.reorder-initialization	2009-12-18 14:51:38.821212946 -0500
++++ ConsoleKit-0.4.1/src/main.c	2009-12-18 14:52:19.246211176 -0500
+@@ -294,11 +294,19 @@ main (int    argc,
+ 
+         setup_debug_log (debug);
+ 
++        g_debug ("initializing console-kit-daemon %s", VERSION);
++
+         connection = get_system_bus ();
+         if (connection == NULL) {
+                 goto out;
+         }
+ 
++        manager = ck_manager_new ();
++
++        if (manager == NULL) {
++                goto out;
++        }
++
+         bus_proxy = get_bus_proxy (connection);
+         if (bus_proxy == NULL) {
+                 g_warning ("Could not construct bus_proxy object; bailing out");
+@@ -310,16 +318,8 @@ main (int    argc,
+                 goto out;
+         }
+ 
+-        g_debug ("initializing console-kit-daemon %s", VERSION);
+-
+         create_pid_file ();
+ 
+-        manager = ck_manager_new ();
+-
+-        if (manager == NULL) {
+-                goto out;
+-        }
+-
+         loop = g_main_loop_new (NULL, FALSE);
+ 
+         g_signal_connect (bus_proxy,
================================================================


More information about the pld-cvs-commit mailing list