svnno****@sourc*****
svnno****@sourc*****
Fri Sep 4 09:39:03 JST 2009
Revision: 3824
http://sourceforge.jp/projects/kazehakase/svn/view?view=rev&revision=3824
Author: ikezoe
Date: 2009-09-04 09:39:03 +0900 (Fri, 04 Sep 2009)
Log Message:
-----------
* src/kz-embed.[ch]: Remove get_location interface.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/dbus/kz-dbus-embed-agent.c
kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
kazehakase/trunk/module/embed/gecko/kz-mozeventlistener.cpp
kazehakase/trunk/module/embed/per-process/kz-dbus-embed-delegate.c
kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c
kazehakase/trunk/src/kz-embed.c
kazehakase/trunk/src/kz-embed.h
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-09-04 00:29:12 UTC (rev 3823)
+++ kazehakase/trunk/ChangeLog 2009-09-04 00:39:03 UTC (rev 3824)
@@ -12,6 +12,7 @@
* src/bookmarks/kz-bookmark-bar.c, src/bookmarks/kz-bookmark-item.c:
KzEmbed -> KzWeb.
* src/kz-embed.[ch]: Remove get_title interface.
+ * src/kz-embed.[ch]: Remove get_location interface.
2009-09-02 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/dbus/kz-dbus-embed-agent.c
===================================================================
--- kazehakase/trunk/dbus/kz-dbus-embed-agent.c 2009-09-04 00:29:12 UTC (rev 3823)
+++ kazehakase/trunk/dbus/kz-dbus-embed-agent.c 2009-09-04 00:39:03 UTC (rev 3824)
@@ -395,7 +395,6 @@
iface->view_current_page_source_in_new
= NULL;
iface->is_loading = NULL;
- iface->get_location = NULL;
iface->get_progress = NULL;
iface->can_cut_selection = NULL;
iface->can_copy_selection = NULL;
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2009-09-04 00:29:12 UTC (rev 3823)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2009-09-04 00:39:03 UTC (rev 3824)
@@ -109,11 +109,6 @@
#define KZ_GECKO_EMBED_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_GECKO_EMBED, KzGeckoEmbedPrivate))
-enum {
- PROP_0,
- PROP_LOCATION
-};
-
typedef struct _KzGeckoEmbedPrivate KzGeckoEmbedPrivate;
struct _KzGeckoEmbedPrivate
{
@@ -122,9 +117,6 @@
gint cur_requests;
gint total_requests;
- /* location */
- gchar *location;
-
gint load_started; /* count of currently active connections */
gint load_percent;
gint bytes_loaded;
@@ -214,7 +206,6 @@
(KzEmbed *kzembed,
KzEmbed *new_embed);
static gboolean is_loading (KzEmbed *kzembed);
-static const gchar *get_location (KzEmbed *kzembed);
static gdouble get_progress (KzEmbed *kzembed);
static gboolean can_cut_selection (KzEmbed *kzembed);
static gboolean can_copy_selection (KzEmbed *kzembed);
@@ -338,19 +329,6 @@
static void kz_gecko_embed_class_init (KzGeckoEmbedClass *klass);
static void kz_gecko_embed_init (KzGeckoEmbed *embed);
-static GObject *constructor (GType type,
- guint n_props,
- GObjectConstructParam *props);
-
-static void dispose (GObject *object);
-static void set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
void
kz_gecko_embed_register_type (GTypeModule *module)
{
@@ -412,7 +390,6 @@
iface->view_current_page_source_in_new
= view_current_page_source_in_new;
iface->is_loading = is_loading;
- iface->get_location = get_location;
iface->get_progress = get_progress;
iface->can_cut_selection = can_cut_selection;
iface->can_copy_selection = can_copy_selection;
@@ -495,11 +472,6 @@
widget_class = GTK_WIDGET_CLASS(klass);
moz_embed_class = GTK_MOZ_EMBED_CLASS(klass);
- gobject_class->constructor = constructor;
- gobject_class->dispose = dispose;
- gobject_class->set_property = set_property;
- gobject_class->get_property = get_property;
-
// widget class
widget_class->realize = kz_gecko_embed_realize;
widget_class->unrealize = kz_gecko_embed_unrealize;
@@ -535,15 +507,6 @@
moz_embed_class->dom_mouse_dbl_click = kz_gecko_embed_dom_mouse_dbl_click;
moz_embed_class->dom_mouse_over = kz_gecko_embed_dom_mouse_over;
- g_object_class_install_property
- (gobject_class,
- PROP_LOCATION,
- g_param_spec_string(
- "location",
- _("The URL"),
- _("The current URL"),
- NULL,
- (GParamFlags) G_PARAM_READWRITE));
g_type_class_add_private(gobject_class, sizeof(KzGeckoEmbedPrivate));
}
@@ -553,7 +516,6 @@
gint i;
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
- priv->location = NULL;
priv->load_started = 0;
priv->load_percent = 0;
priv->bytes_loaded = 0;
@@ -577,72 +539,7 @@
load_uri(KZ_EMBED(kzembed), "about:blank");
}
-static GObject*
-constructor (GType type,
- guint n_props,
- GObjectConstructParam *props)
-{
- GObject *object;
- GObjectClass *klass = G_OBJECT_CLASS(kz_gecko_embed_parent_class);
- object = klass->constructor(type, n_props, props);
-
- return object;
-}
-
-
-static void
-dispose (GObject *object)
-{
- KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (object);
-
- g_free(priv->location);
- priv->location = NULL;
-
- if (G_OBJECT_CLASS (kz_gecko_embed_parent_class)->dispose)
- G_OBJECT_CLASS (kz_gecko_embed_parent_class)->dispose(object);
-}
-
-
-static void
-set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (object);
- switch (prop_id)
- {
- case PROP_LOCATION:
- priv->location = g_value_dup_string(value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-
-static void
-get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (object);
-
- switch (prop_id)
- {
- case PROP_LOCATION:
- g_value_set_string(value, priv->location);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-
GtkWidget *
kz_gecko_embed_new (void)
{
@@ -738,19 +635,11 @@
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
if (url && *url)
- {
start_page = g_strdup(url);
- }
else
- {
start_page = g_strdup("about:blank");
- }
gtk_moz_embed_load_url(GTK_MOZ_EMBED(kzembed), start_page);
-
- if (priv->location)
- g_free(priv->location);
- priv->location = start_page;
}
@@ -822,22 +711,6 @@
}
-static const gchar *
-get_location (KzEmbed *kzembed)
-{
- g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), NULL);
-
- KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
-
- if (priv->location != NULL &&
- !strncmp(priv->location, "about:blank", 11))
- {
- return "";
- }
-
- return priv->location;
-}
-
static void
kz_gecko_embed_destroy_brsr (GtkMozEmbed *embed)
{
@@ -889,16 +762,15 @@
static void
kz_gecko_embed_location (GtkMozEmbed *embed)
{
+ gchar *location;
g_return_if_fail(KZ_IS_GECKO_EMBED(embed));
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE(embed);
- if (priv->location)
- g_free(priv->location);
- priv->location = gtk_moz_embed_get_location(embed);
+ location = gtk_moz_embed_get_location(embed);
+ g_signal_emit_by_name(embed, "kz-location", location);
+ g_free(location);
- g_signal_emit_by_name(embed, "kz-location", priv->location);
-
if (((GtkMozEmbedClass*)kz_gecko_embed_parent_class)->location)
((GtkMozEmbedClass*)kz_gecko_embed_parent_class)->location(embed);
}
@@ -932,7 +804,7 @@
if (!priv->wrapper) return;
gchar *cache = g_strconcat("file://", KZ_GET_HISTORY_DIR, NULL);
- const gchar *location = get_location(KZ_EMBED(kzembed));
+ gchar *location = gtk_moz_embed_get_location(GTK_MOZ_EMBED(kzembed));
if (location &&
(g_str_has_prefix(location, "http:") ||
g_str_has_prefix(location, "https:") ||
@@ -1000,6 +872,7 @@
}
}
+ g_free(location);
g_free(cache);
}
@@ -2712,9 +2585,9 @@
{
g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
- const gchar *uri;
+ gchar *uri;
- uri = kz_embed_get_location(kzembed);
+ uri = gtk_moz_embed_get_location(GTK_MOZ_EMBED(kzembed));
if (!uri)
return;
@@ -2757,6 +2630,7 @@
KZ_CREATE_THUMBNAIL(thumbnail, uri, last_modified, size);
+ g_free(uri);
g_object_unref(thumbnail);
}
Modified: kazehakase/trunk/module/embed/gecko/kz-mozeventlistener.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozeventlistener.cpp 2009-09-04 00:29:12 UTC (rev 3823)
+++ kazehakase/trunk/module/embed/gecko/kz-mozeventlistener.cpp 2009-09-04 00:39:03 UTC (rev 3824)
@@ -115,7 +115,7 @@
{
KzFavicon *kzfav = KZ_GET_FAVICON;
char *favicon_uri = g_strdup (url.get());
- const char *document_uri = kz_embed_get_location(KZ_EMBED(mOwner));
+ const char *document_uri = gtk_moz_embed_get_location(GTK_MOZ_EMBED(mOwner));
kz_favicon_get_icon_from_uri(kzfav, favicon_uri, document_uri);
g_free (favicon_uri);
}
Modified: kazehakase/trunk/module/embed/per-process/kz-dbus-embed-delegate.c
===================================================================
--- kazehakase/trunk/module/embed/per-process/kz-dbus-embed-delegate.c 2009-09-04 00:29:12 UTC (rev 3823)
+++ kazehakase/trunk/module/embed/per-process/kz-dbus-embed-delegate.c 2009-09-04 00:39:03 UTC (rev 3824)
@@ -104,7 +104,6 @@
gboolean backward);
static void zoom (KzEmbed *embed,
gdouble zoom);
-static const gchar *get_location (KzEmbed *embed);
static gdouble get_progress (KzEmbed *embed);
static void set_history (KzEmbed *embed,
const GList *history,
@@ -265,11 +264,6 @@
static void
cb_location (DBusGProxy *proxy, const gchar *location, KzDBusEmbedDelegate *object)
{
- KzDBusEmbedDelegatePrivate *priv = KZ_DBUS_EMBED_DELEGATE_GET_PRIVATE(object);
-
- g_free(priv->location);
- priv->location = g_strdup(location);
-
g_signal_emit_by_name(object, "kz-location", location);
}
@@ -397,7 +391,6 @@
iface->view_current_page_source_in_new
= NULL;
iface->is_loading = NULL;
- iface->get_location = get_location;
iface->get_progress = get_progress;
iface->can_cut_selection = can_cut_selection;
iface->can_copy_selection = can_copy_selection;
@@ -793,12 +786,6 @@
return kz_type_dbus_embed_delegate;
}
-static const gchar *
-get_location (KzEmbed *embed)
-{
- return KZ_DBUS_EMBED_DELEGATE_GET_PRIVATE(embed)->location;
-}
-
static gdouble
get_progress (KzEmbed *embed)
{
Modified: kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c
===================================================================
--- kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c 2009-09-04 00:29:12 UTC (rev 3823)
+++ kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c 2009-09-04 00:39:03 UTC (rev 3824)
@@ -32,7 +32,6 @@
{
WebKitWebView *web_view;
gint progress;
- gchar *location;
gchar *link_message;
gboolean is_loading;
};
@@ -75,7 +74,6 @@
static void paste (KzEmbed *kzembed);
static void select_all (KzEmbed *kzembed);
static gdouble get_progress (KzEmbed *kzembed);
-static const gchar *get_location (KzEmbed *kzembed);
static gboolean selection_is_collapsed (KzEmbed *kzembed);
static gboolean is_loading (KzEmbed *kzembed);
static void zoom (KzEmbed *kzembed,
@@ -212,7 +210,6 @@
iface->view_current_page_source_in_new
= NULL;
iface->is_loading = is_loading;
- iface->get_location = get_location;
iface->get_progress = get_progress;
iface->can_cut_selection = can_cut_selection;
iface->can_copy_selection = can_copy_selection;
@@ -321,7 +318,6 @@
{
KzWebKitGtkPrivate *priv = KZ_WEBKIT_GTK_GET_PRIVATE(webkit);
- priv->location = NULL;
priv->link_message = NULL;
priv->progress = 0;
@@ -333,9 +329,7 @@
dispose (GObject *object)
{
KzWebKitGtkPrivate *priv = KZ_WEBKIT_GTK_GET_PRIVATE(object);
- g_free(priv->location);
g_free(priv->link_message);
- priv->location = NULL;
priv->link_message = NULL;
if (G_OBJECT_CLASS(kz_webkit_gtk_parent_class)->dispose)
@@ -465,14 +459,6 @@
webkit_web_view_select_all(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
-static const gchar *
-get_location (KzEmbed *kzembed)
-{
- g_return_val_if_fail(KZ_IS_WEBKIT_GTK(kzembed), NULL);
-
- return KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->location;
-}
-
static gdouble
get_progress (KzEmbed *kzembed)
{
@@ -611,7 +597,7 @@
if (!current_item)
{
- current_item = webkit_web_history_item_new_with_data(priv->location,
+ current_item = webkit_web_history_item_new_with_data(webkit_web_view_get_uri(priv->web_view),
webkit_web_view_get_title(priv->web_view));
}
@@ -780,10 +766,7 @@
WebKitWebFrame* frame,
gpointer data)
{
- KzWebKitGtkPrivate *priv = KZ_WEBKIT_GTK_GET_PRIVATE(data);
const gchar* location = webkit_web_frame_get_uri(frame);
- g_free(priv->location);
- priv->location = g_strdup(location);
g_signal_emit_by_name(data, "kz-location", location);
}
Modified: kazehakase/trunk/src/kz-embed.c
===================================================================
--- kazehakase/trunk/src/kz-embed.c 2009-09-04 00:29:12 UTC (rev 3823)
+++ kazehakase/trunk/src/kz-embed.c 2009-09-04 00:39:03 UTC (rev 3824)
@@ -433,17 +433,6 @@
}
-const gchar *
-kz_embed_get_location (KzEmbed *kzembed)
-{
- g_return_val_if_fail(KZ_IS_EMBED(kzembed), NULL);
- if (!KZ_EMBED_GET_IFACE(kzembed)->get_location)
- return NULL;
-
- return KZ_EMBED_GET_IFACE(kzembed)->get_location(kzembed);
-}
-
-
gdouble
kz_embed_get_progress (KzEmbed *kzembed)
{
Modified: kazehakase/trunk/src/kz-embed.h
===================================================================
--- kazehakase/trunk/src/kz-embed.h 2009-09-04 00:29:12 UTC (rev 3823)
+++ kazehakase/trunk/src/kz-embed.h 2009-09-04 00:39:03 UTC (rev 3824)
@@ -88,8 +88,6 @@
gboolean (*is_loading) (KzEmbed *kzembed);
- const gchar *(*get_location) (KzEmbed *kzembed);
-
gdouble (*get_progress) (KzEmbed *kzembed);
gboolean (*can_cut_selection) (KzEmbed *kzembed);
@@ -291,8 +289,6 @@
gboolean kz_embed_is_loading (KzEmbed *kzembed);
-const gchar *kz_embed_get_location (KzEmbed *kzembed);
-
gdouble kz_embed_get_progress (KzEmbed *kzembed);
gboolean kz_embed_can_cut_selection (KzEmbed *kzembed);