rpms/libbonobo/F-9 libbonobo-2.22.0-get-on-d-bus.patch, NONE, 1.1 libbonobo.spec, 1.73, 1.74

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/libbonobo/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20291

Modified Files:
	libbonobo.spec 
Added Files:
	libbonobo-2.22.0-get-on-d-bus.patch 
Log Message:
- Take name on message bus to tie activation server to desktop session


libbonobo-2.22.0-get-on-d-bus.patch:

--- NEW FILE libbonobo-2.22.0-get-on-d-bus.patch ---
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
--- libbonobo-2.22.0/activation-server/activation-server-main.c.get-on-d-bus	2008-04-29 14:18:57.000000000 -0400
+++ libbonobo-2.22.0/activation-server/activation-server-main.c	2008-04-29 14:19:00.000000000 -0400
@@ -54,6 +54,8 @@
 
 #include <glib/gstdio.h>
 
+#include <dbus/dbus-glib-lowlevel.h>
+
 static gboolean        server_threaded = FALSE;
 static glong           server_guard_depth = 0;
 static GStaticRecMutex server_guard = G_STATIC_REC_MUTEX_INIT;
@@ -398,6 +400,8 @@ main (int argc, char *argv[])
 	const gchar                  *debug_output_env;
 #endif
 	GError                       *error = NULL;
+        DBusConnection               *connection;
+        DBusError                     bus_error;
 
 #ifdef HAVE_SETSID
         /*
@@ -535,6 +539,18 @@ main (int argc, char *argv[])
 
 	od_finished_internal_registration (); 
 
+        dbus_error_init (&bus_error);
+        connection = dbus_bus_get (DBUS_BUS_SESSION, &bus_error);
+
+        if (dbus_error_is_set (&bus_error)) {
+                g_warning ("could not associate with desktop session: %s",
+                           bus_error.message);
+                connection = NULL;
+        } else {
+                dbus_connection_setup_with_g_main (connection,
+                                                   g_main_loop_get_context (main_loop));
+        }
+
         if (getenv ("BONOBO_ACTIVATION_DEBUG") == NULL)
                 chdir ("/");
 
diff -up libbonobo-2.22.0/configure.in.get-on-d-bus libbonobo-2.22.0/configure.in
--- libbonobo-2.22.0/configure.in.get-on-d-bus	2008-04-29 14:18:47.000000000 -0400
+++ libbonobo-2.22.0/configure.in	2008-04-29 14:19:06.000000000 -0400
@@ -121,6 +121,8 @@ PKG_CHECK_MODULES(SERVER, \
 	gmodule-2.0 >= 2.0.1 \
 	ORBit-2.0 >= 2.4.0 \
 	ORBit-CosNaming-2.0 >= 2.4.0 \
+	dbus-1 >= 1.0.0 \
+	dbus-glib-1 >= 0.74 \
 	libxml-2.0 >= 2.4.20)
 AC_SUBST(SERVER_LIBS)
 AC_SUBST(SERVER_CFLAGS)


Index: libbonobo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbonobo/F-9/libbonobo.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- libbonobo.spec	10 Mar 2008 21:56:25 -0000	1.73
+++ libbonobo.spec	29 Apr 2008 18:44:59 -0000	1.74
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.22.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://ftp.gnome.org
 Source0: http://download.gnome.org/sources/libbonobo/2.22/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -26,6 +26,7 @@
 Provides: bonobo-activation = %{version}-%{release}
 
 Patch0: libbonobo-2.13.1-multishlib.patch
+Patch1: libbonobo-2.22.0-get-on-d-bus.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -58,6 +59,8 @@
 %patch0 -p1 -b .multishlib
 %endif
 
+%patch1 -p1 -b .get-on-d-bus
+
 %build
 intltoolize -f
 aclocal
@@ -122,6 +125,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Tue Apr 29 2008 Ray Strode <rstrode at redhat.com> - 2.22.0-2
+- Take name on message bus to tie activation server to desktop session
+
 * Mon Mar 10 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-1
 - Update to 2.22.0