gtk+ r21089 - in trunk: . examples/gtkdial gdk gtk

[mitch svn gnome org]

Author: mitch
Date: Tue Aug 12 09:51:16 2008
New Revision: 21089
URL: http://svn.gnome.org/viewvc/gtk+?rev=21089&view=rev

Log:
2008-08-12  Michael Natterer  <mitch imendio com>

	* examples/gtkdial/gtkdial.c
	* gdk/gdkapplaunchcontext.c
	* gdk/gdkpango.c
	* gtk/gtkcellrendererpixbuf.c
	* gtk/gtkcellrenderertext.c
	* gtk/gtkcellview.c
	* gtk/gtkcombobox.c
	* gtk/gtkfontsel.c
	* gtk/gtkinvisible.c
	* gtk/gtkliststore.c
	* gtk/gtktexttag.c
	* gtk/gtktexttagtable.c: remove dereferencing from some function
	pointers i missed before.



Modified:
   trunk/ChangeLog
   trunk/examples/gtkdial/gtkdial.c
   trunk/gdk/gdkapplaunchcontext.c
   trunk/gdk/gdkpango.c
   trunk/gtk/gtkcellrendererpixbuf.c
   trunk/gtk/gtkcellrenderertext.c
   trunk/gtk/gtkcellview.c
   trunk/gtk/gtkcombobox.c
   trunk/gtk/gtkfontsel.c
   trunk/gtk/gtkinvisible.c
   trunk/gtk/gtkliststore.c
   trunk/gtk/gtktexttag.c
   trunk/gtk/gtktexttagtable.c

Modified: trunk/examples/gtkdial/gtkdial.c
==============================================================================
--- trunk/examples/gtkdial/gtkdial.c	(original)
+++ trunk/examples/gtkdial/gtkdial.c	Tue Aug 12 09:51:16 2008
@@ -152,8 +152,7 @@
       dial->adjustment = NULL;
     }
 
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
 GtkAdjustment*

Modified: trunk/gdk/gdkapplaunchcontext.c
==============================================================================
--- trunk/gdk/gdkapplaunchcontext.c	(original)
+++ trunk/gdk/gdkapplaunchcontext.c	Tue Aug 12 09:51:16 2008
@@ -55,7 +55,7 @@
 
   g_free (priv->icon_name);
 
-  (*G_OBJECT_CLASS (gdk_app_launch_context_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gdk_app_launch_context_parent_class)->finalize (object);
 }
 
 static char *

Modified: trunk/gdk/gdkpango.c
==============================================================================
--- trunk/gdk/gdkpango.c	(original)
+++ trunk/gdk/gdkpango.c	Tue Aug 12 09:51:16 2008
@@ -99,9 +99,9 @@
   GObject *object;
   GdkPangoRenderer *gdk_renderer;
 
-  object = (* G_OBJECT_CLASS (gdk_pango_renderer_parent_class)->constructor) (type,
-									      n_construct_properties,
-									      construct_params);
+  object = G_OBJECT_CLASS (gdk_pango_renderer_parent_class)->constructor (type,
+                                                                          n_construct_properties,
+                                                                          construct_params);
 
   gdk_renderer = GDK_PANGO_RENDERER (object);
   

Modified: trunk/gtk/gtkcellrendererpixbuf.c
==============================================================================
--- trunk/gtk/gtkcellrendererpixbuf.c	(original)
+++ trunk/gtk/gtkcellrendererpixbuf.c	Tue Aug 12 09:51:16 2008
@@ -234,7 +234,7 @@
   if (priv->gicon)
     g_object_unref (priv->gicon);
 
-  (* G_OBJECT_CLASS (gtk_cell_renderer_pixbuf_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gtk_cell_renderer_pixbuf_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gtk/gtkcellrenderertext.c
==============================================================================
--- trunk/gtk/gtkcellrenderertext.c	(original)
+++ trunk/gtk/gtkcellrenderertext.c	Tue Aug 12 09:51:16 2008
@@ -605,7 +605,7 @@
   if (priv->language)
     g_object_unref (priv->language);
 
-  (* G_OBJECT_CLASS (gtk_cell_renderer_text_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gtk_cell_renderer_text_parent_class)->finalize (object);
 }
 
 static PangoFontMask

Modified: trunk/gtk/gtkcellview.c
==============================================================================
--- trunk/gtk/gtkcellview.c	(original)
+++ trunk/gtk/gtkcellview.c	Tue Aug 12 09:51:16 2008
@@ -306,7 +306,7 @@
   if (cellview->priv->displayed_row)
      gtk_tree_row_reference_free (cellview->priv->displayed_row);
 
-  (* G_OBJECT_CLASS (gtk_cell_view_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gtk_cell_view_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gtk/gtkcombobox.c
==============================================================================
--- trunk/gtk/gtkcombobox.c	(original)
+++ trunk/gtk/gtkcombobox.c	Tue Aug 12 09:51:16 2008
@@ -1720,8 +1720,8 @@
 
   if (priv->row_separator_func)
     {
-      if ((*priv->row_separator_func) (priv->model, iter,
-				       priv->row_separator_data))
+      if (priv->row_separator_func (priv->model, iter,
+                                    priv->row_separator_data))
 	return FALSE;
     }
 
@@ -2902,8 +2902,8 @@
       gtk_tree_model_iter_nth_child (model, &iter, parent, i);
 
       if (priv->row_separator_func)
-	is_separator = (*priv->row_separator_func) (priv->model, &iter,
-						    priv->row_separator_data);
+	is_separator = priv->row_separator_func (priv->model, &iter,
+                                                 priv->row_separator_data);
       else
 	is_separator = FALSE;
       
@@ -3463,8 +3463,8 @@
     }
   
   if (priv->row_separator_func)
-    is_separator = (*priv->row_separator_func) (model, iter,
-					        priv->row_separator_data);
+    is_separator = priv->row_separator_func (model, iter,
+                                             priv->row_separator_data);
   else
     is_separator = FALSE;
 
@@ -3555,8 +3555,8 @@
   item = find_menu_by_path (priv->popup_widget, path, FALSE);
 
   if (priv->row_separator_func)
-    is_separator = (*priv->row_separator_func) (model, iter,
-						priv->row_separator_data);
+    is_separator = priv->row_separator_func (model, iter,
+                                             priv->row_separator_data);
   else
     is_separator = FALSE;
 
@@ -4357,8 +4357,8 @@
   if (!info->func)
     return;
 
-  (*info->func) (cell_layout, cell, tree_model, iter, info->func_data);
-  
+  info->func (cell_layout, cell, tree_model, iter, info->func_data);
+
   if (GTK_IS_WIDGET (cell_layout))
     parent = gtk_widget_get_parent (GTK_WIDGET (cell_layout));
   
@@ -5214,7 +5214,7 @@
   class = GTK_COMBO_BOX_GET_CLASS (combo_box);
 
   if (class->get_active_text)
-    return (* class->get_active_text) (combo_box);
+    return class->get_active_text (combo_box);
 
   return NULL;
 }
@@ -5353,7 +5353,7 @@
   gtk_combo_box_popdown (combo_box);
 
   if (combo_box->priv->row_separator_destroy)
-    (* combo_box->priv->row_separator_destroy) (combo_box->priv->row_separator_data);
+    combo_box->priv->row_separator_destroy (combo_box->priv->row_separator_data);
 
   combo_box->priv->row_separator_func = NULL;
   combo_box->priv->row_separator_data = NULL;
@@ -5720,7 +5720,7 @@
   g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
 
   if (combo_box->priv->row_separator_destroy)
-    (* combo_box->priv->row_separator_destroy) (combo_box->priv->row_separator_data);
+    combo_box->priv->row_separator_destroy (combo_box->priv->row_separator_data);
 
   combo_box->priv->row_separator_func = func;
   combo_box->priv->row_separator_data = data;

Modified: trunk/gtk/gtkfontsel.c
==============================================================================
--- trunk/gtk/gtkfontsel.c	(original)
+++ trunk/gtk/gtkfontsel.c	Tue Aug 12 09:51:16 2008
@@ -559,8 +559,8 @@
 
   if (fontsel->font)
     gdk_font_unref (fontsel->font);
-  
-  (* G_OBJECT_CLASS (gtk_font_selection_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (gtk_font_selection_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gtk/gtkinvisible.c
==============================================================================
--- trunk/gtk/gtkinvisible.c	(original)
+++ trunk/gtk/gtkinvisible.c	Tue Aug 12 09:51:16 2008
@@ -312,9 +312,9 @@
 {
   GObject *object;
 
-  object = (* G_OBJECT_CLASS (gtk_invisible_parent_class)->constructor) (type,
-									 n_construct_properties,
-									 construct_params);
+  object = G_OBJECT_CLASS (gtk_invisible_parent_class)->constructor (type,
+                                                                     n_construct_properties,
+                                                                     construct_params);
 
   gtk_widget_realize (GTK_WIDGET (object));
 

Modified: trunk/gtk/gtkliststore.c
==============================================================================
--- trunk/gtk/gtkliststore.c	(original)
+++ trunk/gtk/gtkliststore.c	Tue Aug 12 09:51:16 2008
@@ -399,8 +399,7 @@
       list_store->default_sort_data = NULL;
     }
 
-  /* must chain up */
-  (* G_OBJECT_CLASS (gtk_list_store_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gtk_list_store_parent_class)->finalize (object);
 }
 
 /* Fulfill the GtkTreeModel requirements */

Modified: trunk/gtk/gtktexttag.c
==============================================================================
--- trunk/gtk/gtktexttag.c	(original)
+++ trunk/gtk/gtktexttag.c	Tue Aug 12 09:51:16 2008
@@ -744,7 +744,7 @@
   g_free (text_tag->name);
   text_tag->name = NULL;
 
-  (* G_OBJECT_CLASS (gtk_text_tag_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (gtk_text_tag_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gtk/gtktexttagtable.c
==============================================================================
--- trunk/gtk/gtktexttagtable.c	(original)
+++ trunk/gtk/gtktexttagtable.c	Tue Aug 12 09:51:16 2008
@@ -162,8 +162,8 @@
   g_slist_free (table->anonymous);
 
   g_slist_free (table->buffers);
-  
-  (* G_OBJECT_CLASS (gtk_text_tag_table_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (gtk_text_tag_table_parent_class)->finalize (object);
 }
 static void
 gtk_text_tag_table_set_property (GObject      *object,