[maemo-commits] [maemo-commits] r9531 - in projects/haf/trunk/hildon-home-webshortcut: . plugin

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-02-01 17:47:37 +0200 (Thu, 01 Feb 2007)
New Revision: 9531

Modified:
   projects/haf/trunk/hildon-home-webshortcut/ChangeLog
   projects/haf/trunk/hildon-home-webshortcut/plugin/hhwsloader.c
   projects/haf/trunk/hildon-home-webshortcut/plugin/hhwsloader.h
   projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c
Log:

2007-02-01  Johan Bilien  <johan.bilien at nokia.com>

	* plugin/hhwsloader.c: Added hhws_register_type
	* plugin/hildon-home-webshortcut.c: Add registration of the
	hhwsloader type in the _load GTypeModule callback



Modified: projects/haf/trunk/hildon-home-webshortcut/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/ChangeLog	2007-02-01 15:42:09 UTC (rev 9530)
+++ projects/haf/trunk/hildon-home-webshortcut/ChangeLog	2007-02-01 15:47:37 UTC (rev 9531)
@@ -1,3 +1,9 @@
+2007-02-01  Johan Bilien  <johan.bilien at nokia.com>
+
+	* plugin/hhwsloader.c: Added hhws_register_type
+	* plugin/hildon-home-webshortcut.c: Add registration of the
+	hhwsloader type in the _load GTypeModule callback
+
 2007-01-10  Johan Bilien  <johan.bilien at nokia.com>
 
 	* configure.ac: 3.0.0

Modified: projects/haf/trunk/hildon-home-webshortcut/plugin/hhwsloader.c
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/plugin/hhwsloader.c	2007-02-01 15:42:09 UTC (rev 9530)
+++ projects/haf/trunk/hildon-home-webshortcut/plugin/hhwsloader.c	2007-02-01 15:47:37 UTC (rev 9531)
@@ -107,31 +107,36 @@
   return g_quark_from_static_string ("hhws-loader-error-quark");
 }
 
+static GType loader_type = 0;
+
 GType hhws_loader_get_type(void)
 {
-  static GType loader_type = 0;
+  return loader_type;
+}
 
-  if (!loader_type) {
-    static const GTypeInfo loader_info = {
-      sizeof(HhwsLoaderClass),
-      NULL,       /* base_init */
-      NULL,       /* base_finalize */
-      (GClassInitFunc) hhws_loader_class_init,
-      NULL,       /* class_finalize */
-      NULL,       /* class_data */
-      sizeof(HhwsLoader),
-      0,  /* n_preallocs */
-      (GInstanceInitFunc) hhws_loader_init,
-    };
+void
+hhws_loader_register_type (GTypeModule *module)
+{
+  static const GTypeInfo loader_info = {
+    sizeof(HhwsLoaderClass),
+    NULL,       /* base_init */
+    NULL,       /* base_finalize */
+    (GClassInitFunc) hhws_loader_class_init,
+    NULL,       /* class_finalize */
+    NULL,       /* class_data */
+    sizeof (HhwsLoader),
+    0,  /* n_preallocs */
+    (GInstanceInitFunc) hhws_loader_init,
+    NULL
+  };
 
-    loader_type = g_type_register_static(G_TYPE_OBJECT,
-                                         "HhwsLoader",
-                                         &loader_info, 0);
-  }
-  return loader_type;
+  loader_type = g_type_module_register_type (module,
+                                             G_TYPE_OBJECT,
+                                             "HhwsLoader",
+                                             &loader_info,
+                                             0);
 }
 
-
 static void
 hhws_loader_class_init (HhwsLoaderClass *klass)
 {

Modified: projects/haf/trunk/hildon-home-webshortcut/plugin/hhwsloader.h
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/plugin/hhwsloader.h	2007-02-01 15:42:09 UTC (rev 9530)
+++ projects/haf/trunk/hildon-home-webshortcut/plugin/hhwsloader.h	2007-02-01 15:47:37 UTC (rev 9531)
@@ -69,7 +69,8 @@
 };
 
 
-GType hhws_loader_get_type (void);
+void            hhws_loader_register_type           (GTypeModule *module);
+GType           hhws_loader_get_type                (void);
 
 void            hhws_loader_set_uri                 (HhwsLoader *loader,
                                                      const gchar *uri);

Modified: projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c	2007-02-01 15:42:09 UTC (rev 9530)
+++ projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c	2007-02-01 15:47:37 UTC (rev 9531)
@@ -100,7 +100,7 @@
   GConfClient      *gconf_client;
 };
 
-HD_DEFINE_PLUGIN (Hhws, hhws, HILDON_TYPE_HOME_APPLET)
+HD_DEFINE_PLUGIN_WITH_CODE (Hhws, hhws, HILDON_TYPE_HOME_APPLET, hhws_loader_register_type (module);)
 
 static void
 hhws_show_information_note (Hhws *hhws,