svnno****@sourc*****
svnno****@sourc*****
Sun Mar 25 12:57:54 JST 2007
Revision: 3000
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3000
Author: ikezoe
Date: 2007-03-25 12:57:53 +0900 (Sun, 25 Mar 2007)
Log Message:
-----------
* module/embed/gtk-webcore/kz-gtk-webcore.[ch]: is_loading is now
private member.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.c
kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.h
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-25 03:43:59 UTC (rev 2999)
+++ kazehakase/trunk/ChangeLog 2007-03-25 03:57:53 UTC (rev 3000)
@@ -5,6 +5,8 @@
* module/embed/khtml/kz-khtml.c: Fix an argument of req-new-window.
* module/embed/khtml/kz-khtml.c: Handle req-auth-prompt.
* module/embed/khtml/*, src/kz-window.c: Renamed. kz-ktml -> kt-gtk-webcore.
+ * module/embed/gtk-webcore/kz-gtk-webcore.[ch]: is_loading is now
+ private member.
2007-03-24 Kouhei Sutou <kou****@cozmi*****>
Modified: kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.c
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.c 2007-03-25 03:43:59 UTC (rev 2999)
+++ kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.c 2007-03-25 03:57:53 UTC (rev 3000)
@@ -37,6 +37,8 @@
gint total_requests;
gchar *link_message;
guint32 button_press_time;
+
+ gboolean is_loading;
};
#define KZ_GTK_WEBCORE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_GTK_WEBCORE, KzGtkWebcorePrivate))
@@ -376,7 +378,7 @@
{
KzGtkWebcorePrivate *priv = KZ_GTK_WEBCORE_GET_PRIVATE (gtk_webcore);
- gtk_webcore->is_loading = FALSE;
+ priv->is_loading = FALSE;
priv->cur_requests = 0;
priv->total_requests = 0;
priv->link_message = NULL;
@@ -436,7 +438,7 @@
switch(status->status) {
case WEBI_LOADING_START:
- KZ_GTK_WEBCORE(gtk_webcore)->is_loading = TRUE;
+ priv->is_loading = TRUE;
priv->cur_requests = 0;
priv->total_requests = 0;
g_signal_emit_by_name(gtk_webcore, "kz-net-start");
@@ -448,7 +450,7 @@
break;
case WEBI_LOADING_COMPLETE:
case WEBI_LOADING_ERROR:
- KZ_GTK_WEBCORE(gtk_webcore)->is_loading = FALSE;
+ priv->is_loading = FALSE;
priv->cur_requests = status->totalReceived;
priv->total_requests = status->totalSize;
g_signal_emit_by_name(gtk_webcore, "kz-net-stop");
@@ -464,9 +466,11 @@
static void
kz_gtk_webcore_load_start (Webi *gtk_webcore)
{
+ KzGtkWebcorePrivate *priv;
g_return_if_fail(KZ_IS_GTK_WEBCORE(gtk_webcore));
- KZ_GTK_WEBCORE(gtk_webcore)->is_loading = TRUE;
+ priv = KZ_GTK_WEBCORE_GET_PRIVATE (gtk_webcore);
+ priv->is_loading = TRUE;
g_signal_emit_by_name(gtk_webcore, "kz-net-start");
@@ -477,9 +481,11 @@
static void
kz_gtk_webcore_load_stop (Webi *gtk_webcore)
{
+ KzGtkWebcorePrivate *priv;
g_return_if_fail(KZ_IS_GTK_WEBCORE(gtk_webcore));
- KZ_GTK_WEBCORE(gtk_webcore)->is_loading = FALSE;
+ priv = KZ_GTK_WEBCORE_GET_PRIVATE (gtk_webcore);
+ priv->is_loading = FALSE;
g_signal_emit_by_name(gtk_webcore, "kz-net-stop");
@@ -689,7 +695,7 @@
{
g_return_val_if_fail(KZ_IS_GTK_WEBCORE(kzembed), FALSE);
- return KZ_GTK_WEBCORE(kzembed)->is_loading;
+ return KZ_GTK_WEBCORE_GET_PRIVATE(kzembed)->is_loading;
}
Modified: kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.h
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.h 2007-03-25 03:43:59 UTC (rev 2999)
+++ kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.h 2007-03-25 03:57:53 UTC (rev 3000)
@@ -42,8 +42,6 @@
{
/* embedding widget */
Webi parent;
-
- gboolean is_loading;
};
struct _KzGtkWebcoreClass