Bug 606250 - Remove usage of deprecated GTK+ symbols

Several GtkWidget macros were recently deprecated.

13 files changed, 26 insertions, 26 deletions

diff --git a/widgets/misc/e-attachment-handler-image.c b/widgets/misc/e-attachment-handler-image.c
index a91b433c6e..277a51be7f 100644
--- a/widgets/misc/e-attachment-handler-image.c
+++ b/widgets/misc/e-attachment-handler-image.c
@@ -86,7 +86,7 @@ action_image_set_as_background_saved_cb (EAttachment *attachment,
 
 error:
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	dialog = gtk_message_dialog_new_with_markup (
 		parent, GTK_DIALOG_DESTROY_WITH_PARENT,
diff --git a/widgets/misc/e-attachment-handler-sendto.c b/widgets/misc/e-attachment-handler-sendto.c
index 7cf651d98f..dda351bc8d 100644
--- a/widgets/misc/e-attachment-handler-sendto.c
+++ b/widgets/misc/e-attachment-handler-sendto.c
@@ -78,7 +78,7 @@ sendto_save_finished_cb (EAttachment *attachment,
 
 error:
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	dialog = gtk_message_dialog_new_with_markup (
 		parent, GTK_DIALOG_DESTROY_WITH_PARENT,
diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c
index 715018c2fb..7529e669fb 100644
--- a/widgets/misc/e-attachment-view.c
+++ b/widgets/misc/e-attachment-view.c
@@ -75,7 +75,7 @@ action_add_cb (GtkAction *action,
 	gpointer parent;
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	store = e_attachment_view_get_store (view);
 	e_attachment_store_run_load_dialog (store, parent);
@@ -150,7 +150,7 @@ action_properties_cb (GtkAction *action,
 	attachment = selected->data;
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	dialog = e_attachment_dialog_new (parent, attachment);
 	gtk_dialog_run (GTK_DIALOG (dialog));
@@ -174,7 +174,7 @@ action_recent_cb (GtkAction *action,
 	store = e_attachment_view_get_store (view);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	uri = gtk_recent_chooser_get_current_uri (chooser);
 	attachment = e_attachment_new_for_uri (uri);
@@ -204,7 +204,7 @@ action_save_all_cb (GtkAction *action,
 	store = e_attachment_view_get_store (view);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	/* XXX We lose the previous selection. */
 	e_attachment_view_select_all (view);
@@ -244,7 +244,7 @@ action_save_as_cb (GtkAction *action,
 	store = e_attachment_view_get_store (view);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	selected = e_attachment_view_get_selected_attachments (view);
 
@@ -398,7 +398,7 @@ attachment_view_netscape_url (EAttachmentView *view,
 	store = e_attachment_view_get_store (view);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	attachment = e_attachment_new_for_uri (strv[0]);
 	e_attachment_store_add_attachment (store, attachment);
@@ -453,7 +453,7 @@ attachment_view_text_calendar (EAttachmentView *view,
 	store = e_attachment_view_get_store (view);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	attachment = e_attachment_new ();
 	e_attachment_set_mime_part (attachment, mime_part);
@@ -509,7 +509,7 @@ attachment_view_text_x_vcard (EAttachmentView *view,
 	store = e_attachment_view_get_store (view);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	attachment = e_attachment_new ();
 	e_attachment_set_mime_part (attachment, mime_part);
@@ -548,7 +548,7 @@ attachment_view_uris (EAttachmentView *view,
 	store = e_attachment_view_get_store (view);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	for (ii = 0; uris[ii] != NULL; ii++) {
 		EAttachment *attachment;
@@ -1012,7 +1012,7 @@ e_attachment_view_open_path (EAttachmentView *view,
 	gtk_tree_model_get (model, &iter, column_id, &attachment, -1);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	e_attachment_open_async (
 		attachment, app_info, (GAsyncReadyCallback)
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index 920e83d3a3..44e4568656 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -578,7 +578,7 @@ e_calendar_focus (GtkWidget *widget, GtkDirectionType direction)
 	cal = E_CALENDAR (widget);
 	canvas = GNOME_CANVAS (widget);
 
-	if (!GTK_WIDGET_CAN_FOCUS (widget))
+	if (!gtk_widget_get_can_focus (widget))
 		return FALSE;
 
 	children[0] = GNOME_CANVAS_ITEM (cal->calitem);
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index aeb26344ab..5f719fed80 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -561,7 +561,7 @@ e_canvas_item_grab_focus (GnomeCanvasItem *item, gboolean widget_too)
 
 	g_return_if_fail (item != NULL);
 	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
-	g_return_if_fail (GTK_WIDGET_CAN_FOCUS (GTK_WIDGET (item->canvas)));
+	g_return_if_fail (gtk_widget_get_can_focus (GTK_WIDGET (item->canvas)));
 
 	focused_item = item->canvas->focused_item;
 
diff --git a/widgets/misc/e-charset-combo-box.c b/widgets/misc/e-charset-combo-box.c
index 9c992ce1f7..142c8a98a3 100644
--- a/widgets/misc/e-charset-combo-box.c
+++ b/widgets/misc/e-charset-combo-box.c
@@ -84,7 +84,7 @@ charset_combo_box_run_dialog (ECharsetComboBox *combo_box)
 	 *       finally resolved. */
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (combo_box));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	object = G_OBJECT (combo_box->priv->other_action);
 	charset = g_object_get_data (object, "charset");
diff --git a/widgets/misc/e-signature-manager.c b/widgets/misc/e-signature-manager.c
index dff74a0b23..d30d20368a 100644
--- a/widgets/misc/e-signature-manager.c
+++ b/widgets/misc/e-signature-manager.c
@@ -100,7 +100,7 @@ signature_manager_run_script_dialog (ESignatureManager *manager,
 	gchar *path;
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (manager));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	dialog = e_signature_script_dialog_new (parent);
 	gtk_window_set_title (GTK_WINDOW (dialog), title);
@@ -317,7 +317,7 @@ signature_manager_editor_created (ESignatureManager *manager,
 
 	position = GTK_WIN_POS_CENTER_ON_PARENT;
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (manager));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	gtk_window_set_transient_for (GTK_WINDOW (editor), parent);
 	gtk_window_set_position (GTK_WINDOW (editor), position);
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index a873731014..0a0e3143ef 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -255,7 +255,7 @@ action_http_open_cb (GtkAction *action,
 	gpointer parent;
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (web_view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	uri = e_web_view_get_selected_uri (web_view);
 	g_return_if_fail (uri != NULL);
@@ -311,7 +311,7 @@ action_send_message_cb (GtkAction *action,
 	gpointer parent;
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (web_view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	uri = e_web_view_get_selected_uri (web_view);
 	g_return_if_fail (uri != NULL);
@@ -684,7 +684,7 @@ web_view_link_clicked (GtkHTML *html,
 	gpointer parent;
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (html));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	e_show_uri (parent, uri);
 }
diff --git a/widgets/misc/ea-calendar-cell.c b/widgets/misc/ea-calendar-cell.c
index 05d0dcce6b..8728f49a46 100644
--- a/widgets/misc/ea-calendar-cell.c
+++ b/widgets/misc/ea-calendar-cell.c
@@ -378,7 +378,7 @@ component_interface_grab_focus (AtkComponent *component)
 
 	gtk_widget_grab_focus (GTK_WIDGET (GNOME_CANVAS_ITEM (calitem)->canvas));
 	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (GNOME_CANVAS_ITEM (calitem)->canvas));
-	if (toplevel && GTK_WIDGET_TOPLEVEL (toplevel))
+	if (toplevel && gtk_widget_is_toplevel (toplevel))
 		gtk_window_present (GTK_WINDOW (toplevel));
 
 	return TRUE;
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index ed468b3c58..067ce72c4b 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -1761,7 +1761,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 				ethi->maybe_drag = TRUE;
 				is_pointer_on_division (ethi, x, &start, &col);
 				ethi->selected_col = col;
-				if (GTK_WIDGET_CAN_FOCUS (GTK_WIDGET (item->canvas)))
+				if (gtk_widget_get_can_focus (GTK_WIDGET (item->canvas)))
 					e_canvas_item_grab_focus (item, TRUE);
 			} else if (e->button.button == 3) {
 				ethi_header_context_menu (ethi, &e->button);
diff --git a/widgets/table/gal-a11y-e-cell-registry.c b/widgets/table/gal-a11y-e-cell-registry.c
index 5c741e1955..14ee7e7b2a 100644
--- a/widgets/table/gal-a11y-e-cell-registry.c
+++ b/widgets/table/gal-a11y-e-cell-registry.c
@@ -122,7 +122,7 @@ gal_a11y_e_cell_registry_get_object     (GalA11yECellRegistry     *registry,
 		registry = default_registry;
 	}
 
-	type = GTK_OBJECT_TYPE (cell_view->ecell);
+	type = G_OBJECT_TYPE (cell_view->ecell);
 	while (func == NULL && type != 0) {
 		func = g_hash_table_lookup (registry->priv->table, GINT_TO_POINTER (type));
 		type = g_type_parent (type);
diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c
index 65f08f22d3..e9e5eb0455 100644
--- a/widgets/table/gal-a11y-e-cell.c
+++ b/widgets/table/gal-a11y-e-cell.c
@@ -212,7 +212,7 @@ gal_a11y_e_cell_grab_focus (AtkComponent *component)
 		GTK_WIDGET (GNOME_CANVAS_ITEM (a11y->item)->canvas));
 	toplevel = gtk_widget_get_toplevel (
 		GTK_WIDGET (GNOME_CANVAS_ITEM (a11y->item)->canvas));
-	if (toplevel && GTK_WIDGET_TOPLEVEL (toplevel))
+	if (toplevel && gtk_widget_is_toplevel (toplevel))
 		gtk_window_present (GTK_WINDOW (toplevel));
 
 	return TRUE;
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index b9c5e0cbe3..fc73af5cae 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -1463,7 +1463,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 			thiswidth = widget->allocation.width - GTK_CONTAINER (widget)->border_width * 2;
 			thisheight = widget->allocation.height - GTK_CONTAINER (widget)->border_width * 2;
 
-			if (GTK_WIDGET_HAS_DEFAULT (widget) &&
+			if (gtk_widget_has_default (widget) &&
 			    GTK_BUTTON (widget)->relief == GTK_RELIEF_NORMAL)
 				{
 					gtk_paint_box (widget->style, drawable,
@@ -1472,7 +1472,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 						       thisx + xoff, thisy + yoff, thiswidth, thisheight);
 				}
 
-			if (GTK_WIDGET_CAN_DEFAULT (widget)) {
+			if (gtk_widget_get_can_default (widget)) {
 				thisx += widget->style->xthickness;
 				thisy += widget->style->ythickness;
 				thiswidth -= 2 * thisx + default_spacing;