glib r6618 - trunk/gio

[alexl svn gnome org]

Author: alexl
Date: Mon Mar  3 21:38:30 2008
New Revision: 6618
URL: http://svn.gnome.org/viewvc/glib?rev=6618&view=rev

Log:
2008-03-03  Alexander Larsson  <alexl redhat com>

        * gunionvolumemonitor.c:
        * gvolumemonitor.h:
	Fix the adopt_orphan_mount vfunc to take a
	volume_monitor reference in an ABI compat way.
	This change is not API compat, but the added
	arg is not used in the only user of this vfunc, so
	all we get is a harmless warning in gvfs (#520169)



Modified:
   trunk/gio/ChangeLog
   trunk/gio/gunionvolumemonitor.c
   trunk/gio/gvolumemonitor.h

Modified: trunk/gio/gunionvolumemonitor.c
==============================================================================
--- trunk/gio/gunionvolumemonitor.c	(original)
+++ trunk/gio/gunionvolumemonitor.c	Mon Mar  3 21:38:30 2008
@@ -65,12 +65,13 @@
 
   monitor = G_UNION_VOLUME_MONITOR (object);
 
-  while (monitor->monitors != NULL) {
-    child_monitor = monitor->monitors->data;
-    g_union_volume_monitor_remove_monitor (monitor, 
-                                           child_monitor);
-    g_object_unref (child_monitor);
-  }
+  while (monitor->monitors != NULL)
+    {
+      child_monitor = monitor->monitors->data;
+      g_union_volume_monitor_remove_monitor (monitor, 
+                                             child_monitor);
+      g_object_unref (child_monitor);
+    }
 
   
   if (G_OBJECT_CLASS (g_union_volume_monitor_parent_class)->finalize)
@@ -649,7 +650,7 @@
 
       if (child_monitor_class->adopt_orphan_mount != NULL)
         {
-          volume = child_monitor_class->adopt_orphan_mount (mount);
+          volume = child_monitor_class->adopt_orphan_mount (mount, child_monitor);
           if (volume != NULL)
             break;
         }

Modified: trunk/gio/gvolumemonitor.h
==============================================================================
--- trunk/gio/gvolumemonitor.h	(original)
+++ trunk/gio/gvolumemonitor.h	Mon Mar  3 21:38:30 2008
@@ -111,8 +111,9 @@
                                      const char      *uuid);
 
 
-  GVolume * (*adopt_orphan_mount)   (GMount          *mount);
-
+  /* These arguments are unfortunately backwards by mistake (bug #520169) */
+  GVolume * (*adopt_orphan_mount)   (GMount          *mount,
+                                     GVolumeMonitor  *volume_monitor);
   
   /*< private >*/
   /* Padding for future expansion */