luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-04 10:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the adopt_orphan_mount vfunc to take a volume_monitor reference in an

Browse Source 
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)


svn path=/trunk/; revision=6618
This commit is contained in:
Alexander Larsson 2008-03-03 21:38:30 +00:00 committed by Alexander Larsson
parent a961e94cd7
commit 0cb86e3b8f
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/ChangeLog
View File

@ -1,3 +1,13 @@
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)
2008-03-01 Benjamin Otte <otte@gnome.org>
* gfile.c:

15
gio/gunionvolumemonitor.c
View File

@ -65,12 +65,13 @@ g_union_volume_monitor_finalize (GObject *object)
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 @@ g_volume_monitor_adopt_orphan_mount (GMount *mount)
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;
}

5
gio/gvolumemonitor.h
View File

@ -111,8 +111,9 @@ struct _GVolumeMonitorClass {
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 */