glib r6545 - trunk/gio

[otte svn gnome org]

Author: otte
Date: Wed Feb 20 18:52:10 2008
New Revision: 6545
URL: http://svn.gnome.org/viewvc/glib?rev=6545&view=rev

Log:
2008-02-20  Benjamin Otte  <otte gnome org>

	* gfile.c: (g_file_mount_mountable), (g_file_unmount_mountable),
	(g_file_eject_mountable):
	even more cases of not returning in error path



Modified:
   trunk/gio/ChangeLog
   trunk/gio/gfile.c

Modified: trunk/gio/gfile.c
==============================================================================
--- trunk/gio/gfile.c	(original)
+++ trunk/gio/gfile.c	Wed Feb 20 18:52:10 2008
@@ -3308,15 +3308,16 @@
 
   iface = G_FILE_GET_IFACE (file);
 
-  if (iface->mount_mountable == NULL) {
-    g_simple_async_report_error_in_idle (G_OBJECT (file),
-				         callback,
-					 user_data,
-					 G_IO_ERROR,
-					 G_IO_ERROR_NOT_SUPPORTED,
-					 _("Operation not supported"));
-    return;
-  }
+  if (iface->mount_mountable == NULL) 
+    {
+      g_simple_async_report_error_in_idle (G_OBJECT (file),
+					   callback,
+					   user_data,
+					   G_IO_ERROR,
+					   G_IO_ERROR_NOT_SUPPORTED,
+					   _("Operation not supported"));
+      return;
+    }
   
   (* iface->mount_mountable) (file,
 			      flags,
@@ -3391,12 +3392,15 @@
   iface = G_FILE_GET_IFACE (file);
   
   if (iface->unmount_mountable == NULL)
-    g_simple_async_report_error_in_idle (G_OBJECT (file),
-					 callback,
-					 user_data,
-					 G_IO_ERROR,
-					 G_IO_ERROR_NOT_SUPPORTED,
-					 _("Operation not supported"));
+    {
+      g_simple_async_report_error_in_idle (G_OBJECT (file),
+					   callback,
+					   user_data,
+					   G_IO_ERROR,
+					   G_IO_ERROR_NOT_SUPPORTED,
+					   _("Operation not supported"));
+      return;
+    }
   
   (* iface->unmount_mountable) (file,
 				flags,
@@ -3470,13 +3474,16 @@
 
   iface = G_FILE_GET_IFACE (file);
   
-  if (iface->eject_mountable == NULL)
-    g_simple_async_report_error_in_idle (G_OBJECT (file),
-					 callback,
-					 user_data,
-					 G_IO_ERROR,
-					 G_IO_ERROR_NOT_SUPPORTED,
-					 _("Operation not supported"));
+  if (iface->eject_mountable == NULL) 
+    {
+      g_simple_async_report_error_in_idle (G_OBJECT (file),
+					   callback,
+					   user_data,
+					   G_IO_ERROR,
+					   G_IO_ERROR_NOT_SUPPORTED,
+					   _("Operation not supported"));
+      return;
+    }
   
   (* iface->eject_mountable) (file,
 			      flags,