[Kazehakase-cvs] kazehakase-svn [3061] * module/embed/gecko/kz-gecko-embed-module.cpp: New file.

Zurück zum Archiv-Index

svnno****@sourc***** svnno****@sourc*****
Wed Mar 28 08:55:29 JST 2007


Revision: 3061
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3061
Author:   ikezoe
Date:     2007-03-28 08:55:28 +0900 (Wed, 28 Mar 2007)

Log Message:
-----------
* module/embed/gecko/kz-gecko-embed-module.cpp: New file.
* module/embed/gecko/kz-gecko-embed.cpp: Remove the code related
KzModule.

Modified Paths:
--------------
    kazehakase/trunk/ChangeLog
    kazehakase/trunk/module/embed/gecko/Makefile.am
    kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
    kazehakase/trunk/module/embed/gecko/kz-gecko-embed.h

Added Paths:
-----------
    kazehakase/trunk/module/embed/gecko/kz-gecko-embed-module.cpp

Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog	2007-03-27 11:26:13 UTC (rev 3060)
+++ kazehakase/trunk/ChangeLog	2007-03-27 23:55:28 UTC (rev 3061)
@@ -1,3 +1,9 @@
+2007-03-28  Hiroyuki Ikezoe  <poinc****@ikezo*****>
+
+	* module/embed/gecko/kz-gecko-embed-module.cpp: New file.
+	* module/embed/gecko/kz-gecko-embed.cpp: Remove the code related
+	KzModule.
+
 2007-03-27  Kouhei Sutou  <kou****@cozmi*****>
 
 	* src/utils/utils.c (kz_utils_purge_files_by_time_stamp): fixed a

Modified: kazehakase/trunk/module/embed/gecko/Makefile.am
===================================================================
--- kazehakase/trunk/module/embed/gecko/Makefile.am	2007-03-27 11:26:13 UTC (rev 3060)
+++ kazehakase/trunk/module/embed/gecko/Makefile.am	2007-03-27 23:55:28 UTC (rev 3061)
@@ -90,7 +90,8 @@
 endif
 
 gecko_la_SOURCES = \
-	kz-gecko-embed.cpp \
+	kz-gecko-embed-module.cpp \
+	kz-gecko-embed.cpp kz-gecko-embed.h \
 	kz-gecko-single.cpp kz-gecko-single.h \
 	GtkNSSDialogs.cpp GtkNSSDialogs.h \
 	GtkPromptService.cpp GtkPromptService.h \

Added: kazehakase/trunk/module/embed/gecko/kz-gecko-embed-module.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed-module.cpp	2007-03-27 11:26:13 UTC (rev 3060)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed-module.cpp	2007-03-27 23:55:28 UTC (rev 3061)
@@ -0,0 +1,57 @@
+// -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+
+//
+//  Copyright (C) 2007 Hiroyuki Ikezoe
+//
+//  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.
+//
+
+#include "kz-module-impl.h"
+
+#include "kz-gecko-embed.h"
+#include "kz-gecko-single.h"
+
+static KzGeckoSingle *gecko_single = NULL;
+
+G_MODULE_EXPORT void
+KZ_MODULE_IMPL_INIT (GTypeModule *module)
+{
+	gecko_single = kz_gecko_single_new(kz_app);
+	kz_gecko_embed_register_type(module);
+}
+
+G_MODULE_EXPORT void
+KZ_MODULE_IMPL_EXIT (void)
+{
+	g_object_unref(gecko_single);
+}
+
+G_MODULE_EXPORT GObject *
+KZ_MODULE_IMPL_INSTANTIATE (const gchar *first_property,
+			    va_list      var_args)
+{
+	KzGeckoEmbed *kzembed;
+
+	kzembed = KZ_GECKO_EMBED(g_object_new_valist(KZ_TYPE_GECKO_EMBED,
+						     first_property, var_args));
+	return G_OBJECT(kzembed);
+}
+
+G_MODULE_EXPORT const gchar *
+KZ_MODULE_IMPL_GET_NAME (void)
+{
+	return GECKO_VERSION;
+}
+

Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp	2007-03-27 11:26:13 UTC (rev 3060)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp	2007-03-27 23:55:28 UTC (rev 3061)
@@ -146,7 +146,6 @@
 
 static GType kz_type_gecko_embed = 0;
 static GtkMozEmbedClass *kz_gecko_embed_parent_class;
-static KzGeckoSingle *gecko_single = NULL;
 
 static GtkWidget *kz_gecko_embed_new     (void);
 
@@ -391,7 +390,7 @@
                               guint         prop_id,
                               GValue       *value,
                               GParamSpec   *pspec);
-static void
+void
 kz_gecko_embed_register_type (GTypeModule *module)
 {
 	static const GTypeInfo kz_gecko_embed_info =
@@ -438,37 +437,6 @@
 				    &kz_embed_prefs_info);
 }
 
-G_MODULE_EXPORT void
-KZ_MODULE_IMPL_INIT (GTypeModule *module)
-{
-	gecko_single = kz_gecko_single_new(kz_app);
-	kz_gecko_embed_register_type(module);
-}
-
-G_MODULE_EXPORT void
-KZ_MODULE_IMPL_EXIT (void)
-{
-	g_object_unref(gecko_single);
-}
-
-G_MODULE_EXPORT GObject *
-KZ_MODULE_IMPL_INSTANTIATE (const gchar *first_property,
-			    va_list      var_args)
-{
-	KzGeckoEmbed *kzembed;
-
-	kzembed = KZ_GECKO_EMBED(g_object_new_valist(KZ_TYPE_GECKO_EMBED,
-						     first_property, var_args));
-	return G_OBJECT(kzembed);
-}
-
-G_MODULE_EXPORT const gchar *
-KZ_MODULE_IMPL_GET_NAME (void)
-{
-	return GECKO_VERSION;
-}
-
-
 GType
 kz_gecko_embed_get_type (void)
 {

Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.h	2007-03-27 11:26:13 UTC (rev 3060)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.h	2007-03-27 23:55:28 UTC (rev 3061)
@@ -37,7 +37,8 @@
 	GtkMozEmbed parent;
 };
 
-GType      kz_gecko_embed_get_type (void) G_GNUC_CONST;
+GType      kz_gecko_embed_get_type      (void) G_GNUC_CONST;
+void	   kz_gecko_embed_register_type (GTypeModule *module);
 
 G_END_DECLS
 




More information about the Kazehakase-cvs mailing list
Zurück zum Archiv-Index