]>
Commit | Line | Data |
---|---|---|
a4455ba2 MB |
1 | diff -up ConsoleKit-0.4.1/src/main.c.reorder-initialization ConsoleKit-0.4.1/src/main.c |
2 | --- ConsoleKit-0.4.1/src/main.c.reorder-initialization 2009-12-18 14:51:38.821212946 -0500 | |
3 | +++ ConsoleKit-0.4.1/src/main.c 2009-12-18 14:52:19.246211176 -0500 | |
4 | @@ -294,11 +294,19 @@ main (int argc, | |
5 | ||
6 | setup_debug_log (debug); | |
7 | ||
8 | + g_debug ("initializing console-kit-daemon %s", VERSION); | |
9 | + | |
10 | connection = get_system_bus (); | |
11 | if (connection == NULL) { | |
12 | goto out; | |
13 | } | |
14 | ||
15 | + manager = ck_manager_new (); | |
16 | + | |
17 | + if (manager == NULL) { | |
18 | + goto out; | |
19 | + } | |
20 | + | |
21 | bus_proxy = get_bus_proxy (connection); | |
22 | if (bus_proxy == NULL) { | |
23 | g_warning ("Could not construct bus_proxy object; bailing out"); | |
24 | @@ -310,16 +318,8 @@ main (int argc, | |
25 | goto out; | |
26 | } | |
27 | ||
28 | - g_debug ("initializing console-kit-daemon %s", VERSION); | |
29 | - | |
30 | create_pid_file (); | |
31 | ||
32 | - manager = ck_manager_new (); | |
33 | - | |
34 | - if (manager == NULL) { | |
35 | - goto out; | |
36 | - } | |
37 | - | |
38 | loop = g_main_loop_new (NULL, FALSE); | |
39 | ||
40 | g_signal_connect (bus_proxy, |