aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/e-canvas-utils.c4
-rw-r--r--widgets/misc/e-canvas.c16
-rw-r--r--widgets/misc/e-gui-utils.c2
-rw-r--r--widgets/misc/e-popup-menu.c4
-rw-r--r--widgets/misc/e-reflow.c10
-rw-r--r--widgets/misc/e-selection-model.c4
6 files changed, 20 insertions, 20 deletions
diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c
index 1bd51d070e..629804a2d7 100644
--- a/widgets/misc/e-canvas-utils.c
+++ b/widgets/misc/e-canvas-utils.c
@@ -144,7 +144,7 @@ show_area_timeout (gpointer data)
DoubsAndCanvas *dac = data;
e_canvas_show_area(dac->canvas, dac->x1, dac->y1, dac->x2, dac->y2);
- gtk_object_unref(GTK_OBJECT(dac->canvas));
+ g_object_unref (dac->canvas);
g_free(dac);
return FALSE;
}
@@ -166,6 +166,6 @@ e_canvas_item_show_area_delayed (GnomeCanvasItem *item, double x1, double y1, do
dac->x2 = x2;
dac->y2 = y2;
dac->canvas = item->canvas;
- gtk_object_ref(GTK_OBJECT(item->canvas));
+ g_object_ref (item->canvas);
g_timeout_add(delay, show_area_timeout, dac);
}
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 473e50e4d1..3a88a81c41 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -152,7 +152,7 @@ e_canvas_destroy (GtkObject *object)
canvas->visibility_notify_id);
canvas->visibility_notify_id = 0;
- gtk_object_unref(GTK_OBJECT(canvas->toplevel));
+ g_object_unref (canvas->toplevel);
canvas->toplevel = NULL;
}
@@ -271,7 +271,7 @@ emit_event (GnomeCanvas *canvas, GdkEvent *event)
finished = FALSE;
while (item && !finished) {
- gtk_object_ref (GTK_OBJECT (item));
+ g_object_ref (item);
gtk_signal_emit_by_name (GTK_OBJECT (item), "event",
&ev,
@@ -286,7 +286,7 @@ emit_event (GnomeCanvas *canvas, GdkEvent *event)
#endif
parent = item->parent;
- gtk_object_unref (GTK_OBJECT (item));
+ g_object_unref (item);
item = parent;
}
@@ -942,7 +942,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id)
func(info->item, flags, info->id);
g_message ("ECANVAS: free info (2): item %p, id %p",
info->item, info->id);
- gtk_object_unref (GTK_OBJECT (info->item));
+ g_object_unref (info->item);
g_free(info);
}
g_list_free(canvas->selection);
@@ -953,7 +953,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id)
info = g_new(ECanvasSelectionInfo, 1);
info->item = item;
- gtk_object_ref (GTK_OBJECT (info->item));
+ g_object_ref (info->item);
info->id = id;
g_message ("ECANVAS: new info item %p, id %p", item, id);
@@ -1018,7 +1018,7 @@ e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id)
info = g_new(ECanvasSelectionInfo, 1);
info->item = item;
- gtk_object_ref (GTK_OBJECT (info->item));
+ g_object_ref (info->item);
info->id = id;
g_message ("ECANVAS: new info (2): item %p, id %p", item, id);
@@ -1065,7 +1065,7 @@ e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id)
g_message ("ECANVAS: removing info: item %p, info %p",
info->item, info->id);
- gtk_object_unref (GTK_OBJECT (info->item));
+ g_object_unref (info->item);
g_free(info);
g_list_free_1(list);
break;
@@ -1085,7 +1085,7 @@ void e_canvas_popup_tooltip (ECanvas *canvas, GtkWidget *widget, int x, int y)
canvas->toplevel = gtk_widget_get_toplevel (GTK_WIDGET(canvas));
if (canvas->toplevel) {
gtk_widget_add_events(canvas->toplevel, GDK_VISIBILITY_NOTIFY_MASK);
- gtk_object_ref(GTK_OBJECT(canvas->toplevel));
+ g_object_ref (canvas->toplevel);
canvas->visibility_notify_id =
gtk_signal_connect (GTK_OBJECT (canvas->toplevel), "visibility_notify_event",
GTK_SIGNAL_FUNC (e_canvas_visibility), canvas);
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
index 2e486cc312..4e37fcc47b 100644
--- a/widgets/misc/e-gui-utils.c
+++ b/widgets/misc/e-gui-utils.c
@@ -56,7 +56,7 @@ kill_popup_menu (GtkWidget *widget, GtkMenu *menu)
g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
- gtk_object_unref (GTK_OBJECT (menu));
+ g_object_unref (menu);
}
void
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 1cfae2da63..e3a8ec20ab 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -178,7 +178,7 @@ e_popup_menu_copy_1 (EPopupMenu *destination,
destination->pixmap_widget = source->pixmap_widget;
if (destination->pixmap_widget)
- gtk_object_ref (GTK_OBJECT (destination->pixmap_widget));
+ g_object_ref (destination->pixmap_widget);
destination->closure = source->closure;
destination->is_toggle = source->is_toggle;
@@ -196,7 +196,7 @@ e_popup_menu_free_1 (EPopupMenu *menu_item)
e_popup_menu_free (menu_item->submenu);
if (menu_item->pixmap_widget)
- gtk_object_unref (GTK_OBJECT (menu_item->pixmap_widget));
+ g_object_unref (menu_item->pixmap_widget);
}
EPopupMenu *
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 26358d14c1..6524fb2f2e 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -445,7 +445,7 @@ disconnect_model (EReflow *reflow)
reflow->model_items_inserted_id);
gtk_signal_disconnect (GTK_OBJECT (reflow->model),
reflow->model_item_changed_id);
- gtk_object_unref (GTK_OBJECT (reflow->model));
+ g_object_unref (reflow->model);
reflow->model_changed_id = 0;
reflow->model_items_inserted_id = 0;
@@ -465,7 +465,7 @@ disconnect_selection (EReflow *reflow)
reflow->selection_row_changed_id);
gtk_signal_disconnect (GTK_OBJECT (reflow->selection),
reflow->cursor_changed_id);
- gtk_object_unref (GTK_OBJECT (reflow->selection));
+ g_object_unref (reflow->selection);
reflow->selection_changed_id = 0;
reflow->selection_row_changed_id = 0;
@@ -483,7 +483,7 @@ connect_model (EReflow *reflow, EReflowModel *model)
return;
reflow->model = model;
- gtk_object_ref (GTK_OBJECT (reflow->model));
+ g_object_ref (reflow->model);
reflow->model_changed_id =
gtk_signal_connect (GTK_OBJECT (reflow->model), "model_changed",
GTK_SIGNAL_FUNC (model_changed), reflow);
@@ -513,7 +513,7 @@ disconnect_adjustment (EReflow *reflow)
gtk_signal_disconnect (GTK_OBJECT (reflow->adjustment),
reflow->adjustment_value_changed_id);
- gtk_object_unref (GTK_OBJECT (reflow->adjustment));
+ g_object_unref (reflow->adjustment);
reflow->adjustment_changed_id = 0;
reflow->adjustment_value_changed_id = 0;
@@ -536,7 +536,7 @@ connect_adjustment (EReflow *reflow, GtkAdjustment *adjustment)
reflow->adjustment_value_changed_id =
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (adjustment_changed), reflow);
- gtk_object_ref (GTK_OBJECT (adjustment));
+ g_object_ref (adjustment);
}
#if 0
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index 6e8f1f7567..60df46d2da 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -55,7 +55,7 @@ add_sorter(ESelectionModel *esm, ESorter *sorter)
{
esm->sorter = sorter;
if (sorter) {
- gtk_object_ref(GTK_OBJECT(sorter));
+ g_object_ref (sorter);
}
}
@@ -63,7 +63,7 @@ inline static void
drop_sorter(ESelectionModel *esm)
{
if (esm->sorter) {
- gtk_object_unref(GTK_OBJECT(esm->sorter));
+ g_object_unref (esm->sorter);
}
esm->sorter = NULL;
}
generated by cgit (git 2.34.1) at 2024-11-17 01:24:47 +0800