svnno****@sourc*****
svnno****@sourc*****
Mon Mar 26 19:30:49 JST 2007
Revision: 3032
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3032
Author: ikezoe
Date: 2007-03-26 19:30:49 +0900 (Mon, 26 Mar 2007)
Log Message:
-----------
* configure.ac, module/embed/gtk-webcore/Makefile.am,
module/embed/gtk-webcore/kz-gtk-webcore.cpp: Implemented get_name().
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/configure.ac
kazehakase/trunk/module/embed/gtk-webcore/Makefile.am
kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-26 08:53:31 UTC (rev 3031)
+++ kazehakase/trunk/ChangeLog 2007-03-26 10:30:49 UTC (rev 3032)
@@ -1,3 +1,8 @@
+2007-03-26 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * configure.ac, module/embed/gtk-webcore/Makefile.am,
+ module/embed/gtk-webcore/kz-gtk-webcore.cpp: Implemented get_name().
+
2007-03-26 Takuro Ashie <ashie****@homa*****>
* data/icons/Makefile.am: Add kazehakase-icon.ico to dist files.
Modified: kazehakase/trunk/configure.ac
===================================================================
--- kazehakase/trunk/configure.ac 2007-03-26 08:53:31 UTC (rev 3031)
+++ kazehakase/trunk/configure.ac 2007-03-26 10:30:49 UTC (rev 3032)
@@ -69,6 +69,8 @@
[gtk_webcore_exists=yes], [gtk_webcore_exists=no])
AC_SUBST([NRCIT_CFLAGS])
AC_SUBST([NRCIT_LIBS])
+NRCIT_VERSION="`$PKG_CONFIG --modversion osb-nrcit`"
+AC_SUBST([NRCIT_VERSION])
AM_CONDITIONAL([WITH_GTK_WEBCORE], [test x"$gtk_webcore_exists" = "xyes"])
dnl **************************************************************
Modified: kazehakase/trunk/module/embed/gtk-webcore/Makefile.am
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/Makefile.am 2007-03-26 08:53:31 UTC (rev 3031)
+++ kazehakase/trunk/module/embed/gtk-webcore/Makefile.am 2007-03-26 10:30:49 UTC (rev 3032)
@@ -12,11 +12,12 @@
-I$(top_srcdir)/src/libegg/pixbufthumbnail \
-I$(top_srcdir)/src/utils
-AM_CPPFLAGS= \
- -DKZ_DATADIR=\""$(datadir)/$(PACKAGE)"\"
+gtk_webcore_la_CPPFLAGS= \
+ -DKZ_DATADIR=\""$(datadir)/$(PACKAGE)"\" \
-DGTK_DISABLE_DEPRECATED=1 \
-DGDK_DISABLE_DEPRECATED=1 \
- -DG_DISABLE_DEPRECATED=1
+ -DG_DISABLE_DEPRECATED=1 \
+ -DGTK_WEBCORE_VERSION=\"$(NRCIT_VERSION)\"
gtk_webcore_la_LDFLAGS = \
-avoid-version \
Modified: kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp 2007-03-26 08:53:31 UTC (rev 3031)
+++ kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp 2007-03-26 10:30:49 UTC (rev 3032)
@@ -220,6 +220,12 @@
return g_object_new_valist(KZ_TYPE_GTK_WEBCORE, first_property, var_args);
}
+G_MODULE_EXPORT const gchar *
+KZ_MODULE_IMPL_GET_NAME (void)
+{
+ return "GtkWebCore " GTK_WEBCORE_VERSION;
+}
+
GType
kz_gtk_webcore_get_type (void)
{