1 |
remi 08/09/13 13:36:28 |
2 |
|
3 |
Added: libbonobo-2.22.0-quit-with-dbus-session.patch |
4 |
Log: |
5 |
gnome-base/libbonobo: attach bonobo to dbus session bus (fixes bug #236864), move flex to DEPEND |
6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r3 i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 gnome-base/libbonobo/files/libbonobo-2.22.0-quit-with-dbus-session.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/libbonobo/files/libbonobo-2.22.0-quit-with-dbus-session.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/libbonobo/files/libbonobo-2.22.0-quit-with-dbus-session.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: libbonobo-2.22.0-quit-with-dbus-session.patch |
15 |
=================================================================== |
16 |
diff -up libbonobo-2.22.0/activation-server/activation-server-main.c.get-on-d-bus libbonobo-2.22.0/activation-server/activation-server-main.c |
17 |
--- libbonobo-2.22.0/activation-server/activation-server-main.c.get-on-d-bus 2008-04-29 14:18:57.000000000 -0400 |
18 |
+++ libbonobo-2.22.0/activation-server/activation-server-main.c 2008-04-29 14:19:00.000000000 -0400 |
19 |
@@ -54,6 +54,8 @@ |
20 |
|
21 |
#include <glib/gstdio.h> |
22 |
|
23 |
+#include <dbus/dbus-glib-lowlevel.h> |
24 |
+ |
25 |
static gboolean server_threaded = FALSE; |
26 |
static glong server_guard_depth = 0; |
27 |
static GStaticRecMutex server_guard = G_STATIC_REC_MUTEX_INIT; |
28 |
@@ -398,6 +400,8 @@ main (int argc, char *argv[]) |
29 |
const gchar *debug_output_env; |
30 |
#endif |
31 |
GError *error = NULL; |
32 |
+ DBusConnection *connection; |
33 |
+ DBusError bus_error; |
34 |
|
35 |
#ifdef HAVE_SETSID |
36 |
/* |
37 |
@@ -535,6 +539,18 @@ main (int argc, char *argv[]) |
38 |
|
39 |
od_finished_internal_registration (); |
40 |
|
41 |
+ dbus_error_init (&bus_error); |
42 |
+ connection = dbus_bus_get (DBUS_BUS_SESSION, &bus_error); |
43 |
+ |
44 |
+ if (dbus_error_is_set (&bus_error)) { |
45 |
+ g_warning ("could not associate with desktop session: %s", |
46 |
+ bus_error.message); |
47 |
+ connection = NULL; |
48 |
+ } else { |
49 |
+ dbus_connection_setup_with_g_main (connection, |
50 |
+ g_main_loop_get_context (main_loop)); |
51 |
+ } |
52 |
+ |
53 |
if (getenv ("BONOBO_ACTIVATION_DEBUG") == NULL) |
54 |
chdir ("/"); |
55 |
|
56 |
diff -up libbonobo-2.22.0/configure.in.get-on-d-bus libbonobo-2.22.0/configure.in |
57 |
--- libbonobo-2.22.0/configure.in.get-on-d-bus 2008-04-29 14:18:47.000000000 -0400 |
58 |
+++ libbonobo-2.22.0/configure.in 2008-04-29 14:19:06.000000000 -0400 |
59 |
@@ -121,6 +121,8 @@ PKG_CHECK_MODULES(SERVER, \ |
60 |
gmodule-2.0 >= 2.0.1 \ |
61 |
ORBit-2.0 >= 2.4.0 \ |
62 |
ORBit-CosNaming-2.0 >= 2.4.0 \ |
63 |
+ dbus-1 >= 1.0.0 \ |
64 |
+ dbus-glib-1 >= 0.74 \ |
65 |
libxml-2.0 >= 2.4.20) |
66 |
AC_SUBST(SERVER_LIBS) |
67 |
AC_SUBST(SERVER_CFLAGS) |