[Galago-commits] r2938 - in trunk/notification-daemon: . src/daemon

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-11-05 12:14:42 -0800 (Sun, 05 Nov 2006)
New Revision: 2938

Modified:
   trunk/notification-daemon/AUTHORS
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/daemon/Makefile.am
   trunk/notification-daemon/src/daemon/daemon.c
Log:
Patch by Pawel Worach to fix the dbus-binding-tool usage to be compatible with dbus-glib 0.72. This closes bug #95.


Modified: trunk/notification-daemon/AUTHORS
===================================================================
--- trunk/notification-daemon/AUTHORS	2006-11-05 20:07:37 UTC (rev 2937)
+++ trunk/notification-daemon/AUTHORS	2006-11-05 20:14:42 UTC (rev 2938)
@@ -6,6 +6,7 @@
 	Rodney Dawes <dobey at novell.com>
 	felix at hsgheli.de
 	Ed Catmur <ed at catmur.co.uk>
+	Pawel Worach <pawel.worach at gmail.com>
 
 Translators:
 	Dutch - Wouter Bolsterlee <uws+gnome at xs4all.nl>

Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-11-05 20:07:37 UTC (rev 2937)
+++ trunk/notification-daemon/ChangeLog	2006-11-05 20:14:42 UTC (rev 2938)
@@ -1,3 +1,10 @@
+Sun Nov 05 12:12:35 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/daemon/Makefile.am:
+	* src/daemon/daemon.c:
+	  - Patch by Pawel Worach to fix the dbus-binding-tool usage to be
+	    compatible with dbus-glib 0.72. This closes bug #95.
+
 Sun Oct 08 17:10:57 EDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	A src/daemon:

Modified: trunk/notification-daemon/src/daemon/Makefile.am
===================================================================
--- trunk/notification-daemon/src/daemon/Makefile.am	2006-11-05 20:07:37 UTC (rev 2937)
+++ trunk/notification-daemon/src/daemon/Makefile.am	2006-11-05 20:14:42 UTC (rev 2938)
@@ -13,7 +13,7 @@
 BUILT_SOURCES = notificationdaemon-dbus-glue.h
 
 notificationdaemon-dbus-glue.h: notificationdaemon.xml
-	dbus-binding-tool --mode=glib-server \
+	dbus-binding-tool --mode=glib-server --prefix=notification_daemon \
 		$(srcdir)/notificationdaemon.xml > notificationdaemon-dbus-glue.h
 
 INCLUDES = \

Modified: trunk/notification-daemon/src/daemon/daemon.c
===================================================================
--- trunk/notification-daemon/src/daemon/daemon.c	2006-11-05 20:07:37 UTC (rev 2937)
+++ trunk/notification-daemon/src/daemon/daemon.c	2006-11-05 20:14:42 UTC (rev 2938)
@@ -1089,7 +1089,7 @@
 	dbus_conn = dbus_g_connection_get_connection(connection);
 
 	dbus_g_object_type_install_info(NOTIFY_TYPE_DAEMON,
-									&dbus_glib__object_info);
+									&dbus_glib_notification_daemon_object_info);
 
 	bus_proxy = dbus_g_proxy_new_for_name(connection,
 										  "org.freedesktop.DBus",