svnno****@sourc*****
svnno****@sourc*****
Mon Oct 15 19:14:00 JST 2007
Revision: 3280
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3280
Author: ikezoe
Date: 2007-10-15 19:13:59 +0900 (Mon, 15 Oct 2007)
Log Message:
-----------
* configure.ac: gtk-ie-embed -> gtkieembed.
* module/embed/ie/Makefile.am: Add GTKIEEMBED_CFLGAGS.
* module/embed/ie/kz-ie.cpp: Parent class is GtkIEEmbed.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/configure.ac
kazehakase/trunk/module/embed/ie/Makefile.am
kazehakase/trunk/module/embed/ie/kz-ie.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-10-15 05:30:55 UTC (rev 3279)
+++ kazehakase/trunk/ChangeLog 2007-10-15 10:13:59 UTC (rev 3280)
@@ -3,6 +3,9 @@
* src/Makefile.am: Use --header and --body option simultaneously.
* configure.ac, module/embed/Makefile.am,
module/embed/ie/kz-ie.[cpp|h]: Use GtkIEEmbed.
+ * configure.ac: gtk-ie-embed -> gtkieembed.
+ * module/embed/ie/Makefile.am: Add GTKIEEMBED_CFLGAGS.
+ * module/embed/ie/kz-ie.cpp: Parent class is GtkIEEmbed.
2007-10-15 Kouhei Sutou <kou****@cozmi*****>
Modified: kazehakase/trunk/configure.ac
===================================================================
--- kazehakase/trunk/configure.ac 2007-10-15 05:30:55 UTC (rev 3279)
+++ kazehakase/trunk/configure.ac 2007-10-15 10:13:59 UTC (rev 3280)
@@ -132,7 +132,7 @@
dnl **************************************************************
gtk_ie_embed_exists=no
-PKG_CHECK_MODULES(GTKIEEMBED, gtk-ie-embed,
+PKG_CHECK_MODULES(GTKIEEMBED, gtkieembed,
[gtk_ie_embed_exists=yes], [gtk_ie_embed_exists=no])
AC_SUBST([GTKIEEMBED_CFLAGS])
AC_SUBST([GTKIEEMBED_LIBS])
Modified: kazehakase/trunk/module/embed/ie/Makefile.am
===================================================================
--- kazehakase/trunk/module/embed/ie/Makefile.am 2007-10-15 05:30:55 UTC (rev 3279)
+++ kazehakase/trunk/module/embed/ie/Makefile.am 2007-10-15 10:13:59 UTC (rev 3280)
@@ -5,7 +5,8 @@
embed_LTLIBRARIES = ie.la
INCLUDES = \
- -I$(GTK_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(GTKIEEMBED_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/bookmarks \
-I$(top_srcdir)/src/dialogs \
@@ -30,4 +31,5 @@
kz-ie.cpp kz-ie.h
ie_la_LIBADD = \
- $(GTK_LIBS)
+ $(GTK_LIBS) \
+ $(GTK_IE_EMBED_LIBS)
Modified: kazehakase/trunk/module/embed/ie/kz-ie.cpp
===================================================================
--- kazehakase/trunk/module/embed/ie/kz-ie.cpp 2007-10-15 05:30:55 UTC (rev 3279)
+++ kazehakase/trunk/module/embed/ie/kz-ie.cpp 2007-10-15 10:13:59 UTC (rev 3280)
@@ -112,7 +112,7 @@
GObjectClass *object_class;
GtkWidgetClass *widget_class;
- kz_ie_parent_class = (GtkWidgetClass *)g_type_class_peek_parent (klass);
+ kz_ie_parent_class = (GtkIEEmbedClass *)g_type_class_peek_parent (klass);
object_class = (GObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;