rpms/gossip/devel gossip-dbus.patch,NONE,1.1 gossip.spec,1.2,1.3

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/gossip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14531/devel

Modified Files:
	gossip.spec 
Added Files:
	gossip-dbus.patch 
Log Message:
auto-import gossip-0.8-5 on branch devel from gossip-0.8-5.src.rpm

gossip-dbus.patch:

--- NEW FILE gossip-dbus.patch ---
diff -ru gossip-0.8.orig/src/gossip-dbus.c gossip-0.8/src/gossip-dbus.c
--- gossip-0.8.orig/src/gossip-dbus.c	2004-08-19 15:53:18.000000000 -0400
+++ gossip-0.8/src/gossip-dbus.c	2005-05-23 13:55:47.000000000 -0400
@@ -58,7 +58,7 @@
 		return FALSE;
   }
 
-	dbus_bus_acquire_service (bus, GOSSIP_SERVICE, 0, &error);
+	dbus_bus_request_name (bus, GOSSIP_SERVICE, 0, &error);
 	if (dbus_error_is_set (&error)) {
 		g_warning ("Failed to acquire gossip service.");
 		dbus_error_free (&error);
@@ -105,9 +105,9 @@
 	
 	dbus_message_iter_init (message, &iter);
 
-	show = dbus_message_iter_get_uint32 (&iter);
+	dbus_message_iter_get_basic (&iter, &show);
 	if (dbus_message_iter_next (&iter)) {
-		status = dbus_message_iter_get_string (&iter);
+		dbus_message_iter_get_basic (&iter, &status);
 	}
 	
 	gossip_app_set_presence (show, status);
Only in gossip-0.8/src: gossip-dbus.c~


Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gossip.spec	13 May 2005 16:51:14 -0000	1.2
+++ gossip.spec	23 May 2005 18:14:25 -0000	1.3
@@ -1,14 +1,15 @@
-%define with_dbus 0
+%define with_dbus 1
 
 Name:           gossip
 Version:        0.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Gnome Jabber Client
 
 Group:          Applications/Communications
 License:        GPL
 URL:          	http://www.imendio.com/projects/gossip/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Patch1:		gossip-dbus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	loudmouth-devel
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .dbus
 
 
 %build
@@ -95,6 +97,9 @@
 
 
 %changelog
+* Mon May 23 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-5
+- Add patch to fix dbus support, and build.
+
 * Fri May 13 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-4
 - Add dist tag.