[gtk+/gtk-3-14] Avoid g_set_object



commit 34e6e1a599375da5665f4829faedf4c640f031a6
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jul 21 12:03:52 2015 -0400

    Avoid g_set_object
    
    One of the backported fixes brought in a dependency on new glib
    that I didn't mean to introduce here. Avoid it.

 gtk/gtkdnd.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 364c382..8ff85ce 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -3258,7 +3258,11 @@ set_icon_helper (GdkDragContext *context,
 
       info = gtk_drag_get_source_info (context, FALSE);
 
-      g_set_object (&info->icon_helper, helper);
+      if (helper)
+        g_object_ref (helper);
+      if (info->icon_helper)
+        g_object_unref (info->icon_helper);
+      info->icon_helper = helper;
       gtk_drag_set_icon_window (context, NULL, hot_x, hot_y, TRUE);
     }
   else


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]