svnno****@sourc*****
svnno****@sourc*****
Mon Mar 26 16:22:15 JST 2007
Revision: 3025
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3025
Author: kous
Date: 2007-03-26 16:22:14 +0900 (Mon, 26 Mar 2007)
Log Message:
-----------
* src/kz-embed.[ch] (kz_embed_get_name): new interface.
* configure.ac, module/embed/gecko/Makefile.am,
module/embed/gecko/kz-gecko-embed.cpp
(kz_gecko_embed_show_page_certificate): implemented the above interface.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/configure.ac
kazehakase/trunk/module/embed/gecko/Makefile.am
kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
kazehakase/trunk/src/kz-embed.c
kazehakase/trunk/src/kz-embed.h
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-26 07:04:36 UTC (rev 3024)
+++ kazehakase/trunk/ChangeLog 2007-03-26 07:22:14 UTC (rev 3025)
@@ -1,5 +1,11 @@
2007-03-26 Kouhei Sutou <kou****@cozmi*****>
+ * src/kz-embed.[ch] (kz_embed_get_name): new interface.
+
+ * configure.ac, module/embed/gecko/Makefile.am,
+ module/embed/gecko/kz-gecko-embed.cpp
+ (kz_gecko_embed_show_page_certificate): implemented the above interface.
+
* src/net/kz-io.c (io_set_iochannel): ignored
g_io_channel_set_flags() error. (G_IO_FLAG_NONBLOCK is not
supported on Windows.)
Modified: kazehakase/trunk/configure.ac
===================================================================
--- kazehakase/trunk/configure.ac 2007-03-26 07:04:36 UTC (rev 3024)
+++ kazehakase/trunk/configure.ac 2007-03-26 07:22:14 UTC (rev 3025)
@@ -387,6 +387,9 @@
KZ_BACKENDS="\$(GECKO)-\$(MOZILLA_COMPONENT_VERSION)"
AC_SUBST([KZ_BACKENDS])
+GECKO_VERSION="\$(GECKO)-\$(MOZILLA_COMPONENT_VERSION)"
+AC_SUBST([GECKO_VERSION])
+
dnl **************************************************************
dnl Configure for history search module.
dnl **************************************************************
Modified: kazehakase/trunk/module/embed/gecko/Makefile.am
===================================================================
--- kazehakase/trunk/module/embed/gecko/Makefile.am 2007-03-26 07:04:36 UTC (rev 3024)
+++ kazehakase/trunk/module/embed/gecko/Makefile.am 2007-03-26 07:22:14 UTC (rev 3025)
@@ -133,6 +133,7 @@
-DGDK_DISABLE_DEPRECATED=1 \
-DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \
-DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \
+ -DGECKO_VERSION=\"$(GECKO_VERSION)\" \
-DG_LOG_DOMAIN=\"Kazehakase-Gecko\" \
-DG_DISABLE_DEPRECATED=1
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2007-03-26 07:04:36 UTC (rev 3024)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2007-03-26 07:22:14 UTC (rev 3025)
@@ -357,6 +357,7 @@
static void kz_gecko_embed_set_allow_images (KzEmbed *kzembed,
gboolean allow);
static void kz_gecko_embed_show_page_certificate (KzEmbed *kzembed);
+static const gchar *kz_gecko_embed_get_name (KzEmbed *kzembed);
/* KzEmbedPrefs interfaces */
static void kz_gecko_embed_prefs_iface_init (KzEmbedPrefsIFace *iface);
@@ -543,6 +544,7 @@
iface->get_allow_images = kz_gecko_embed_get_allow_images;
iface->set_allow_images = kz_gecko_embed_set_allow_images;
iface->show_page_certificate = kz_gecko_embed_show_page_certificate;
+ iface->get_name = kz_gecko_embed_get_name;
#if 0
@@ -3462,6 +3464,12 @@
}
+static const gchar *
+kz_gecko_embed_get_name (KzEmbed *kzembed)
+{
+ return GECKO_VERSION;
+}
+
static void
nav_link_elem_free(gpointer object, gpointer unused)
{
Modified: kazehakase/trunk/src/kz-embed.c
===================================================================
--- kazehakase/trunk/src/kz-embed.c 2007-03-26 07:04:36 UTC (rev 3024)
+++ kazehakase/trunk/src/kz-embed.c 2007-03-26 07:22:14 UTC (rev 3025)
@@ -1154,6 +1154,15 @@
return KZ_EMBED_GET_IFACE(kzembed)->show_page_certificate(kzembed);
}
+const gchar *
+kz_embed_get_name (KzEmbed *kzembed)
+{
+ g_return_val_if_fail(KZ_IS_EMBED(kzembed), NULL);
+ g_return_val_if_fail(KZ_EMBED_GET_IFACE(kzembed)->get_name, NULL);
+
+ return KZ_EMBED_GET_IFACE(kzembed)->get_name(kzembed);
+}
+
static gchar *
kz_embed_get_up_location(KzEmbed *kzembed)
{
Modified: kazehakase/trunk/src/kz-embed.h
===================================================================
--- kazehakase/trunk/src/kz-embed.h 2007-03-26 07:04:36 UTC (rev 3024)
+++ kazehakase/trunk/src/kz-embed.h 2007-03-26 07:22:14 UTC (rev 3025)
@@ -247,6 +247,7 @@
void (*set_allow_images) (KzEmbed *kzembed,
gboolean allow);
void (*show_page_certificate)(KzEmbed *kzembed);
+ const gchar *(*get_name) (KzEmbed *kzembed);
/* signals */
void (*link_message) (KzEmbed *embed);
@@ -468,6 +469,7 @@
gboolean allow);
void kz_embed_show_page_certificate (KzEmbed *kzembed);
+const gchar *kz_embed_get_name (KzEmbed *kzembed);
G_END_DECLS