[epiphany-extensions/gnome-2-30] all: fix warnings generated by previous build fix



commit 86fa7b16d7e1e52355373df8b66f49a27d17399f
Author: Diego Escalante Urrelo <descalante igalia com>
Date:   Thu Apr 1 00:35:47 2010 -0500

    all: fix warnings generated by previous build fix
    
    Also catch another deprecation in the -unused- certificates extension.

 extensions/adblock/ephy-adblock-extension.c        |    3 ++-
 .../certificates/ephy-certificates-extension.c     |    4 ++--
 .../error-viewer/ephy-error-viewer-extension.c     |    3 ++-
 extensions/page-info/ephy-page-info-extension.c    |    3 ++-
 extensions/rss/ephy-rss-extension.c                |    3 ++-
 extensions/select-stylesheet/ephy-css-menu.c       |    2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/extensions/adblock/ephy-adblock-extension.c b/extensions/adblock/ephy-adblock-extension.c
index 3290c9b..a9cef07 100644
--- a/extensions/adblock/ephy-adblock-extension.c
+++ b/extensions/adblock/ephy-adblock-extension.c
@@ -391,7 +391,8 @@ switch_page_cb (GtkNotebook *notebook,
 		EphyWindow *window)
 {
 	/* FIXME: this shouldn't happen anymore with gtk 2.10 ! Test & remove */
-	if (gtk_widget_get_realized (window) == FALSE) return; /* on startup */
+	if (gtk_widget_get_realized (GTK_WIDGET (window)) == FALSE)
+		return; /* on startup */
 
 	update_statusbar (window);
 }
diff --git a/extensions/certificates/ephy-certificates-extension.c b/extensions/certificates/ephy-certificates-extension.c
index 3413807..0d4a71d 100644
--- a/extensions/certificates/ephy-certificates-extension.c
+++ b/extensions/certificates/ephy-certificates-extension.c
@@ -157,7 +157,7 @@ manage_certificates_cb (GtkAction *action,
 	g_return_if_fail (manager != NULL);
 
 	window = gtk_widget_get_toplevel (manager);
-	g_return_if_fail (GTK_WIDGET_TOPLEVEL (window));
+	g_return_if_fail (gtk_widget_is_toplevel (window));
 
 	gtk_window_set_role (GTK_WINDOW (window), "epiphany-certificate-manager");
 	gtk_window_set_title (GTK_WINDOW (window), _("Certificates"));
@@ -188,7 +188,7 @@ manage_devices_cb (GtkAction *action,
 	g_return_if_fail (manager != NULL);
 
 	window = gtk_widget_get_toplevel (manager);
-	g_return_if_fail (GTK_WIDGET_TOPLEVEL (window));
+	g_return_if_fail (gtk_widget_is_toplevel (window));
 
 	gtk_window_set_role (GTK_WINDOW (window), "epiphany-security-device-manager");
 	gtk_window_set_title (GTK_WINDOW (window), _("Security Devices"));
diff --git a/extensions/error-viewer/ephy-error-viewer-extension.c b/extensions/error-viewer/ephy-error-viewer-extension.c
index 4d5fb80..acaf060 100644
--- a/extensions/error-viewer/ephy-error-viewer-extension.c
+++ b/extensions/error-viewer/ephy-error-viewer-extension.c
@@ -320,7 +320,8 @@ switch_page_cb (GtkNotebook *notebook,
 		EphyWindow *window)
 {
 	g_return_if_fail (EPHY_IS_WINDOW (window));
-	if (gtk_widget_get_realized (window) == FALSE) return; /* on startup */
+	if (gtk_widget_get_realized (GTK_WIDGET (window)) == FALSE)
+		return; /* on startup */
 
 	update_actions (window);
 }
diff --git a/extensions/page-info/ephy-page-info-extension.c b/extensions/page-info/ephy-page-info-extension.c
index 48ec432..0cef7dc 100644
--- a/extensions/page-info/ephy-page-info-extension.c
+++ b/extensions/page-info/ephy-page-info-extension.c
@@ -223,7 +223,8 @@ switch_page_cb (GtkNotebook *notebook,
 {
 	EphyEmbed *embed;
 
-	if (gtk_widget_get_realized (window) == FALSE) return; /* on startup */
+	if (gtk_widget_get_realized (GTK_WIDGET (window)) == FALSE)
+		return; /* on startup */
 
 	embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
 	update_action (window, embed);
diff --git a/extensions/rss/ephy-rss-extension.c b/extensions/rss/ephy-rss-extension.c
index 783b9d7..2a42fa6 100644
--- a/extensions/rss/ephy-rss-extension.c
+++ b/extensions/rss/ephy-rss-extension.c
@@ -303,7 +303,8 @@ ephy_rss_sync_active_tab (EphyWindow *window,
 			  GParamSpec *pspec,
 			  gpointer data)
 {
-	if (gtk_widget_get_realized (window) == FALSE) return; /* on startup */
+	if (gtk_widget_get_realized (GTK_WIDGET (window)) == FALSE)
+		return; /* on startup */
 
 	ephy_rss_update_action (window);
 }
diff --git a/extensions/select-stylesheet/ephy-css-menu.c b/extensions/select-stylesheet/ephy-css-menu.c
index 46b4bad..65c70f6 100644
--- a/extensions/select-stylesheet/ephy-css-menu.c
+++ b/extensions/select-stylesheet/ephy-css-menu.c
@@ -358,7 +358,7 @@ ephy_css_menu_set_window (EphyCSSMenu *menu, EphyWindow *window)
 	g_signal_connect (window, "notify::active-child",
 			  G_CALLBACK (sync_active_tab_cb), menu);
 
-	if (gtk_widget_get_realized (window))
+	if (gtk_widget_get_realized (GTK_WIDGET (window)))
 	{
 		embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
 		ephy_css_menu_set_embed (menu, embed);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]