GNOME.org
 

[gtk+/wip/baedert/gl] Fix warnings with newer glib

commit 6fcdf786bd6499facdb889653881b1974ed7dce9
Author: Timm Bäder <mail baedert org>
Date:   Sat Dec 9 10:08:57 2017 +0100

    Fix warnings with newer glib

 gtk/a11y/gtklabelaccessible.c                    |    2 +-
 gtk/a11y/gtktreeviewaccessible.c                 |    4 ++--
 gtk/gtkcellrendererspin.c                        |    2 +-
 gtk/gtkcolorplane.c                              |    6 +++---
 gtk/gtkcomboboxtext.c                            |    2 +-
 gtk/gtkcssimagefallback.c                        |    2 +-
 gtk/gtklabel.c                                   |    2 +-
 gtk/gtksidebarrow.c                              |    4 ++--
 gtk/gtktoolpalette.c                             |    2 +-
 gtk/gtktreeview.c                                |    2 +-
 gtk/gtkwidget.c                                  |    2 +-
 modules/printbackends/cups/gtkprintbackendcups.c |    2 +-
 tests/testentrycompletion.c                      |    2 +-
 tests/testgmenu.c                                |    4 ++--
 testsuite/gtk/notify.c                           |    6 +++---
 15 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/gtk/a11y/gtklabelaccessible.c b/gtk/a11y/gtklabelaccessible.c
index 0cdb6e0..1a69ec3 100644
--- a/gtk/a11y/gtklabelaccessible.c
+++ b/gtk/a11y/gtklabelaccessible.c
@@ -84,7 +84,7 @@ gtk_label_accessible_link_impl_get_hyperlink (AtkHyperlinkImpl *atk_impl)
 {
   GtkLabelAccessibleLinkImpl *impl = (GtkLabelAccessibleLinkImpl *)atk_impl;
 
-  return g_object_ref (impl->link);
+  return ATK_HYPERLINK (g_object_ref (impl->link));
 }
 
 static void
diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c
index 3a184e7..1db8201 100644
--- a/gtk/a11y/gtktreeviewaccessible.c
+++ b/gtk/a11y/gtktreeviewaccessible.c
@@ -469,7 +469,7 @@ gtk_tree_view_accessible_ref_child (AtkObject *obj,
   if (cell == NULL)
     cell = create_cell (tree_view, accessible, tree, node, tv_col);
 
-  return g_object_ref (cell);
+  return ATK_OBJECT (g_object_ref (cell));
 }
 
 static AtkStateSet*
@@ -562,7 +562,7 @@ gtk_tree_view_accessible_ref_accessible_at_point (AtkComponent *component,
   if (cell == NULL)
     cell = create_cell (tree_view, GTK_TREE_VIEW_ACCESSIBLE (component), tree, node, column);
 
-  return g_object_ref (cell);
+  return ATK_OBJECT (g_object_ref (cell));
 }
 
 static void
diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
index 5fa0cae..4096323 100644
--- a/gtk/gtkcellrendererspin.c
+++ b/gtk/gtkcellrendererspin.c
@@ -227,7 +227,7 @@ gtk_cell_renderer_spin_set_property (GObject      *object,
        }
 
       if (obj)
-       priv->adjustment = g_object_ref_sink (obj);
+       priv->adjustment = GTK_ADJUSTMENT (g_object_ref_sink (obj));
       break;
     case PROP_CLIMB_RATE:
       priv->climb_rate = g_value_get_double (value);
diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c
index af0cede..1e196ff 100644
--- a/gtk/gtkcolorplane.c
+++ b/gtk/gtkcolorplane.c
@@ -470,7 +470,7 @@ plane_set_property (GObject      *object,
       adjustment = g_value_get_object (value);
       if (adjustment)
        {
-         plane->priv->h_adj = g_object_ref_sink (adjustment);
+         plane->priv->h_adj = GTK_ADJUSTMENT (g_object_ref_sink (adjustment));
          g_signal_connect_swapped (adjustment, "value-changed", G_CALLBACK (h_changed), plane);
        }
       break;
@@ -478,7 +478,7 @@ plane_set_property (GObject      *object,
       adjustment = g_value_get_object (value);
       if (adjustment)
        {
-         plane->priv->s_adj = g_object_ref_sink (adjustment);
+         plane->priv->s_adj = GTK_ADJUSTMENT (g_object_ref_sink (adjustment));
          g_signal_connect_swapped (adjustment, "value-changed", G_CALLBACK (sv_changed), plane);
        }
       break;
@@ -486,7 +486,7 @@ plane_set_property (GObject      *object,
       adjustment = g_value_get_object (value);
       if (adjustment)
        {
-         plane->priv->v_adj = g_object_ref_sink (adjustment);
+         plane->priv->v_adj = GTK_ADJUSTMENT (g_object_ref_sink (adjustment));
          g_signal_connect_swapped (adjustment, "value-changed", G_CALLBACK (sv_changed), plane);
        }
       break;
diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c
index 4b15c04..e70f323 100644
--- a/gtk/gtkcomboboxtext.c
+++ b/gtk/gtkcomboboxtext.c
@@ -292,7 +292,7 @@ gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable  *buildable,
 
       data = g_slice_new0 (ItemParserData);
       data->builder = g_object_ref (builder);
-      data->object = g_object_ref (buildable);
+      data->object = G_OBJECT (g_object_ref (buildable));
       data->domain = gtk_builder_get_translation_domain (builder);
       data->string = g_string_new ("");
 
diff --git a/gtk/gtkcssimagefallback.c b/gtk/gtkcssimagefallback.c
index afc5aef..7bd310c 100644
--- a/gtk/gtkcssimagefallback.c
+++ b/gtk/gtkcssimagefallback.c
@@ -176,7 +176,7 @@ gtk_css_image_fallback_compute (GtkCssImage      *image,
       return GTK_CSS_IMAGE (copy);
     }
   else
-    return g_object_ref (fallback);
+    return GTK_CSS_IMAGE (g_object_ref (fallback));
 }
 
 static gboolean
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index ca5576c..0b98625 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1623,7 +1623,7 @@ gtk_label_buildable_custom_tag_start (GtkBuildable     *buildable,
 
       parser_data = g_slice_new0 (PangoParserData);
       parser_data->builder = g_object_ref (builder);
-      parser_data->object = g_object_ref (buildable);
+      parser_data->object = G_OBJECT (g_object_ref (buildable));
       *parser = pango_parser;
       *data = parser_data;
       return TRUE;
diff --git a/gtk/gtksidebarrow.c b/gtk/gtksidebarrow.c
index d3a58bd..c03fe57 100644
--- a/gtk/gtksidebarrow.c
+++ b/gtk/gtksidebarrow.c
@@ -225,7 +225,7 @@ gtk_sidebar_row_set_property (GObject      *object,
         object = g_value_get_object (value);
         if (object != NULL)
           {
-            self->start_icon = g_object_ref (object);
+            self->start_icon = G_ICON (g_object_ref (object));
             gtk_image_set_from_gicon (GTK_IMAGE (self->start_icon_widget), self->start_icon);
           }
         else
@@ -241,7 +241,7 @@ gtk_sidebar_row_set_property (GObject      *object,
         object = g_value_get_object (value);
         if (object != NULL)
           {
-            self->end_icon = g_object_ref (object);
+            self->end_icon = G_ICON (g_object_ref (object));
             gtk_image_set_from_gicon (GTK_IMAGE (self->end_icon_widget), self->end_icon);
             gtk_widget_show (self->end_icon_widget);
           }
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index 65e97d9..312df40 100644
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -693,7 +693,7 @@ gtk_tool_palette_add (GtkContainer *container,
 
   g_ptr_array_add (palette->priv->groups, info);
   info->pos = palette->priv->groups->len - 1;
-  info->widget = g_object_ref_sink (child);
+  info->widget = GTK_TOOL_ITEM_GROUP (g_object_ref_sink (child));
 
   gtk_widget_set_parent (child, GTK_WIDGET (palette));
 }
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index e44673f..fe5ec34 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -14229,7 +14229,7 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
 
   if (entry)
     {
-      tree_view->priv->search_entry = g_object_ref (entry);
+      tree_view->priv->search_entry = GTK_WIDGET (g_object_ref (entry));
       tree_view->priv->search_custom_entry_set = TRUE;
 
       if (tree_view->priv->search_entry_changed_id == 0)
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 83d38ef..736d66f 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -11924,7 +11924,7 @@ gtk_widget_buildable_custom_tag_start (GtkBuildable     *buildable,
       AccelGroupParserData *data;
 
       data = g_slice_new0 (AccelGroupParserData);
-      data->object = g_object_ref (buildable);
+      data->object = G_OBJECT (g_object_ref (buildable));
       data->builder = builder;
 
       *parser = accel_group_parser;
diff --git a/modules/printbackends/cups/gtkprintbackendcups.c 
b/modules/printbackends/cups/gtkprintbackendcups.c
index abc5f84..5f6c4f2 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -3959,7 +3959,7 @@ cups_request_ppd (GtkPrinter *printer)
   g_io_channel_set_encoding (data->ppd_io, NULL, NULL);
   g_io_channel_set_close_on_unref (data->ppd_io, TRUE);
 
-  data->printer = g_object_ref (printer);
+  data->printer = GTK_PRINTER_CUPS (g_object_ref (printer));
 
   resource = g_strdup_printf ("/printers/%s.ppd",
                               gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer)));
diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index 332d6be..ec1d2f6 100644
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -233,7 +233,7 @@ animation_timer (GtkEntryCompletion *completion)
        {
          g_print ("removing model!\n");
 
-         old_store = g_object_ref (gtk_entry_completion_get_model (completion));
+         old_store = GTK_LIST_STORE (g_object_ref (gtk_entry_completion_get_model (completion)));
          gtk_entry_completion_set_model (completion, NULL);
        }
       else
diff --git a/tests/testgmenu.c b/tests/testgmenu.c
index e5366aa..8940af5 100644
--- a/tests/testgmenu.c
+++ b/tests/testgmenu.c
@@ -103,9 +103,9 @@ get_model (void)
   gtk_builder_add_from_string (builder, menu_markup, -1, &error);
   g_assert_no_error (error);
 
-  menu = g_object_ref (gtk_builder_get_object (builder, "edit-menu"));
+  menu = G_MENU_MODEL (g_object_ref (gtk_builder_get_object (builder, "edit-menu")));
 
-  section = g_object_ref (gtk_builder_get_object (builder, "size-placeholder"));
+  section = G_MENU_MODEL (g_object_ref (gtk_builder_get_object (builder, "size-placeholder")));
   g_object_unref (builder);
 
   for (i = 0.5; i <= 2.0; i += 0.5)
diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index a73b290..f6f3ab7 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -399,11 +399,11 @@ test_type (gconstpointer data)
   klass = g_type_class_ref (type);
 
   if (g_type_is_a (type, GTK_TYPE_SETTINGS))
-    instance = g_object_ref (gtk_settings_get_default ());
+    instance = G_OBJECT (g_object_ref (gtk_settings_get_default ()));
   else if (g_type_is_a (type, GDK_TYPE_WINDOW))
     {
-      instance = g_object_ref (gdk_window_new_popup (gdk_display_get_default (),
-                                                     &(GdkRectangle) { 0, 0, 100, 100 }));
+      instance = G_OBJECT (g_object_ref (gdk_window_new_popup (gdk_display_get_default (),
+                                                               &(GdkRectangle) { 0, 0, 100, 100 })));
     }
   else if (g_str_equal (g_type_name (type), "GdkX11Cursor"))
     instance = g_object_new (type, "display", display, NULL);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]