diff options
author | James Meyer <james.meyer@operamail.com> | 2010-09-08 07:33:44 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2010-09-08 07:33:44 (GMT) |
commit | 525753e4a1a139e088d8ac120b19fbab6c0aaaa6 (patch) | |
tree | 35cef28abb613da4f58e83f6abbe4bd4cfa244bf /abs/extra-testing/consolekit/reorder-initialization.patch | |
parent | 592e3cad43ef12c53f523145d0fd981b54f2a049 (diff) | |
parent | b172f79fadb565ecfbcec9508f9377d8618a4f4c (diff) | |
download | linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.zip linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.tar.gz linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.tar.bz2 |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/extra-testing/consolekit/reorder-initialization.patch')
-rw-r--r-- | abs/extra-testing/consolekit/reorder-initialization.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/abs/extra-testing/consolekit/reorder-initialization.patch b/abs/extra-testing/consolekit/reorder-initialization.patch new file mode 100644 index 0000000..f65abd5 --- /dev/null +++ b/abs/extra-testing/consolekit/reorder-initialization.patch @@ -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, |