diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-03-03 21:38:30 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-03-03 21:38:30 +0000 |
| commit | 0cb86e3b8f00a8e575a4a9429b50b7cdaaa921cb (patch) | |
| tree | 63d6a8ac3dbe7cb331d6bb019a1e81d87e8c1a62 | |
| parent | a961e94cd753938510b7e17782f608640e008fd0 (diff) | |
| download | glib-0cb86e3b8f00a8e575a4a9429b50b7cdaaa921cb.tar.gz | |
Fix the adopt_orphan_mount vfunc to take a volume_monitor reference in an
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
| -rw-r--r-- | gio/ChangeLog | 10 | ||||
| -rw-r--r-- | gio/gunionvolumemonitor.c | 15 | ||||
| -rw-r--r-- | gio/gvolumemonitor.h | 5 |
3 files changed, 21 insertions, 9 deletions
diff --git a/gio/ChangeLog b/gio/ChangeLog index f9ed489a6..51bc96676 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -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: diff --git a/gio/gunionvolumemonitor.c b/gio/gunionvolumemonitor.c index 77e8aa095..2a4152fde 100644 --- a/gio/gunionvolumemonitor.c +++ b/gio/gunionvolumemonitor.c @@ -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; } diff --git a/gio/gvolumemonitor.h b/gio/gvolumemonitor.h index 9e4a47d05..9d32ceabb 100644 --- a/gio/gvolumemonitor.h +++ b/gio/gvolumemonitor.h @@ -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 */ |