diff options
author | Xan Lopez <xan@src.gnome.org> | 2004-10-24 17:52:56 +0000 |
---|---|---|
committer | Xan Lopez <xan@src.gnome.org> | 2004-10-24 17:52:56 +0000 |
commit | cc9996fe2635ca1beba8ac15110fbd398c316791 (patch) | |
tree | b274ead25cae56055c39a9fde7d397f73cc2b5ca | |
parent | 185020305cfdc00750d10eab4b396ec61d804350 (diff) | |
download | epiphany-webcore-branch.tar.gz |
EphyBrowser is embed/mozilla stuff.webcore-branch
* embed/webcore/webcore-embed-single.c:
* embed/webcore/webcore-embed.c: (webcore_embed_init),
(webcore_embed_destroy), (webcore_embed_finalize),
(impl_get_location):
EphyBrowser is embed/mozilla stuff.
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | embed/webcore/webcore-embed-single.c | 1 | ||||
-rw-r--r-- | embed/webcore/webcore-embed.c | 30 |
3 files changed, 11 insertions, 29 deletions
@@ -1,5 +1,14 @@ 2004-10-24 Xan Lopez <xan@gnome.org> + * embed/webcore/webcore-embed-single.c: + * embed/webcore/webcore-embed.c: (webcore_embed_init), + (webcore_embed_destroy), (webcore_embed_finalize), + (impl_get_location): + + EphyBrowser is embed/mozilla stuff. + +2004-10-24 Xan Lopez <xan@gnome.org> + * embed/webcore/webcore-embed.c: (impl_manager_do_command), (impl_manager_can_do_command), (webcore_embed_class_init), (impl_set_zoom), (impl_get_zoom): diff --git a/embed/webcore/webcore-embed-single.c b/embed/webcore/webcore-embed-single.c index b0c55f875..47b5fb664 100644 --- a/embed/webcore/webcore-embed-single.c +++ b/embed/webcore/webcore-embed-single.c @@ -16,7 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * */ #ifdef HAVE_CONFIG_H diff --git a/embed/webcore/webcore-embed.c b/embed/webcore/webcore-embed.c index eafeea183..8edcbbfec 100644 --- a/embed/webcore/webcore-embed.c +++ b/embed/webcore/webcore-embed.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * + * $Id$ */ #ifdef HAVE_CONFIG_H @@ -73,7 +73,6 @@ typedef enum struct WebcoreEmbedPrivate { - /* EphyBrowser *browser;*/ guint security_state; WebcoreEmbedLoadState load_state; }; @@ -206,7 +205,6 @@ webcore_embed_init (WebcoreEmbed *embed) { GtkWidget *khtml; embed->priv = WEBCORE_EMBED_GET_PRIVATE (embed); - //embed->priv->browser = new EphyBrowser (); embed->priv->security_state = STATE_IS_UNKNOWN; khtml = gtk_khtml_new (); @@ -236,27 +234,10 @@ webcore_embed_init (WebcoreEmbed *embed) embed, (GConnectFlags) 0); } -gpointer -_webcore_embed_get_ephy_browser (WebcoreEmbed *embed) -{ - return NULL; - /* - g_return_val_if_fail (embed->priv->browser != NULL, NULL); - - return embed->priv->browser; - */ -} - static void webcore_embed_destroy (GtkObject *object) { WebcoreEmbed *embed = WEBCORE_EMBED (object); - /* - if (embed->priv->browser) - { - embed->priv->browser->Destroy(); - } - */ GTK_OBJECT_CLASS (parent_class)->destroy (object); } @@ -264,13 +245,6 @@ static void webcore_embed_finalize (GObject *object) { WebcoreEmbed *embed = WEBCORE_EMBED (object); - /* - if (embed->priv->browser) - { - delete embed->priv->browser; - embed->priv->browser = nsnull; - } - */ G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -348,7 +322,7 @@ static char * impl_get_location (EphyEmbed *embed, gboolean toplevel) { - return g_strdup(gtk_khtml_get_location (GTK_KHTML (embed))); + return g_strdup (gtk_khtml_get_location (GTK_KHTML (embed))); } static void |