[gtk+] Remove a superfluous ref
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Remove a superfluous ref
- Date: Thu, 2 May 2013 12:02:53 +0000 (UTC)
commit f326c0eac806b037c7100309887ffc5f9193070d
Author: Matthias Clasen <mclasen redhat com>
Date: Thu May 2 05:53:40 2013 -0400
Remove a superfluous ref
If we cancel the call in dispose, no need to ref the object
we pass as userdata. Avoids the risk of leaking the ref if
the call is actually canceled.
gtk/gtkplacessidebar.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 9b08485..35a758d 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -2205,8 +2205,7 @@ mount_volume (GtkPlacesSidebar *sidebar, GVolume *volume)
mount_op = gtk_mount_operation_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sidebar))));
g_mount_operation_set_password_save (mount_op, G_PASSWORD_SAVE_FOR_SESSION);
- g_object_ref (sidebar);
- g_volume_mount (volume, 0, mount_op, NULL, volume_mount_cb, sidebar);
+ g_volume_mount (volume, 0, mount_op, NULL, volume_mount_cb, g_object_ref (sidebar));
}
static void
@@ -3572,8 +3571,6 @@ hostname_proxy_new_cb (GObject *source_object,
sidebar->hostnamed_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
g_clear_object (&sidebar->hostnamed_cancellable);
- g_object_unref (sidebar);
-
if (error != NULL) {
g_debug ("Failed to create D-Bus proxy: %s", error->message);
g_error_free (error);
@@ -3833,7 +3830,7 @@ gtk_places_sidebar_init (GtkPlacesSidebar *sidebar)
"org.freedesktop.hostname1",
sidebar->hostnamed_cancellable,
hostname_proxy_new_cb,
- g_object_ref (sidebar));
+ sidebar);
sidebar->drop_state = DROP_STATE_NORMAL;
sidebar->new_bookmark_index = -1;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]