Attachment 125468 Details for Bug 183191 – a patch

[patch] a patch

gnome-mount-0.4-no-media.patch (text/plain), 1.24 KB, created by Matthias Clasen on 2006-03-01 15:36:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Clasen

Created: 2006-03-01 15:36:16 UTC

Size: 1.24 KB

patch

obsolete

>--- gnome-mount-0.4/src/gnome-mount.c.no-media	2006-03-01 00:45:06.000000000 -0500
>+++ gnome-mount-0.4/src/gnome-mount.c	2006-03-01 00:55:48.000000000 -0500
>@@ -266,7 +266,10 @@
> 					    0,
> 					    _("Cannot mount volume"));
> 
>-		volume_name = libhal_volume_get_label (volume);
>+		if (volume)
>+			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 (
>@@ -463,9 +466,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 +1709,7 @@
> 
> out:	
>  	if (drive != NULL)
>-		libhal_volume_free (volume);
>+		libhal_drive_free (drive);
> 
>  	if (volume != NULL)
> 		libhal_volume_free (volume);

Actions: View | Diff

Attachments on bug 183191: 125308 | 125468 | 125476