summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog16
-rw-r--r--examples/gtkdial/gtkdial.c3
-rw-r--r--gdk/gdkapplaunchcontext.c2
-rw-r--r--gdk/gdkpango.c6
-rw-r--r--gtk/gtkcellrendererpixbuf.c2
-rw-r--r--gtk/gtkcellrenderertext.c2
-rw-r--r--gtk/gtkcellview.c2
-rw-r--r--gtk/gtkcombobox.c26
-rw-r--r--gtk/gtkfontsel.c4
-rw-r--r--gtk/gtkinvisible.c6
-rw-r--r--gtk/gtkliststore.c3
-rw-r--r--gtk/gtktexttag.c2
-rw-r--r--gtk/gtktexttagtable.c4
13 files changed, 46 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a271e4cfc..6c7d6f078c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
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.
+
+2008-08-12 Michael Natterer <mitch@imendio.com>
+
* gtk/gtkaccellabel.c
* gtk/gtkcalendar.c
* gtk/gtkclist.c
diff --git a/examples/gtkdial/gtkdial.c b/examples/gtkdial/gtkdial.c
index fa035ee61f..87c8dbb564 100644
--- a/examples/gtkdial/gtkdial.c
+++ b/examples/gtkdial/gtkdial.c
@@ -152,8 +152,7 @@ gtk_dial_destroy (GtkObject *object)
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*
diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c
index 15a013b768..45a776c976 100644
--- a/gdk/gdkapplaunchcontext.c
+++ b/gdk/gdkapplaunchcontext.c
@@ -55,7 +55,7 @@ gdk_app_launch_context_finalize (GObject *object)
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 *
diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index 0a484b535e..302eb9d3e0 100644
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -99,9 +99,9 @@ gdk_pango_renderer_constructor (GType type,
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);
diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index faffec5bc6..87a73d673e 100644
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -234,7 +234,7 @@ gtk_cell_renderer_pixbuf_finalize (GObject *object)
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
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 9a3e4ae234..3e47c91080 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -605,7 +605,7 @@ gtk_cell_renderer_text_finalize (GObject *object)
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
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index e5350a526a..08cd400a95 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -306,7 +306,7 @@ gtk_cell_view_finalize (GObject *object)
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
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 0907e66d9a..1255e7c0e1 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1720,8 +1720,8 @@ tree_column_row_is_sensitive (GtkComboBox *combo_box,
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_combo_box_menu_fill_level (GtkComboBox *combo_box,
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 @@ gtk_combo_box_menu_row_inserted (GtkTreeModel *model,
}
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 @@ gtk_combo_box_menu_row_changed (GtkTreeModel *model,
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 @@ combo_cell_data_func (GtkCellLayout *cell_layout,
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 @@ gtk_combo_box_get_active_text (GtkComboBox *combo_box)
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_destroy (GtkObject *object)
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 @@ gtk_combo_box_set_row_separator_func (GtkComboBox *combo_box,
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;
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 851fb1e986..4bfd8d6285 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -559,8 +559,8 @@ gtk_font_selection_finalize (GObject *object)
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
diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c
index 463dd098db..60fbebd629 100644
--- a/gtk/gtkinvisible.c
+++ b/gtk/gtkinvisible.c
@@ -312,9 +312,9 @@ gtk_invisible_constructor (GType type,
{
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));
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index cb4c86d50e..24d69f2355 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -399,8 +399,7 @@ gtk_list_store_finalize (GObject *object)
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 */
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 482179b032..508255376e 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -744,7 +744,7 @@ gtk_text_tag_finalize (GObject *object)
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
diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c
index be3665b321..1cf1a24a38 100644
--- a/gtk/gtktexttagtable.c
+++ b/gtk/gtktexttagtable.c
@@ -162,8 +162,8 @@ gtk_text_tag_table_finalize (GObject *object)
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,
View Lorry Controller Status