rpms/gnome-mount/devel gnome-mount-0.4-no-media.patch, NONE, 1.1 gnome-mount.spec, 1.12, 1.13

[fedora-cvs-commits redhat com]

Author: mclasen

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

Modified Files:
	gnome-mount.spec 
Added Files:
	gnome-mount-0.4-no-media.patch 
Log Message:
Fix a crash


gnome-mount-0.4-no-media.patch:
 gnome-mount.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE gnome-mount-0.4-no-media.patch ---
--- 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 @@
 
 		notify_parent (FALSE);
 
-		show_error_dialog_mount (volume, 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);
 
 		dbus_error_free (&error);
 		goto out;
@@ -1701,7 +1706,7 @@
 
 out:	
  	if (drive != NULL)
-		libhal_volume_free (volume);
+		libhal_drive_free (drive);
 
  	if (volume != NULL)
 		libhal_volume_free (volume);


Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-mount.spec	28 Feb 2006 13:41:58 -0000	1.12
+++ gnome-mount.spec	1 Mar 2006 05:42:13 -0000	1.13
@@ -1,11 +1,12 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.4
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
 Patch0: gnome-mount-0.4-drive-mount.patch
+Patch1: gnome-mount-0.4-no-media.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: hal-devel >= 0.5.5 gtk2-devel >= 2.8.0 dbus-devel >= 0.31
 Requires: hal >= 0.5.7
@@ -27,6 +28,7 @@
 
 %setup -q 
 %patch0 -p0 -b .drive-mount
+%patch1 -p1 -b .no-media
 
 %build
 
@@ -61,6 +63,9 @@
 %{_libdir}/pkgconfig/gnome-mount.pc
 
 %changelog
+* Wed Mar  1 2006 Matthias Clasen <mclasen redhat com> - 0.4-4
+- Fix a crash without media (#183191)
+
 * Tue Feb 28 2006 Karsten Hopp <karsten redhat de> 0.4-3
 - add some buildrequires