aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/e-calendar.c14
-rw-r--r--widgets/misc/e-canvas-vbox.c8
-rw-r--r--widgets/misc/e-canvas.c2
-rw-r--r--widgets/misc/e-printable.c4
-rw-r--r--widgets/misc/e-printable.h4
-rw-r--r--widgets/table/e-cell-combo.c4
-rw-r--r--widgets/table/e-cell-popup.c2
-rw-r--r--widgets/table/e-table-click-to-add.c12
-rw-r--r--widgets/table/e-table-group-container.c8
-rw-r--r--widgets/table/e-table-group-leaf.c16
-rw-r--r--widgets/table/e-table-group.c2
-rw-r--r--widgets/table/e-table-header-item.c4
-rw-r--r--widgets/table/e-table-header-item.h2
-rw-r--r--widgets/table/e-table-model.c14
-rw-r--r--widgets/table/e-table.c16
-rw-r--r--widgets/table/e-tree-model.c20
-rw-r--r--widgets/table/e-tree.c12
-rw-r--r--widgets/table/gal-a11y-e-table-item.c7
-rw-r--r--widgets/text/e-reflow.c8
19 files changed, 79 insertions, 80 deletions
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index af5d0c7d83..d835ba89ae 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -65,7 +65,7 @@
#define E_CALENDAR_AUTO_MOVE_TIMEOUT 150
#define E_CALENDAR_AUTO_MOVE_TIMEOUT_DELAY 2
-static void e_calendar_destroy (GtkObject *object);
+static void e_calendar_dispose (GObject *object);
static void e_calendar_realize (GtkWidget *widget);
static void e_calendar_style_set (GtkWidget *widget,
GtkStyle *previous_style);
@@ -105,13 +105,13 @@ G_DEFINE_TYPE (
static void
e_calendar_class_init (ECalendarClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
GtkWidgetClass *widget_class;
- object_class = (GtkObjectClass *) class;
+ object_class = (GObjectClass *) class;
widget_class = (GtkWidgetClass *) class;
- object_class->destroy = e_calendar_destroy;
+ object_class->dispose = e_calendar_dispose;
widget_class->realize = e_calendar_realize;
widget_class->style_set = e_calendar_style_set;
@@ -223,7 +223,7 @@ e_calendar_new (void)
}
static void
-e_calendar_destroy (GtkObject *object)
+e_calendar_dispose (GObject *object)
{
ECalendar *cal;
@@ -237,8 +237,8 @@ e_calendar_destroy (GtkObject *object)
cal->timeout_id = 0;
}
- if (GTK_OBJECT_CLASS (e_calendar_parent_class)->destroy)
- (* GTK_OBJECT_CLASS (e_calendar_parent_class)->destroy) (object);
+ if (G_OBJECT_CLASS (e_calendar_parent_class)->dispose)
+ G_OBJECT_CLASS (e_calendar_parent_class)->dispose (object);
}
static void
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index c41cac160f..270c55c27d 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -364,14 +364,14 @@ e_canvas_vbox_reflow ( GnomeCanvasItem *item, gint flags )
void
e_canvas_vbox_add_item (ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
{
- if (E_CANVAS_VBOX_CLASS (GTK_OBJECT_GET_CLASS (e_canvas_vbox))->add_item)
- (E_CANVAS_VBOX_CLASS (GTK_OBJECT_GET_CLASS (e_canvas_vbox))->add_item) (e_canvas_vbox, item);
+ if (E_CANVAS_VBOX_CLASS (G_OBJECT_GET_CLASS (e_canvas_vbox))->add_item)
+ (E_CANVAS_VBOX_CLASS (G_OBJECT_GET_CLASS (e_canvas_vbox))->add_item) (e_canvas_vbox, item);
}
void
e_canvas_vbox_add_item_start (ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
{
- if (E_CANVAS_VBOX_CLASS (GTK_OBJECT_GET_CLASS (e_canvas_vbox))->add_item_start)
- (E_CANVAS_VBOX_CLASS (GTK_OBJECT_GET_CLASS (e_canvas_vbox))->add_item_start) (e_canvas_vbox, item);
+ if (E_CANVAS_VBOX_CLASS (G_OBJECT_GET_CLASS (e_canvas_vbox))->add_item_start)
+ (E_CANVAS_VBOX_CLASS (G_OBJECT_GET_CLASS (e_canvas_vbox))->add_item_start) (e_canvas_vbox, item);
}
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 11d6c55271..dfa529ec6b 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -192,7 +192,7 @@ gnome_canvas_item_invoke_point (GnomeCanvasItem *item,
y = i.y;
#endif
- return (* GNOME_CANVAS_ITEM_CLASS (GTK_OBJECT_GET_CLASS (item))->point) (
+ return (* GNOME_CANVAS_ITEM_CLASS (G_OBJECT_GET_CLASS (item))->point) (
item, x, y, cx, cy, actual_item);
}
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index bc3233a38a..aa723f61c4 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -28,12 +28,12 @@
#include "e-printable.h"
-#define EP_CLASS(e) ((EPrintableClass *)((GtkObject *)e)->klass)
+#define EP_CLASS(e) ((EPrintableClass *)((GObject *)e)->klass)
G_DEFINE_TYPE (
EPrintable,
e_printable,
- GTK_TYPE_OBJECT)
+ G_TYPE_OBJECT)
enum {
PRINT_PAGE,
diff --git a/widgets/misc/e-printable.h b/widgets/misc/e-printable.h
index 32cbadddbd..b8d9893799 100644
--- a/widgets/misc/e-printable.h
+++ b/widgets/misc/e-printable.h
@@ -35,11 +35,11 @@ G_BEGIN_DECLS
#define E_IS_PRINTABLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_PRINTABLE_TYPE))
typedef struct {
- GtkObject base;
+ GObject base;
} EPrintable;
typedef struct {
- GtkObjectClass parent_class;
+ GObjectClass parent_class;
/*
* Signals
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 6e8eb41762..d4ba4f31e3 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -435,7 +435,7 @@ e_cell_combo_get_popup_pos (ECellCombo *ecc,
scrollbar_width =
requisition.width
- + GTK_SCROLLED_WINDOW_CLASS (GTK_OBJECT_GET_CLASS (popup))->scrollbar_spacing;
+ + GTK_SCROLLED_WINDOW_CLASS (G_OBJECT_GET_CLASS (popup))->scrollbar_spacing;
avail_height = gdk_screen_height () - *y;
@@ -491,7 +491,7 @@ e_cell_combo_get_popup_pos (ECellCombo *ecc,
if (show_hscroll)
work_height +=
requisition.height +
- GTK_SCROLLED_WINDOW_CLASS (GTK_OBJECT_GET_CLASS (popup))->scrollbar_spacing;
+ GTK_SCROLLED_WINDOW_CLASS (G_OBJECT_GET_CLASS (popup))->scrollbar_spacing;
/* Check if it fits in the available height. */
if (work_height + list_requisition.height > avail_height) {
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 5b98a205f2..ad2009d0ac 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -461,7 +461,7 @@ e_cell_popup_do_popup (ECellPopupView *ecp_view,
ecp->popup_cell_view = ecp_view;
- popup_func = E_CELL_POPUP_CLASS (GTK_OBJECT_GET_CLASS (ecp))->popup;
+ popup_func = E_CELL_POPUP_CLASS (G_OBJECT_GET_CLASS (ecp))->popup;
ecp->popup_view_col = view_col;
ecp->popup_row = row;
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index a905e2bdb7..706146f2da 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -66,7 +66,7 @@ enum {
};
static void
-etcta_cursor_change (GtkObject *object, gint row, gint col, ETableClickToAdd *etcta)
+etcta_cursor_change (GObject *object, gint row, gint col, ETableClickToAdd *etcta)
{
g_signal_emit (etcta,
etcta_signals[CURSOR_CHANGE], 0,
@@ -360,7 +360,7 @@ finish_editing (ETableClickToAdd *etcta)
e_table_item_leave_edit (E_TABLE_ITEM (etcta->row));
e_table_one_commit (E_TABLE_ONE (etcta->one));
etcta_drop_one (etcta);
- gtk_object_destroy (GTK_OBJECT (etcta->row));
+ g_object_run_dispose (G_OBJECT (etcta->row));
etcta->row = NULL;
one = e_table_one_new (etcta->model);
@@ -401,11 +401,11 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e)
case GDK_BUTTON_PRESS:
if (etcta->text) {
- gtk_object_destroy (GTK_OBJECT (etcta->text));
+ g_object_run_dispose (G_OBJECT (etcta->text));
etcta->text = NULL;
}
if (etcta->rect) {
- gtk_object_destroy (GTK_OBJECT (etcta->rect));
+ g_object_run_dispose (G_OBJECT (etcta->rect));
etcta->rect = NULL;
}
if (!etcta->row) {
@@ -450,7 +450,7 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e)
if (etcta->row) {
e_table_item_leave_edit (E_TABLE_ITEM (etcta->row));
etcta_drop_one (etcta);
- gtk_object_destroy (GTK_OBJECT (etcta->row));
+ g_object_run_dispose (G_OBJECT (etcta->row));
etcta->row = NULL;
create_rect_and_text (etcta);
e_canvas_item_move_absolute (etcta->text, 3, 3);
@@ -613,7 +613,7 @@ e_table_click_to_add_commit (ETableClickToAdd *etcta)
if (etcta->row) {
e_table_one_commit (E_TABLE_ONE (etcta->one));
etcta_drop_one (etcta);
- gtk_object_destroy (GTK_OBJECT (etcta->row));
+ g_object_run_dispose (G_OBJECT (etcta->row));
etcta->row = NULL;
}
create_rect_and_text (etcta);
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index c3d44c777a..4f5a8751c3 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -75,12 +75,12 @@ e_table_group_container_child_node_free (ETableGroupContainer *etgc,
ETableGroup *etg = E_TABLE_GROUP (etgc);
ETableGroup *child = child_node->child;
- gtk_object_destroy (GTK_OBJECT (child));
+ g_object_run_dispose (G_OBJECT (child));
e_table_model_free_value (etg->model, etgc->ecol->col_idx,
child_node->key);
g_free (child_node->string);
- gtk_object_destroy (GTK_OBJECT (child_node->text));
- gtk_object_destroy (GTK_OBJECT (child_node->rect));
+ g_object_run_dispose (G_OBJECT (child_node->text));
+ g_object_run_dispose (G_OBJECT (child_node->rect));
}
static void
@@ -123,7 +123,7 @@ etgc_dispose (GObject *object)
etgc->selection_model = NULL;
if (etgc->rect)
- gtk_object_destroy (GTK_OBJECT (etgc->rect));
+ g_object_run_dispose (G_OBJECT (etgc->rect));
etgc->rect = NULL;
G_OBJECT_CLASS (etgc_parent_class)->dispose (object);
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index a111999ba9..37f28f217f 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -97,7 +97,7 @@ etgl_dispose (GObject *object)
etgl->etgl_key_press_id = 0;
etgl->etgl_start_drag_id = 0;
- gtk_object_destroy (GTK_OBJECT (etgl->item));
+ g_object_run_dispose (G_OBJECT (etgl->item));
etgl->item = NULL;
}
@@ -166,7 +166,7 @@ e_table_group_leaf_new (GnomeCanvasGroup *parent,
}
static void
-etgl_cursor_change (GtkObject *object, gint row, ETableGroupLeaf *etgl)
+etgl_cursor_change (GObject *object, gint row, ETableGroupLeaf *etgl)
{
if (row < E_TABLE_SUBSET (etgl->ets)->n_map)
e_table_group_cursor_change (E_TABLE_GROUP (etgl),
@@ -174,7 +174,7 @@ etgl_cursor_change (GtkObject *object, gint row, ETableGroupLeaf *etgl)
}
static void
-etgl_cursor_activated (GtkObject *object, gint view_row, ETableGroupLeaf *etgl)
+etgl_cursor_activated (GObject *object, gint view_row, ETableGroupLeaf *etgl)
{
if (view_row < E_TABLE_SUBSET (etgl->ets)->n_map)
e_table_group_cursor_activated (E_TABLE_GROUP (etgl),
@@ -182,14 +182,14 @@ etgl_cursor_activated (GtkObject *object, gint view_row, ETableGroupLeaf *etgl)
}
static void
-etgl_double_click (GtkObject *object, gint model_row, gint model_col, GdkEvent *event,
+etgl_double_click (GObject *object, gint model_row, gint model_col, GdkEvent *event,
ETableGroupLeaf *etgl)
{
e_table_group_double_click (E_TABLE_GROUP (etgl), model_row, model_col, event);
}
static gboolean
-etgl_key_press (GtkObject *object,
+etgl_key_press (GObject *object,
gint row,
gint col,
GdkEvent *event,
@@ -205,14 +205,14 @@ etgl_key_press (GtkObject *object,
}
static gboolean
-etgl_start_drag (GtkObject *object, gint model_row, gint model_col, GdkEvent *event,
+etgl_start_drag (GObject *object, gint model_row, gint model_col, GdkEvent *event,
ETableGroupLeaf *etgl)
{
return e_table_group_start_drag (E_TABLE_GROUP (etgl), model_row, model_col, event);
}
static gboolean
-etgl_right_click (GtkObject *object, gint view_row, gint model_col, GdkEvent *event,
+etgl_right_click (GObject *object, gint view_row, gint model_col, GdkEvent *event,
ETableGroupLeaf *etgl)
{
if (view_row < E_TABLE_SUBSET (etgl->ets)->n_map)
@@ -225,7 +225,7 @@ etgl_right_click (GtkObject *object, gint view_row, gint model_col, GdkEvent *ev
}
static gboolean
-etgl_click (GtkObject *object,
+etgl_click (GObject *object,
gint row,
gint col,
GdkEvent *event,
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index ceec4fd81c..c7a867a84a 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -36,7 +36,7 @@
#define etg_get_type e_table_group_get_type
G_DEFINE_TYPE (ETableGroup, etg, GNOME_TYPE_CANVAS_GROUP)
-#define ETG_CLASS(e) (E_TABLE_GROUP_CLASS(GTK_OBJECT_GET_CLASS(e)))
+#define ETG_CLASS(e) (E_TABLE_GROUP_CLASS(G_OBJECT_GET_CLASS(e)))
enum {
CURSOR_CHANGE,
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index a550bbdda5..5e370fb0a6 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -555,7 +555,7 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi)
gdouble x1;
if (ethi->remove_item)
- gtk_object_destroy (GTK_OBJECT (ethi->remove_item));
+ g_object_run_dispose (G_OBJECT (ethi->remove_item));
if (!ethi->stipple)
ethi->stipple = gdk_bitmap_create_from_data (
@@ -585,7 +585,7 @@ ethi_remove_destroy_marker (ETableHeaderItem *ethi)
if (!ethi->remove_item)
return;
- gtk_object_destroy (GTK_OBJECT (ethi->remove_item));
+ g_object_run_dispose (G_OBJECT (ethi->remove_item));
ethi->remove_item = NULL;
}
diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h
index 911f7d4884..c78ecea897 100644
--- a/widgets/table/e-table-header-item.h
+++ b/widgets/table/e-table-header-item.h
@@ -56,7 +56,7 @@ typedef struct {
gint resize_start_pos;
gint resize_min_width;
- GtkObject *resize_guide;
+ gpointer resize_guide;
gint group_indent_width;
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index a03d3f4269..dbe01a345c 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -393,7 +393,7 @@ e_table_model_pre_change (ETableModel *e_table_model)
return;
d (print_tabs ());
- d(g_print("Emitting pre_change on model 0x%p, a %s.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type)));
+ d(g_print("Emitting pre_change on model 0x%p, a %s.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type)));
d (depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals[MODEL_PRE_CHANGE], 0);
@@ -423,7 +423,7 @@ e_table_model_no_change (ETableModel *e_table_model)
return;
d (print_tabs ());
- d(g_print("Emitting model_no_change on model 0x%p, a %s.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type)));
+ d(g_print("Emitting model_no_change on model 0x%p, a %s.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type)));
d (depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals[MODEL_NO_CHANGE], 0);
@@ -453,7 +453,7 @@ e_table_model_changed (ETableModel *e_table_model)
return;
d (print_tabs ());
- d(g_print("Emitting model_changed on model 0x%p, a %s.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type)));
+ d(g_print("Emitting model_changed on model 0x%p, a %s.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type)));
d (depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals[MODEL_CHANGED], 0);
@@ -480,7 +480,7 @@ e_table_model_row_changed (ETableModel *e_table_model, gint row)
return;
d (print_tabs ());
- d(g_print("Emitting row_changed on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type), row));
+ d(g_print("Emitting row_changed on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type), row));
d (depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals[MODEL_ROW_CHANGED], 0, row);
@@ -508,7 +508,7 @@ e_table_model_cell_changed (ETableModel *e_table_model, gint col, gint row)
return;
d (print_tabs ());
- d(g_print("Emitting cell_changed on model 0x%p, a %s, row %d, col %d.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type), row, col));
+ d(g_print("Emitting cell_changed on model 0x%p, a %s, row %d, col %d.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type), row, col));
d (depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals[MODEL_CELL_CHANGED], 0, col, row);
@@ -536,7 +536,7 @@ e_table_model_rows_inserted (ETableModel *e_table_model, gint row, gint count)
return;
d (print_tabs ());
- d(g_print("Emitting row_inserted on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type), row));
+ d(g_print("Emitting row_inserted on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type), row));
d (depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals[MODEL_ROWS_INSERTED], 0, row, count);
@@ -579,7 +579,7 @@ e_table_model_rows_deleted (ETableModel *e_table_model, gint row, gint count)
return;
d (print_tabs ());
- d(g_print("Emitting row_deleted on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type), row));
+ d(g_print("Emitting row_deleted on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type), row));
d (depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals[MODEL_ROWS_DELETED], 0, row, count);
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 47983f6da8..0db8f8e170 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -662,7 +662,7 @@ group_info_changed (ETableSortInfo *info, ETable *et)
if (et->is_grouped || will_be_grouped) {
et->need_rebuild = TRUE;
if (!et->rebuild_idle_id) {
- gtk_object_destroy (GTK_OBJECT (et->group));
+ g_object_run_dispose (G_OBJECT (et->group));
et->group = NULL;
et->rebuild_idle_id = g_idle_add_full (20, changed_idle, et, NULL);
}
@@ -923,7 +923,7 @@ et_table_model_changed (ETableModel *model, ETable *et)
{
et->need_rebuild = TRUE;
if (!et->rebuild_idle_id) {
- gtk_object_destroy (GTK_OBJECT (et->group));
+ g_object_run_dispose (G_OBJECT (et->group));
et->group = NULL;
et->rebuild_idle_id = g_idle_add_full (20, changed_idle, et, NULL);
}
@@ -1065,7 +1065,7 @@ changed_idle (gpointer data)
GtkAllocation allocation;
if (et->group)
- gtk_object_destroy (GTK_OBJECT (et->group));
+ g_object_run_dispose (G_OBJECT (et->group));
et_build_groups (et);
widget = GTK_WIDGET (et->table_canvas);
@@ -1110,7 +1110,7 @@ static gboolean
white_item_event (GnomeCanvasItem *white_item, GdkEvent *event, ETable *e_table)
{
gboolean return_val = 0;
- g_signal_emit (GTK_OBJECT (e_table), et_signals[WHITE_SPACE_EVENT], 0,
+ g_signal_emit (G_OBJECT (e_table), et_signals[WHITE_SPACE_EVENT], 0,
event, &return_val);
return return_val;
}
@@ -2317,7 +2317,7 @@ et_set_property (GObject *object,
g_signal_connect (G_OBJECT (etable->click_to_add), "cursor_change",
G_CALLBACK (click_to_add_cursor_change), etable);
} else {
- gtk_object_destroy (GTK_OBJECT (etable->click_to_add));
+ g_object_run_dispose (G_OBJECT (etable->click_to_add));
etable->click_to_add = NULL;
}
break;
@@ -2739,7 +2739,7 @@ e_table_drag_highlight (ETable *table,
NULL);
} else {
if (table->drop_highlight) {
- gtk_object_destroy (GTK_OBJECT (table->drop_highlight));
+ g_object_run_dispose (G_OBJECT (table->drop_highlight));
table->drop_highlight = NULL;
}
}
@@ -2758,7 +2758,7 @@ e_table_drag_unhighlight (ETable *table)
g_return_if_fail (E_IS_TABLE (table));
if (table->drop_highlight) {
- gtk_object_destroy (GTK_OBJECT (table->drop_highlight));
+ g_object_run_dispose (G_OBJECT (table->drop_highlight));
table->drop_highlight = NULL;
}
}
@@ -3108,7 +3108,7 @@ static void
context_destroyed (gpointer data)
{
ETable *et = data;
- /* if (!GTK_OBJECT_DESTROYED (et)) */
+ /* if (!G_OBJECT_DESTROYED (et)) */
/* FIXME: */
{
et->last_drop_x = 0;
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 0c346c6ec9..2c90c6ae72 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -226,7 +226,7 @@ e_tree_model_pre_change (ETreeModel *tree_model)
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting pre_change on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting pre_change on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[PRE_CHANGE], 0);
}
@@ -246,7 +246,7 @@ e_tree_model_no_change (ETreeModel *tree_model)
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting no_change on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting no_change on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NO_CHANGE], 0);
}
@@ -266,7 +266,7 @@ e_tree_model_rebuilt (ETreeModel *tree_model)
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting rebuilt on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting rebuilt on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[REBUILT], 0);
}
@@ -285,7 +285,7 @@ e_tree_model_node_changed (ETreeModel *tree_model, ETreePath node)
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_changed on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_changed on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_CHANGED], 0, node);
}
@@ -305,7 +305,7 @@ e_tree_model_node_data_changed (ETreeModel *tree_model, ETreePath node)
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_data_changed on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_data_changed on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_DATA_CHANGED], 0, node);
}
@@ -325,7 +325,7 @@ e_tree_model_node_col_changed (ETreeModel *tree_model, ETreePath node, gint col
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_col_changed on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_col_changed on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_COL_CHANGED], 0, node, col);
}
@@ -346,7 +346,7 @@ e_tree_model_node_inserted (ETreeModel *tree_model,
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_inserted on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_inserted on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_INSERTED], 0,
parent_node, inserted_node);
@@ -366,7 +366,7 @@ e_tree_model_node_removed (ETreeModel *tree_model, ETreePath parent_node, ETree
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_removed on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_removed on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_REMOVED], 0,
parent_node, removed_node, old_position);
@@ -385,7 +385,7 @@ e_tree_model_node_deleted (ETreeModel *tree_model, ETreePath deleted_node)
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_deleted on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_deleted on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_DELETED], 0, deleted_node);
}
@@ -403,7 +403,7 @@ e_tree_model_node_request_collapse (ETreeModel *tree_model, ETreePath collapsed
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_request_collapse on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_request_collapse on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_REQUEST_COLLAPSE], 0, collapsed_node);
}
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index b85475248a..dfb145e86f 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -299,13 +299,13 @@ e_tree_state_change (ETree *et)
}
static void
-change_trigger (GtkObject *object, ETree *et)
+change_trigger (GObject *object, ETree *et)
{
e_tree_state_change (et);
}
static void
-search_col_change_trigger (GtkObject *object, ETree *et)
+search_col_change_trigger (GObject *object, ETree *et)
{
clear_current_search_col (et);
e_tree_state_change (et);
@@ -431,7 +431,7 @@ et_dispose (GObject *object)
et->priv->last_drop_context = NULL;
if (et->priv->info_text)
- gtk_object_destroy (GTK_OBJECT (et->priv->info_text));
+ g_object_run_dispose (G_OBJECT (et->priv->info_text));
et->priv->info_text = NULL;
et->priv->info_text_resize_id = 0;
@@ -2532,7 +2532,7 @@ e_tree_drag_highlight (ETree *tree,
"y2", (gdouble) y + height - 1,
NULL);
} else {
- gtk_object_destroy (GTK_OBJECT (tree->priv->drop_highlight));
+ g_object_run_dispose (G_OBJECT (tree->priv->drop_highlight));
tree->priv->drop_highlight = NULL;
}
}
@@ -2544,7 +2544,7 @@ e_tree_drag_unhighlight (ETree *tree)
g_return_if_fail (E_IS_TREE (tree));
if (tree->priv->drop_highlight) {
- gtk_object_destroy (GTK_OBJECT (tree->priv->drop_highlight));
+ g_object_run_dispose (G_OBJECT (tree->priv->drop_highlight));
tree->priv->drop_highlight = NULL;
}
}
@@ -3639,7 +3639,7 @@ e_tree_set_info_message (ETree *tree, const gchar *info_message)
if (!info_message || !*info_message) {
g_signal_handler_disconnect (tree, tree->priv->info_text_resize_id);
- gtk_object_destroy (GTK_OBJECT (tree->priv->info_text));
+ g_object_run_dispose (G_OBJECT (tree->priv->info_text));
tree->priv->info_text = NULL;
return;
}
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index f65da5dd52..3938bd02ec 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -69,7 +69,7 @@ static gboolean gal_a11y_e_table_item_unref_selection (GalA11yETableItem *a11y);
static AtkObject* eti_ref_at (AtkTable *table, gint row, gint column);
static void
-item_destroyed (GtkObject *item, gpointer user_data)
+item_finalized (gpointer user_data, GObject *gone_item)
{
GalA11yETableItem *a11y = GAL_A11Y_E_TABLE_ITEM (user_data);
GalA11yETableItemPrivate *priv = GET_PRIVATE (a11y);
@@ -1098,9 +1098,8 @@ gal_a11y_e_table_item_new (ETableItem *item)
}
if (item)
- g_signal_connect (G_OBJECT (item), "destroy",
- G_CALLBACK (item_destroyed),
- a11y);
+ g_object_weak_ref (G_OBJECT (item), item_finalized, a11y);
+
esm = item->selection;
if (esm != NULL) {
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index 99b35f9225..d7522d6344 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -398,7 +398,7 @@ item_removed (EReflowModel *model, gint i, EReflow *reflow)
}
if (reflow->items[i])
- gtk_object_destroy (GTK_OBJECT (reflow->items[i]));
+ g_object_run_dispose (G_OBJECT (reflow->items[i]));
memmove (reflow->heights + i, reflow->heights + i + 1, (reflow->count - i - 1) * sizeof (gint));
memmove (reflow->items + i, reflow->items + i + 1, (reflow->count - i - 1) * sizeof (GnomeCanvasItem *));
@@ -482,7 +482,7 @@ model_changed (EReflowModel *model, EReflow *reflow)
for (i = 0; i < count; i++) {
if (reflow->items[i])
- gtk_object_destroy (GTK_OBJECT (reflow->items[i]));
+ g_object_run_dispose (G_OBJECT (reflow->items[i]));
}
g_free (reflow->items);
g_free (reflow->heights);
@@ -530,7 +530,7 @@ set_empty (EReflow *reflow)
reflow->minimum_width / 2,
0);
} else {
- gtk_object_destroy (GTK_OBJECT (reflow->empty_text));
+ g_object_run_dispose (G_OBJECT (reflow->empty_text));
reflow->empty_text = NULL;
}
} else {
@@ -553,7 +553,7 @@ set_empty (EReflow *reflow)
}
} else {
if (reflow->empty_text) {
- gtk_object_destroy (GTK_OBJECT (reflow->empty_text));
+ g_object_run_dispose (G_OBJECT (reflow->empty_text));
reflow->empty_text = NULL;
}
}
generated by cgit (git 2.34.1) at 2024-11-18 04:08:23 +0800