svnno****@sourc*****
svnno****@sourc*****
Tue Mar 27 08:31:30 JST 2007
Revision: 3033
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3033
Author: ikezoe
Date: 2007-03-27 08:31:29 +0900 (Tue, 27 Mar 2007)
Log Message:
-----------
* module/embed/gtk-webcore/kz-gtk-webcore-module.cpp: A new file.
* module/embed/gtk-webcore/kz-gtk-webcore.cpp: remove
KZ_MODULE_IMPLE_XX.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gtk-webcore/Makefile.am
kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp
kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.h
Added Paths:
-----------
kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore-module.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-26 10:30:49 UTC (rev 3032)
+++ kazehakase/trunk/ChangeLog 2007-03-26 23:31:29 UTC (rev 3033)
@@ -1,3 +1,9 @@
+2007-03-27 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * module/embed/gtk-webcore/kz-gtk-webcore-module.cpp: A new file.
+ * module/embed/gtk-webcore/kz-gtk-webcore.cpp: remove
+ KZ_MODULE_IMPLE_XX.
+
2007-03-26 Hiroyuki Ikezoe <poinc****@ikezo*****>
* configure.ac, module/embed/gtk-webcore/Makefile.am,
Modified: kazehakase/trunk/module/embed/gtk-webcore/Makefile.am
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/Makefile.am 2007-03-26 10:30:49 UTC (rev 3032)
+++ kazehakase/trunk/module/embed/gtk-webcore/Makefile.am 2007-03-26 23:31:29 UTC (rev 3033)
@@ -3,20 +3,20 @@
embed_LTLIBRARIES = gtk-webcore.la
-INCLUDES = \
- $(NRCIT_CFLAGS) \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/bookmarks \
- -I$(top_srcdir)/src/dialogs \
- -I$(top_srcdir)/src/net \
- -I$(top_srcdir)/src/libegg/pixbufthumbnail \
+INCLUDES = \
+ $(NRCIT_CFLAGS) \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/bookmarks \
+ -I$(top_srcdir)/src/dialogs \
+ -I$(top_srcdir)/src/net \
+ -I$(top_srcdir)/src/libegg/pixbufthumbnail \
-I$(top_srcdir)/src/utils
-gtk_webcore_la_CPPFLAGS= \
- -DKZ_DATADIR=\""$(datadir)/$(PACKAGE)"\" \
- -DGTK_DISABLE_DEPRECATED=1 \
- -DGDK_DISABLE_DEPRECATED=1 \
- -DG_DISABLE_DEPRECATED=1 \
+gtk_webcore_la_CPPFLAGS= \
+ -DKZ_DATADIR=\""$(datadir)/$(PACKAGE)"\" \
+ -DGTK_DISABLE_DEPRECATED=1 \
+ -DGDK_DISABLE_DEPRECATED=1 \
+ -DG_DISABLE_DEPRECATED=1 \
-DGTK_WEBCORE_VERSION=\"$(NRCIT_VERSION)\"
gtk_webcore_la_LDFLAGS = \
@@ -25,9 +25,10 @@
-export-dynamic $(no_undefined) \
$(LIBTOOL_EXPORT_OPTIONS)
-gtk_webcore_la_SOURCES = \
+gtk_webcore_la_SOURCES = \
+ kz-gtk-webcore-module.cpp \
kz-gtk-webcore.cpp kz-gtk-webcore.h
-gtk_webcore_la_LIBADD = \
- $(GTK_LIBS) \
+gtk_webcore_la_LIBADD = \
+ $(GTK_LIBS) \
$(NRCIT_LIBS)
Added: kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore-module.cpp
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore-module.cpp 2007-03-26 10:30:49 UTC (rev 3032)
+++ kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore-module.cpp 2007-03-26 23:31:29 UTC (rev 3033)
@@ -0,0 +1,51 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ * Copyright (C) 2004 Takuro Ashie
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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-gtk-webcore.cpp 3032 2007-03-26 10:30:49Z ikezoe $
+ */
+
+#include <glib/gi18n.h>
+
+#include "kz-module-impl.h"
+#include "kz-gtk-webcore.h"
+
+G_MODULE_EXPORT void
+KZ_MODULE_IMPL_INIT (GTypeModule *module)
+{
+ kz_gtk_webcore_register_type(module);
+}
+
+G_MODULE_EXPORT void
+KZ_MODULE_IMPL_EXIT (void)
+{
+}
+
+G_MODULE_EXPORT GObject *
+KZ_MODULE_IMPL_INSTANTIATE (const gchar *first_property,
+ va_list var_args)
+{
+ 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;
+}
+
Modified: kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp 2007-03-26 10:30:49 UTC (rev 3032)
+++ kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp 2007-03-26 23:31:29 UTC (rev 3033)
@@ -25,7 +25,6 @@
#include <sys/utsname.h>
#include <osb.h>
-#include "kz-module-impl.h"
#include "kazehakase.h"
#include "kz-gtk-webcore.h"
#include "kz-embed-prefs.h"
@@ -155,7 +154,7 @@
static gboolean kz_gtk_webcore_prefs_remove_passwords(KzEmbedPrefs *embed_prefs,
GList *passwords);
#endif
-static void
+void
kz_gtk_webcore_register_type (GTypeModule *module)
{
static const GTypeInfo kz_gtk_webcore_info =
@@ -202,30 +201,6 @@
&kz_embed_prefs_info);
}
-G_MODULE_EXPORT void
-KZ_MODULE_IMPL_INIT (GTypeModule *module)
-{
- kz_gtk_webcore_register_type(module);
-}
-
-G_MODULE_EXPORT void
-KZ_MODULE_IMPL_EXIT (void)
-{
-}
-
-G_MODULE_EXPORT GObject *
-KZ_MODULE_IMPL_INSTANTIATE (const gchar *first_property,
- va_list var_args)
-{
- 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)
{
Modified: kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.h
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.h 2007-03-26 10:30:49 UTC (rev 3032)
+++ kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.h 2007-03-26 23:31:29 UTC (rev 3033)
@@ -51,6 +51,7 @@
GType kz_gtk_webcore_get_type (void) G_GNUC_CONST;
+void kz_gtk_webcore_register_type (GTypeModule *module);
G_END_DECLS