rpms/gnome-mount/devel gnome-mount-0.4-no-media.patch, 1.1, 1.2 gnome-mount.spec, 1.13, 1.14

[fedora-cvs-commits redhat com]

Author: davidz

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

Modified Files:
	gnome-mount-0.4-no-media.patch gnome-mount.spec 
Log Message:
* Wed Mar  1 2006 David Zeuthen <davidz redhat com> - 0.4-5
- Update for new patch in #183191



gnome-mount-0.4-no-media.patch:
 gnome-mount.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

Index: gnome-mount-0.4-no-media.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount-0.4-no-media.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-mount-0.4-no-media.patch	1 Mar 2006 05:42:13 -0000	1.1
+++ gnome-mount-0.4-no-media.patch	1 Mar 2006 16:18:17 -0000	1.2
@@ -1,24 +1,72 @@
---- gnome-mount-0.4/src/gnome-mount.c.no-media	2006-03-01 00:34:49.000000000 -0500
-+++ gnome-mount-0.4/src/gnome-mount.c	2006-03-01 00:39:30.000000000 -0500
-@@ -463,9 +463,14 @@
+? config.guess
+? config.sub
+? gnome-mount-0.4-0.cvs20060213.tar.gz
+? gnome-mount-0.4-drive-mount.patch
+? gnome-mount-fix-segv-on-no-media.patch
+? gnome-mount-nicknames.patch
+? libtool
+? ltmain.sh
+? po/Makefile
+? po/Makefile.in
+? po/Makefile.in.in
+? po/POTFILES
+? po/it.gmo
+? po/ja.gmo
+? po/nb.gmo
+? po/stamp-it
+Index: src/gnome-mount.c
+===================================================================
+RCS file: /cvs/gnome/gnome-mount/src/gnome-mount.c,v
+retrieving revision 1.17
+diff -u -p -r1.17 gnome-mount.c
+--- src/gnome-mount.c	25 Feb 2006 00:39:31 -0000	1.17
++++ src/gnome-mount.c	1 Mar 2006 16:00:21 -0000
+@@ -238,7 +238,8 @@ show_error_dialog_unmount (const char *u
+ /* #define MOUNT_ERROR_DIALOG_RESPONSE_INSTALL_DRIVER 10 see below */
+ 
+ static void
+-show_error_dialog_mount (LibHalVolume *volume, const char *error_name, const char *error_detail, 
++show_error_dialog_mount (LibHalVolume *volume, LibHalDrive *drive,
++			 const char *error_name, const char *error_detail, 
+ 			 const char *fstype_requested)
+ {
+ 	GtkWidget *w;
+@@ -266,7 +267,10 @@ show_error_dialog_mount (LibHalVolume *v
+ 					    0,
+ 					    _("Cannot mount volume"));
+ 
+-		volume_name = libhal_volume_get_label (volume);
++		if (volume != NULL)
++			volume_name = libhal_volume_get_label (volume);
++		else
++			volume_name = NULL;
+ 
+ 		if (strcmp (error_name, "org.freedesktop.Hal.Device.Volume.PermissionDenied") == 0) {
+ 			gtk_message_dialog_format_secondary_text (
+@@ -289,8 +293,8 @@ show_error_dialog_mount (LibHalVolume *v
+ 				volume_name != NULL ? 
+ 				_("The volume '%s' uses the <i>%s</i> file system which is not supported by your system.") :
+ 				_("The volume uses the <i>%s</i> file system which is not supported by your system."),
+-				volume_name != NULL ? volume_name : fstype_requested,
+-				volume_name != NULL ? fstype_requested : "");
++				volume_name != NULL ? volume_name : (fstype_requested != NULL ? fstype_requested : ""),
++				volume_name != NULL ? (fstype_requested != NULL ? fstype_requested : "") : "");
+ 
+ 			/* some day.. :-)
+ 			gtk_dialog_add_buttons (GTK_DIALOG (w),
+@@ -463,9 +467,9 @@ volume_mount_with_options (const char *u
  
  		notify_parent (FALSE);
  
 -		show_error_dialog_mount (volume, error.name, error.message, 
--					 (fstype != NULL && strlen (fstype) > 0) ? 
++		show_error_dialog_mount (volume, drive, error.name, error.message, 
+ 					 (fstype != NULL && strlen (fstype) > 0) ? 
 -					 fstype : libhal_volume_get_fstype (volume));
-+                if (fstype == NULL || fstype[0] == 0) {
-+                    if (volume)
-+                        fstype = libhal_volume_get_fstype (volume);
-+                    else
-+                        fstype = "";
-+                }
-+
-+		show_error_dialog_mount (volume, error.name, error.message, fstype);
++					 fstype : (volume != NULL ? libhal_volume_get_fstype (volume) : NULL));
  
  		dbus_error_free (&error);
  		goto out;
-@@ -1701,7 +1706,7 @@
+@@ -1701,7 +1705,7 @@ try_drive:
  
  out:	
   	if (drive != NULL)


Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-mount.spec	1 Mar 2006 05:42:13 -0000	1.13
+++ gnome-mount.spec	1 Mar 2006 16:18:17 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.4
-Release: 4
+Release: 5
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -28,7 +28,7 @@
 
 %setup -q 
 %patch0 -p0 -b .drive-mount
-%patch1 -p1 -b .no-media
+%patch1 -p0 -b .no-media
 
 %build
 
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/gnome-mount.pc
 
 %changelog
+* Wed Mar  1 2006 David Zeuthen <davidz redhat com> - 0.4-5
+- Update for new patch in #183191
+
 * Wed Mar  1 2006 Matthias Clasen <mclasen redhat com> - 0.4-4
 - Fix a crash without media (#183191)