Hiroyuki Ikezoe
ikezo****@users*****
Thu Mar 15 11:45:35 JST 2007
Index: kazehakase/src/khtml/Makefile.am
diff -u kazehakase/src/khtml/Makefile.am:1.4 kazehakase/src/khtml/Makefile.am:1.5
--- kazehakase/src/khtml/Makefile.am:1.4 Wed Nov 17 10:48:25 2004
+++ kazehakase/src/khtml/Makefile.am Thu Mar 15 11:45:35 2007
@@ -5,7 +5,7 @@
endif
INCLUDES = \
- -I$(NRCIT_CFLAGS) \
+ $(NRCIT_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/bookmarks \
-I$(top_srcdir)/src/dialogs \
Index: kazehakase/src/khtml/kz-khtml.c
diff -u kazehakase/src/khtml/kz-khtml.c:1.20 kazehakase/src/khtml/kz-khtml.c:1.21
--- kazehakase/src/khtml/kz-khtml.c:1.20 Sun Jan 15 15:29:03 2006
+++ kazehakase/src/khtml/kz-khtml.c Thu Mar 15 11:45:35 2007
@@ -17,7 +17,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: kz-khtml.c,v 1.20 2006/01/15 06:29:03 kous Exp $
+ * $Id: kz-khtml.c,v 1.21 2007/03/15 02:45:35 ikezoe Exp $
*/
#include <glib/gi18n.h>
@@ -41,18 +41,18 @@
static void kz_khtml_dispose (GObject *object);
/* khtml class */
-static void kz_khtml_status (GtkKHTML *khtml,
- GtkKHTMLLoadStatus *status);
-static void kz_khtml_load_start (GtkKHTML *khtml);
-static void kz_khtml_load_stop (GtkKHTML *khtml);
-static void kz_khtml_location (GtkKHTML *khtml);
-static void kz_khtml_title (GtkKHTML *khtml);
-static void kz_khtml_req_js_prompt (GtkKHTML *khtml,
- GtkKHTMLPromptArgs* args);
-static void kz_khtml_req_auth_prompt (GtkKHTML *khtml,
- GtkKHTMLAuthArgs* args);
-static gboolean kz_khtml_req_new_window (GtkKHTML *khtml,
- GtkKHTML *newkhtml);
+static void kz_khtml_status (Webi *khtml,
+ WebiLoadStatus *status);
+static void kz_khtml_load_start (Webi *khtml);
+static void kz_khtml_load_stop (Webi *khtml);
+static void kz_khtml_location (Webi *khtml);
+static void kz_khtml_title (Webi *khtml);
+static void kz_khtml_req_js_prompt (Webi *khtml,
+ WebiPromptArgs* args);
+static void kz_khtml_req_auth_prompt (Webi *khtml,
+ WebiAuthArgs* args);
+static gboolean kz_khtml_req_new_window (Webi *khtml,
+ Webi *newkhtml);
/* embed iface */
static void kz_khtml_load_url (KzEmbed *kzembed,
@@ -84,23 +84,22 @@
const char *keyword,
gboolean backward);
-static GtkKHTMLClass *parent_class = NULL;
+static WebiClass *parent_class = NULL;
-KZ_OBJECT_GET_TYPE_IFACE(kz_khtml, "KzKHTML", KzKHTML,
- kz_khtml_class_init, kz_khtml_init,
- GTK_TYPE_KHTML,
- kz_khtml_iface_init, KZ_TYPE_EMBED)
+G_DEFINE_TYPE_WITH_CODE(KzKHTML, kz_khtml, WEBI_TYPE_WEBI,
+ G_IMPLEMENT_INTERFACE (KZ_TYPE_EMBED,
+ kz_khtml_iface_init))
static void
kz_khtml_class_init (KzKHTMLClass *klass)
{
GObjectClass *object_class;
- GtkKHTMLClass *khtml_class;
+ WebiClass *khtml_class;
parent_class = g_type_class_peek_parent (klass);
object_class = (GObjectClass *) klass;
- khtml_class = (GtkKHTMLClass *) klass;
+ khtml_class = (WebiClass *) klass;
object_class->dispose = kz_khtml_dispose;
@@ -254,7 +253,7 @@
static void
-kz_khtml_status (GtkKHTML *khtml, GtkKHTMLLoadStatus *status)
+kz_khtml_status (Webi *khtml, WebiLoadStatus *status)
{
KzKHTMLPrivate *priv;
g_return_if_fail(KZ_IS_KHTML(khtml));
@@ -263,19 +262,19 @@
priv = KZ_KHTML_GET_PRIVATE (khtml);
switch(status->status) {
- case GTK_KHTML_LOADING_START:
+ case WEBI_LOADING_START:
KZ_KHTML(khtml)->is_loading = TRUE;
priv->cur_requests = 0;
priv->total_requests = 0;
g_signal_emit_by_name(khtml, "kz-net-start");
break;
- case GTK_KHTML_LOADING:
+ case WEBI_LOADING:
priv->cur_requests = status->totalReceived;
priv->total_requests = status->totalSize;
g_signal_emit_by_name(khtml, "kz-progress");
break;
- case GTK_KHTML_LOADING_COMPLETE:
- case GTK_KHTML_LOADING_ERROR:
+ case WEBI_LOADING_COMPLETE:
+ case WEBI_LOADING_ERROR:
KZ_KHTML(khtml)->is_loading = FALSE;
priv->cur_requests = status->totalReceived;
priv->total_requests = status->totalSize;
@@ -290,7 +289,7 @@
static void
-kz_khtml_load_start (GtkKHTML *khtml)
+kz_khtml_load_start (Webi *khtml)
{
g_return_if_fail(KZ_IS_KHTML(khtml));
@@ -303,7 +302,7 @@
static void
-kz_khtml_load_stop (GtkKHTML *khtml)
+kz_khtml_load_stop (Webi *khtml)
{
g_return_if_fail(KZ_IS_KHTML(khtml));
@@ -316,7 +315,7 @@
static void
-kz_khtml_location (GtkKHTML *khtml)
+kz_khtml_location (Webi *khtml)
{
g_return_if_fail(KZ_IS_KHTML(khtml));
@@ -327,7 +326,7 @@
static void
-kz_khtml_title (GtkKHTML *khtml)
+kz_khtml_title (Webi *khtml)
{
g_return_if_fail(KZ_IS_KHTML(khtml));
@@ -338,21 +337,21 @@
static void
-kz_khtml_req_js_prompt (GtkKHTML *khtml, GtkKHTMLPromptArgs* args)
+kz_khtml_req_js_prompt (Webi *khtml, WebiPromptArgs* args)
{
g_return_if_fail(KZ_IS_KHTML(khtml));
}
static void
-kz_khtml_req_auth_prompt (GtkKHTML *khtml, GtkKHTMLAuthArgs* args)
+kz_khtml_req_auth_prompt (Webi *khtml, WebiAuthArgs* args)
{
g_return_if_fail(KZ_IS_KHTML(khtml));
}
static gboolean
-kz_khtml_req_new_window (GtkKHTML *khtml, GtkKHTML *newkhtml)
+kz_khtml_req_new_window (Webi *khtml, Webi *newkhtml)
{
g_return_val_if_fail(KZ_IS_KHTML(khtml), FALSE);
@@ -375,7 +374,7 @@
{
g_return_if_fail(KZ_IS_KHTML(kzembed));
- gtk_khtml_load_url(GTK_KHTML(kzembed), url);
+ webi_load_url(WEBI(kzembed), url);
}
@@ -384,7 +383,7 @@
{
g_return_val_if_fail(KZ_IS_KHTML(kzembed), NULL);
- return gtk_khtml_get_title(GTK_KHTML(kzembed));
+ return webi_get_title(WEBI(kzembed));
}
@@ -393,7 +392,7 @@
{
g_return_val_if_fail(KZ_IS_KHTML(kzembed), NULL);
- return gtk_khtml_get_location(GTK_KHTML(kzembed));
+ return webi_get_location(WEBI(kzembed));
}
@@ -403,7 +402,7 @@
{
g_return_val_if_fail(KZ_IS_KHTML(kzembed), NULL);
- return g_strdup(gtk_khtml_get_status_text(GTK_KHTML(kzembed)));
+ return g_strdup(webi_get_status_text(WEBI(kzembed)));
}
#endif
@@ -430,7 +429,7 @@
{
g_return_if_fail(KZ_IS_KHTML(kzembed));
- gtk_khtml_refresh (GTK_KHTML(kzembed));
+ webi_refresh (WEBI(kzembed));
}
@@ -439,7 +438,7 @@
{
g_return_if_fail(KZ_IS_KHTML(kzembed));
- gtk_khtml_stop_load (GTK_KHTML(kzembed));
+ webi_stop_load (WEBI(kzembed));
}
@@ -448,7 +447,7 @@
{
g_return_if_fail(KZ_IS_KHTML(kzembed));
- return gtk_khtml_go_back (GTK_KHTML(kzembed));
+ return webi_go_back (WEBI(kzembed));
}
@@ -457,7 +456,7 @@
{
g_return_if_fail(KZ_IS_KHTML(kzembed));
- return gtk_khtml_go_forward (GTK_KHTML(kzembed));
+ return webi_go_forward (WEBI(kzembed));
}
@@ -466,7 +465,7 @@
{
g_return_val_if_fail(KZ_IS_KHTML(kzembed), FALSE);
- return gtk_khtml_can_go_back (GTK_KHTML(kzembed));
+ return webi_can_go_back (WEBI(kzembed));
}
@@ -475,7 +474,7 @@
{
g_return_val_if_fail(KZ_IS_KHTML(kzembed), FALSE);
- return gtk_khtml_can_go_forward (GTK_KHTML(kzembed));
+ return webi_can_go_forward (WEBI(kzembed));
}
@@ -488,7 +487,7 @@
g_return_val_if_fail(KZ_IS_KHTML(kzembed), 0.0);
- priv = KZ_KHTML_GET_PRIVATE (khtml);
+ priv = KZ_KHTML_GET_PRIVATE (kzembed);
khtml = KZ_KHTML(kzembed);
if (priv->total_requests <= 0 ||
@@ -514,7 +513,7 @@
g_return_val_if_fail(KZ_IS_KHTML(kzembed), 100);
- multiplier = gtk_khtml_get_text_multiplier (GTK_KHTML(kzembed));
+ multiplier = webi_get_text_multiplier (WEBI(kzembed));
if (multiplier == -1.0) return 100;
@@ -531,7 +530,7 @@
multiplier = (gfloat)(zoom) / 100;
- gtk_khtml_set_text_multiplier (GTK_KHTML(kzembed),
+ webi_set_text_multiplier (WEBI(kzembed),
multiplier);
}
@@ -541,5 +540,5 @@
{
g_return_val_if_fail(KZ_IS_KHTML(kzembed), FALSE);
- return gtk_khtml_find(GTK_KHTML(kzembed), keyword, FALSE, backward);
+ return webi_find(WEBI(kzembed), keyword, FALSE, backward);
}
Index: kazehakase/src/khtml/kz-khtml.h
diff -u kazehakase/src/khtml/kz-khtml.h:1.3 kazehakase/src/khtml/kz-khtml.h:1.4
--- kazehakase/src/khtml/kz-khtml.h:1.3 Mon May 9 10:20:12 2005
+++ kazehakase/src/khtml/kz-khtml.h Thu Mar 15 11:45:35 2007
@@ -17,14 +17,14 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: kz-khtml.h,v 1.3 2005/05/09 01:20:12 ikezoe Exp $
+ * $Id: kz-khtml.h,v 1.4 2007/03/15 02:45:35 ikezoe Exp $
*/
#ifndef __KZ_KHTML_H__
#define __KZ_KHTML_H__
#include <gtk/gtk.h>
-#include <gtk-khtml.h>
+#include <webi.h>
#include "kazehakase.h"
#include "kz-embed-event.h"
#include "kz-embed.h"
@@ -44,14 +44,14 @@
struct _KzKHTML
{
/* embedding widget */
- GtkKHTML parent;
+ Webi parent;
gboolean is_loading;
};
struct _KzKHTMLClass
{
- GtkKHTMLClass parent_class;
+ WebiClass parent_class;
};