rpms/gnome-vfs2/devel gnome-vfs-2.16.0-no-dbus.patch, NONE, 1.1 gnome-vfs2.spec, 1.133, 1.134

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13956

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.16.0-no-dbus.patch 
Log Message:
reduce warnings if dbus is not avail


gnome-vfs-2.16.0-no-dbus.patch:
 gnome-vfs-volume-monitor-client.c |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE gnome-vfs-2.16.0-no-dbus.patch ---
--- gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c.no-dbus	2006-09-19 13:36:28.000000000 -0400
+++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c	2006-09-19 13:37:11.000000000 -0400
@@ -201,6 +201,9 @@
 
 	volume_monitor = GNOME_VFS_VOLUME_MONITOR (volume_monitor_client);
 
+	if (volume_monitor_client->dbus_conn == NULL)
+		return;
+
 	list = get_drives (volume_monitor_client->dbus_conn, volume_monitor);
 	for (l = list; l; l = l->next) {
 		drive = l->data;
@@ -221,6 +224,9 @@
 
 	volume_monitor = GNOME_VFS_VOLUME_MONITOR (volume_monitor_client);
 
+	if (volume_monitor_client->dbus_conn == NULL)
+		return;
+
 	list = get_volumes (volume_monitor_client->dbus_conn, volume_monitor);
 	for (l = list; l; l = l->next) {
 		volume = l->data;


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- gnome-vfs2.spec	19 Sep 2006 14:10:19 -0000	1.133
+++ gnome-vfs2.spec	19 Sep 2006 17:51:36 -0000	1.134
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.16.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -64,6 +64,9 @@
 
 Patch7: gnome-vfs-2.16.0-cvs-backport.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=356772
+Patch8: gnome-vfs-2.16.0-no-dbus.patch
+
 
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
@@ -115,6 +118,7 @@
 %patch201 -p0 -b .console
 
 %patch7 -p0 -b .cvs-backport
+%patch8 -p1 -b .no-dbus
 
 %build
 
@@ -132,6 +136,7 @@
 
 #needed for patch 102 (kerberos fix)
 autoconf
+CFLAGS="-O0 -g"
 %configure --disable-gtk-doc --with-gtk=no --enable-hal 
 
 export tagname=CC
@@ -200,6 +205,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Sep 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-3
+- Prevent excessive warnings when dbus is not available (#207121)
+
 * Tue Sep 19 2006 Alexander Larsson <alexl at redhat.com> - 2.16.0-2
 - Backport fixes from cvs:
 -  Fix crash on shutdown (gnome bug 347470)