seahorse r2181 - in trunk: . plugins/epiphany plugins/epiphany/mozilla

[sadam svn gnome org]

Author: sadam
Date: Thu Apr 17 21:44:44 2008
New Revision: 2181
URL: http://svn.gnome.org/viewvc/seahorse?rev=2181&view=rev

Log:
2008-04-17  Adam Schreiber  <sadam clemson edu>

    * plugins/nautilus/seahorse-extension.c:
    * plugins/epiphany/mozilla/mozilla-helper.cpp: Changes to work with 
new API.
    Patch from Ed Catmur.  Fixes bug #523325


Modified:
   trunk/ChangeLog
   trunk/plugins/epiphany/mozilla/mozilla-helper.cpp
   trunk/plugins/epiphany/seahorse-extension.c

Modified: trunk/plugins/epiphany/mozilla/mozilla-helper.cpp
==============================================================================
--- trunk/plugins/epiphany/mozilla/mozilla-helper.cpp	(original)
+++ trunk/plugins/epiphany/mozilla/mozilla-helper.cpp	Thu Apr 17 21:44:44 2008
@@ -78,8 +78,10 @@
 mozilla_is_input (EphyEmbed *embed)
 {
 	nsCOMPtr<nsIWebBrowser> browser;
-	gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
+	gtk_moz_embed_get_nsIWebBrowser (
+			GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
 			getter_AddRefs (browser));
+	NS_ENSURE_TRUE (browser, FALSE);
 	nsCOMPtr<nsIWebBrowserFocus> focus (do_QueryInterface(browser));
 	if (!focus) return FALSE;
 
@@ -100,9 +102,11 @@
 mozilla_get_text (EphyEmbed *embed)
 {
     nsCOMPtr<nsIWebBrowser> browser;
-	gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
+	gtk_moz_embed_get_nsIWebBrowser (
+			GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
 			getter_AddRefs (browser));
 	nsCOMPtr<nsIWebBrowserFocus> focus (do_QueryInterface(browser));
+	NS_ENSURE_TRUE (browser, NULL);
 	if (!focus) 
 	    return NULL;
 
@@ -139,8 +143,10 @@
 mozilla_set_text (EphyEmbed *embed, char *new_text)
 {
     nsCOMPtr<nsIWebBrowser> browser;
-	gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
+	gtk_moz_embed_get_nsIWebBrowser (
+			GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
 			getter_AddRefs (browser));
+	NS_ENSURE_TRUE (browser, );
 	nsCOMPtr<nsIWebBrowserFocus> focus (do_QueryInterface(browser));
 	if (!focus) return;
 

Modified: trunk/plugins/epiphany/seahorse-extension.c
==============================================================================
--- trunk/plugins/epiphany/seahorse-extension.c	(original)
+++ trunk/plugins/epiphany/seahorse-extension.c	Thu Apr 17 21:44:44 2008
@@ -25,6 +25,7 @@
 
 #include <epiphany/ephy-extension.h>
 #include <epiphany/ephy-embed.h>
+#include <epiphany/ephy-embed-container.h>
 
 #include "eel-gconf-extensions.h"
 #include "ephy-debug.h"
@@ -239,7 +240,7 @@
     
     init_crypt();
     
-	embed = ephy_window_get_active_embed (window);
+	embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
 	g_return_if_fail (EPHY_IS_EMBED (embed));
 
 	/* ask gecko for the input */
@@ -285,7 +286,7 @@
     
     init_crypt();
     
-	embed = ephy_window_get_active_embed (window);
+	embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
 	g_return_if_fail (EPHY_IS_EMBED (embed));
 
 	/* ask gecko for the input */
@@ -419,7 +420,7 @@
     
     init_crypt();
     
-	embed = ephy_window_get_active_embed (window);
+	embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
 	g_return_if_fail (EPHY_IS_EMBED (embed));
 
 	/* ask gecko for the input */