epiphany r7925 - trunk/embed/webkit
- From: xan svn gnome org
- To: svn-commits-list gnome org
- Subject: epiphany r7925 - trunk/embed/webkit
- Date: Sat, 9 Feb 2008 19:21:57 +0000 (GMT)
Author: xan
Date: Sat Feb 9 19:21:57 2008
New Revision: 7925
URL: http://svn.gnome.org/viewvc/epiphany?rev=7925&view=rev
Log:
Cleanups in webkit-embed.c
Modified:
trunk/embed/webkit/webkit-embed.c
Modified: trunk/embed/webkit/webkit-embed.c
==============================================================================
--- trunk/embed/webkit/webkit-embed.c (original)
+++ trunk/embed/webkit/webkit-embed.c Sat Feb 9 19:21:57 2008
@@ -38,10 +38,8 @@
#include "ephy-history-item.h"
static void webkit_embed_class_init (WebKitEmbedClass *klass);
-static void webkit_embed_init (WebKitEmbed *gs);
-static void webkit_embed_destroy (GtkObject *object);
-static void webkit_embed_finalize (GObject *object);
-static void ephy_embed_iface_init (EphyEmbedIface *iface);
+static void webkit_embed_init (WebKitEmbed *gs);
+static void ephy_embed_iface_init (EphyEmbedIface *iface);
#define WEBKIT_EMBED_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), WEBKIT_TYPE_EMBED, WebKitEmbedPrivate))
@@ -85,9 +83,11 @@
else
webkit_items = webkit_web_back_forward_list_get_back_list_with_limit (web_back_forward_list,
WEBKIT_BACK_FORWARD_LIMIT);
+
for (iter = webkit_items; iter != NULL; iter = iter->next) {
EphyHistoryItem *item = webkit_history_item_new (WEBKIT_WEB_HISTORY_ITEM (iter->data));
- ephy_items = g_list_prepend (ephy_items, item);
+ if (item)
+ ephy_items = g_list_prepend (ephy_items, item);
}
g_list_free (webkit_items);
@@ -258,15 +258,22 @@
}
static void
+webkit_embed_finalize (GObject *object)
+{
+ WebKitEmbed *wembed = WEBKIT_EMBED (object);
+
+ g_free (wembed->priv->loading_uri);
+
+ G_OBJECT_CLASS (webkit_embed_parent_class)->finalize (object);
+}
+
+static void
webkit_embed_class_init (WebKitEmbedClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
object_class->finalize = webkit_embed_finalize;
- gtk_object_class->destroy = webkit_embed_destroy;
-
g_type_class_add_private (object_class, sizeof(WebKitEmbedPrivate));
}
@@ -306,22 +313,6 @@
}
static void
-webkit_embed_destroy (GtkObject *object)
-{
- GTK_OBJECT_CLASS (webkit_embed_parent_class)->destroy (object);
-}
-
-static void
-webkit_embed_finalize (GObject *object)
-{
- WebKitEmbed *wembed = WEBKIT_EMBED (object);
-
- g_free (wembed->priv->loading_uri);
-
- G_OBJECT_CLASS (webkit_embed_parent_class)->finalize (object);
-}
-
-static void
impl_load_url (EphyEmbed *embed,
const char *url)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]