Bug 606250 - Remove usage of deprecated GTK+ symbols

Several GtkWidget macros were recently deprecated.

7 files changed, 7 insertions, 7 deletions

diff --git a/mail/e-mail-label-manager.c b/mail/e-mail-label-manager.c
index 212a0507ad..c5448ea0a8 100644
--- a/mail/e-mail-label-manager.c
+++ b/mail/e-mail-label-manager.c
@@ -159,7 +159,7 @@ mail_label_manager_add_label (EMailLabelManager *manager)
 	const gchar *label_name;
 
 	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_mail_label_dialog_new (parent);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Add Label"));
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index e3e9613e2e..7951240de0 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -827,7 +827,7 @@ emae_signature_new (GtkWidget *widget, EMAccountEditor *emae)
 	shell_settings = e_shell_get_shell_settings (shell);
 
 	parent = gtk_widget_get_toplevel (widget);
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	html_mode = e_shell_settings_get_boolean (
 		shell_settings, "composer-format-html");
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 09c0ee15b1..41a6ba6640 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -465,7 +465,7 @@ do_grab_focus_cb (GtkWidget *widget, gpointer data)
 	if (*done)
 		return;
 
-	if (widget && GTK_WIDGET_CAN_FOCUS (widget)) {
+	if (widget && gtk_widget_get_can_focus (widget)) {
 		*done = TRUE;
 		gtk_widget_grab_focus (widget);
 	}
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index 48737a122a..d90f9ce2ce 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -213,7 +213,7 @@ folder_selection_button_clicked (GtkButton *button)
 	priv = EM_FOLDER_SELECTION_BUTTON_GET_PRIVATE (button);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (button));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	emft = (EMFolderTree *) em_folder_tree_new ();
 	emu_restore_folder_tree_state (emft);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 0709f28fed..7720ec9e1f 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -568,7 +568,7 @@ folder_tree_cell_edited_cb (EMFolderTree *folder_tree,
 	camel_exception_init (&ex);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (folder_tree));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	tree_view = GTK_TREE_VIEW (folder_tree);
 	model = gtk_tree_view_get_model (tree_view);
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index ccbf531e52..fd0fe783fd 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -834,7 +834,7 @@ efhd_attachment_button(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObje
 	e_attachment_set_can_show (attachment, info->handle != NULL);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (efh->html));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	view = em_format_html_display_get_attachment_view (efhd);
 	gtk_widget_show (GTK_WIDGET (view));
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index 4932470609..6d7d978c06 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -511,7 +511,7 @@ source_add(GtkWidget *widget, struct _source_data *data)
 	gpointer parent;
 
 	parent = gtk_widget_get_toplevel (widget);
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	emft =(EMFolderTree *) em_folder_tree_new ();
 	emu_restore_folder_tree_state (emft);