svnno****@sourc*****
svnno****@sourc*****
Fri Sep 4 09:51:35 JST 2009
Revision: 3827
http://sourceforge.jp/projects/kazehakase/svn/view?view=rev&revision=3827
Author: ikezoe
Date: 2009-09-04 09:51:35 +0900 (Fri, 04 Sep 2009)
Log Message:
-----------
* src/kz-embed.[ch]: Remove is_loading 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/ie/kz-ie.c
kazehakase/trunk/module/embed/moz-web-view/kz-moz-web-view.c
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:47:51 UTC (rev 3826)
+++ kazehakase/trunk/ChangeLog 2009-09-04 00:51:35 UTC (rev 3827)
@@ -14,6 +14,7 @@
* src/kz-embed.[ch]: Remove get_title interface.
* src/kz-embed.[ch]: Remove get_location interface.
* src/kz-embed.[ch]: Remove get_progress interface.
+ * src/kz-embed.[ch]: Remove is_loading 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:47:51 UTC (rev 3826)
+++ kazehakase/trunk/dbus/kz-dbus-embed-agent.c 2009-09-04 00:51:35 UTC (rev 3827)
@@ -394,7 +394,6 @@
iface->view_source = NULL;
iface->view_current_page_source_in_new
= NULL;
- iface->is_loading = NULL;
iface->can_cut_selection = NULL;
iface->can_copy_selection = NULL;
iface->can_paste = NULL;
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2009-09-04 00:47:51 UTC (rev 3826)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2009-09-04 00:51:35 UTC (rev 3827)
@@ -121,7 +121,6 @@
gint load_percent;
gint bytes_loaded;
gint max_bytes_loaded;
- gboolean is_loading;
const gchar *load_status_message;
/* for navigation link */
@@ -205,7 +204,6 @@
static void view_current_page_source_in_new
(KzEmbed *kzembed,
KzEmbed *new_embed);
-static gboolean is_loading (KzEmbed *kzembed);
static gdouble get_progress (KzEmbed *kzembed);
static gboolean can_cut_selection (KzEmbed *kzembed);
static gboolean can_copy_selection (KzEmbed *kzembed);
@@ -389,7 +387,6 @@
iface->view_source = view_source;
iface->view_current_page_source_in_new
= view_current_page_source_in_new;
- iface->is_loading = is_loading;
iface->can_cut_selection = can_cut_selection;
iface->can_copy_selection = can_copy_selection;
iface->can_paste = can_paste;
@@ -519,7 +516,6 @@
priv->load_percent = 0;
priv->bytes_loaded = 0;
priv->max_bytes_loaded = 0;
- priv->is_loading = FALSE;
priv->load_status_message = NULL;
priv->wrapper = NULL;
priv->size_inited = FALSE;
@@ -680,15 +676,6 @@
}
-static gboolean
-is_loading (KzEmbed *kzembed)
-{
- return KZ_IS_GECKO_EMBED(kzembed)
- ? KZ_GECKO_EMBED_GET_PRIVATE(kzembed)->is_loading
- : FALSE;
-}
-
-
static gdouble
get_progress (KzEmbed *kzembed)
{
@@ -784,8 +771,6 @@
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
- priv->is_loading = TRUE;
-
/* First free previous link */
kz_gecko_embed_navigation_link_free(kzembed);
@@ -881,7 +866,6 @@
g_return_if_fail(KZ_IS_GECKO_EMBED(embed));
KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (embed);
- priv->is_loading = FALSE;
if (((GtkMozEmbedClass*)kz_gecko_embed_parent_class)->net_stop)
((GtkMozEmbedClass*)kz_gecko_embed_parent_class)->net_stop(embed);
Modified: kazehakase/trunk/module/embed/ie/kz-ie.c
===================================================================
--- kazehakase/trunk/module/embed/ie/kz-ie.c 2009-09-04 00:47:51 UTC (rev 3826)
+++ kazehakase/trunk/module/embed/ie/kz-ie.c 2009-09-04 00:51:35 UTC (rev 3827)
@@ -76,7 +76,6 @@
static void kz_ie_reload (KzEmbed *kzembed,
KzEmbedReloadFlag flags);
static void kz_ie_stop_load (KzEmbed *kzembed);
-static gboolean kz_ie_is_loading (KzEmbed *kzembed);
static void kz_ie_go_back (KzEmbed *kzembed);
static void kz_ie_go_forward (KzEmbed *kzembed);
static gboolean kz_ie_can_go_back (KzEmbed *kzembed);
@@ -217,7 +216,6 @@
iface->view_source = NULL;
iface->view_current_page_source_in_new
= NULL;
- iface->is_loading = kz_ie_is_loading;
iface->can_cut_selection = kz_ie_can_cut_selection;
iface->can_copy_selection = kz_ie_can_copy_selection;
iface->can_paste = kz_ie_can_paste;
@@ -473,15 +471,6 @@
}
-static gboolean
-kz_ie_is_loading (KzEmbed *kzembed)
-{
- g_return_val_if_fail(KZ_IS_IE(kzembed), FALSE);
-
- return gtk_ie_embed_is_loading(GTK_IE_EMBED(kzembed));
-}
-
-
static void
kz_ie_go_back (KzEmbed *kzembed)
{
Modified: kazehakase/trunk/module/embed/moz-web-view/kz-moz-web-view.c
===================================================================
--- kazehakase/trunk/module/embed/moz-web-view/kz-moz-web-view.c 2009-09-04 00:47:51 UTC (rev 3826)
+++ kazehakase/trunk/module/embed/moz-web-view/kz-moz-web-view.c 2009-09-04 00:51:35 UTC (rev 3827)
@@ -31,7 +31,6 @@
struct _KzMozWebViewPrivate
{
gchar *link_message;
- gboolean is_loading;
};
#define KZ_MOZ_WEB_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_MOZ_WEB_VIEW, KzMozWebViewPrivate))
@@ -77,7 +76,6 @@
static void paste (KzEmbed *kzembed);
static void select_all (KzEmbed *kzembed);
static gboolean selection_is_collapsed (KzEmbed *kzembed);
-static gboolean is_loading (KzEmbed *kzembed);
static void zoom_set (KzEmbed *kzembed,
int zoom,
gboolean reflow);
@@ -158,7 +156,6 @@
iface->view_source = NULL;
iface->view_current_page_source_in_new
= NULL;
- iface->is_loading = is_loading;
iface->can_cut_selection = can_cut_selection;
iface->can_copy_selection = can_copy_selection;
iface->can_paste = can_paste;
@@ -235,8 +232,6 @@
KzMozWebViewPrivate *priv = KZ_MOZ_WEB_VIEW_GET_PRIVATE(webkit);
priv->link_message = NULL;
-
- priv->is_loading = FALSE;
}
static void
@@ -382,12 +377,6 @@
return FALSE;
}
-static gboolean
-is_loading (KzEmbed *kzembed)
-{
- return FALSE;
-}
-
static void
zoom_set (KzEmbed *kzembed, int zoom, gboolean reflow)
{
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:47:51 UTC (rev 3826)
+++ kazehakase/trunk/module/embed/per-process/kz-dbus-embed-delegate.c 2009-09-04 00:51:35 UTC (rev 3827)
@@ -385,7 +385,6 @@
iface->view_source = NULL;
iface->view_current_page_source_in_new
= NULL;
- iface->is_loading = NULL;
iface->can_cut_selection = can_cut_selection;
iface->can_copy_selection = can_copy_selection;
iface->can_paste = can_paste;
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:47:51 UTC (rev 3826)
+++ kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c 2009-09-04 00:51:35 UTC (rev 3827)
@@ -32,7 +32,6 @@
{
WebKitWebView *web_view;
gchar *link_message;
- gboolean is_loading;
};
#define KZ_WEBKIT_GTK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_WEBKIT_GTK, KzWebKitGtkPrivate))
@@ -73,7 +72,6 @@
static void paste (KzEmbed *kzembed);
static void select_all (KzEmbed *kzembed);
static gboolean selection_is_collapsed (KzEmbed *kzembed);
-static gboolean is_loading (KzEmbed *kzembed);
static void zoom (KzEmbed *kzembed,
gdouble zoom);
static gdouble get_zoom_ratio (KzEmbed *kzembed);
@@ -207,7 +205,6 @@
iface->view_source = NULL;
iface->view_current_page_source_in_new
= NULL;
- iface->is_loading = is_loading;
iface->can_cut_selection = can_cut_selection;
iface->can_copy_selection = can_copy_selection;
iface->can_paste = can_paste;
@@ -316,8 +313,6 @@
KzWebKitGtkPrivate *priv = KZ_WEBKIT_GTK_GET_PRIVATE(webkit);
priv->link_message = NULL;
-
- priv->is_loading = FALSE;
}
static void
@@ -460,12 +455,6 @@
return webkit_web_view_has_selection(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
-static gboolean
-is_loading (KzEmbed *kzembed)
-{
- return KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->is_loading;
-}
-
static void
zoom (KzEmbed *kzembed, gdouble zoom)
{
@@ -761,7 +750,6 @@
WebKitWebFrame* frame,
gpointer data)
{
- KZ_WEBKIT_GTK_GET_PRIVATE(data)->is_loading = TRUE;
g_signal_emit_by_name(data, "kz-net-start");
}
@@ -770,7 +758,6 @@
WebKitWebFrame* frame,
gpointer data)
{
- KZ_WEBKIT_GTK_GET_PRIVATE(data)->is_loading = FALSE;
g_signal_emit_by_name(data, "kz-net-stop");
}
Modified: kazehakase/trunk/src/kz-embed.c
===================================================================
--- kazehakase/trunk/src/kz-embed.c 2009-09-04 00:47:51 UTC (rev 3826)
+++ kazehakase/trunk/src/kz-embed.c 2009-09-04 00:51:35 UTC (rev 3827)
@@ -423,17 +423,6 @@
gboolean
-kz_embed_is_loading (KzEmbed *kzembed)
-{
- g_return_val_if_fail(KZ_IS_EMBED(kzembed), FALSE);
- if (!KZ_EMBED_GET_IFACE(kzembed)->is_loading)
- return FALSE;
-
- return KZ_EMBED_GET_IFACE(kzembed)->is_loading(kzembed);
-}
-
-
-gboolean
kz_embed_can_cut_selection (KzEmbed *kzembed)
{
g_return_val_if_fail(KZ_IS_EMBED(kzembed), FALSE);
Modified: kazehakase/trunk/src/kz-embed.h
===================================================================
--- kazehakase/trunk/src/kz-embed.h 2009-09-04 00:47:51 UTC (rev 3826)
+++ kazehakase/trunk/src/kz-embed.h 2009-09-04 00:51:35 UTC (rev 3827)
@@ -86,8 +86,6 @@
(KzEmbed *kzembed,
KzEmbed *new_embed);
- gboolean (*is_loading) (KzEmbed *kzembed);
-
gboolean (*can_cut_selection) (KzEmbed *kzembed);
gboolean (*can_copy_selection) (KzEmbed *kzembed);
gboolean (*can_paste) (KzEmbed *kzembed);
@@ -285,8 +283,6 @@
(KzEmbed *kzembed,
KzEmbed *new_embed);
-gboolean kz_embed_is_loading (KzEmbed *kzembed);
-
gboolean kz_embed_can_cut_selection (KzEmbed *kzembed);
gboolean kz_embed_can_copy_selection (KzEmbed *kzembed);
gboolean kz_embed_can_paste (KzEmbed *kzembed);