rpms/ConsoleKit/F-12 reorder-initialization.patch, NONE, 1.1 ConsoleKit.spec, 1.51, 1.52

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/ConsoleKit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19091

Modified Files:
	ConsoleKit.spec 
Added Files:
	reorder-initialization.patch 
Log Message:
- Register object methods with dbus-glib before taking bus name
  (may fix 545267)


reorder-initialization.patch:
 main.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE reorder-initialization.patch ---
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,


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/F-12/ConsoleKit.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ConsoleKit.spec	15 Dec 2009 18:37:18 -0000	1.51
+++ ConsoleKit.spec	18 Dec 2009 20:43:11 -0000	1.52
@@ -6,7 +6,7 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -27,6 +27,7 @@ BuildRequires: automake, autoconf, libto
 
 # https://bugs.freedesktop.org/show_bug.cgi?id=25656
 Patch0: nodaemon.patch
+Patch1: reorder-initialization.patch
 
 %description
 ConsoleKit is a system daemon for tracking what users are logged
@@ -83,6 +84,7 @@ This package contains developer document
 %prep
 %setup -q
 %patch0 -p1 -b .nodaemon
+%patch1 -p1 -b .reorder-initialization
 
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
@@ -170,6 +172,10 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Fri Dec 18 2009 Ray Strode <rstrode at redhat.com> 0.4.1-3
+- Register object methods with dbus-glib before taking bus name
+  (may fix 545267)
+
 * Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 0.4.1-2
 - Don't daemonize when activated on the bus