[maemo-commits] [maemo-commits] r8777 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Fri Dec 15 12:27:00 EET 2006
Author: lucasr
Date: 2006-12-15 12:26:59 +0200 (Fri, 15 Dec 2006)
New Revision: 8777

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-plugin.c
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-plugin.h
Log:
2006-12-15  Lucas Rocha  <lucas.rocha at nokia.com>

	* libhildondesktop/hildon-desktop-plugin.[ch]: small fixes on GObject
	stuff and symbol export MACRO.
	* libhildondesktop/Makefile.am: install hildon-desktop-plugin headers.


Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2006-12-15 09:16:52 UTC (rev 8776)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2006-12-15 10:26:59 UTC (rev 8777)
@@ -1,3 +1,9 @@
+2006-12-15  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* libhildondesktop/hildon-desktop-plugin.[ch]: small fixes on GObject
+	stuff and symbol export MACRO.
+	* libhildondesktop/Makefile.am: install hildon-desktop-plugin headers.
+
 2006-12-14  Moises Martinez  <moises.martinez at nokia.com>
 
 	* libhildondesktop/hildon-desktop-plugin.h: Removed silly declaration

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am	2006-12-15 09:16:52 UTC (rev 8776)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am	2006-12-15 10:26:59 UTC (rev 8777)
@@ -11,6 +11,7 @@
 	hildon-desktop-panel-item.h   \
 	hildon-desktop-panel-item.h   \
 	hildon-desktop-item-socket.h  \
+	hildon-desktop-plugin.h       \
 	desktop-panel-window.h        \
 	desktop-panel.h               \
 	desktop-multiscreen.h         \

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-plugin.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-plugin.c	2006-12-15 09:16:52 UTC (rev 8776)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-plugin.c	2006-12-15 10:26:59 UTC (rev 8777)
@@ -36,7 +36,7 @@
 enum
 {
  PROP_0,
- HDPLUGIN_PATH_PROP
+ PROP_PATH
 };
 
 struct _HildonDesktopPluginPrivate
@@ -81,7 +81,7 @@
   g_type_class_add_private (object_class, sizeof (HildonDesktopPluginPrivate));
 
   g_object_class_install_property (object_class,
-                                   HDPLUGIN_PATH_PROP,
+                                   PROP_PATH,
                                    g_param_spec_string("path",
 						       "path-plugin",
                                                        "Path of the plugin",
@@ -121,7 +121,7 @@
 	
   switch (prop_id)
   {
-    case HDPLUGIN_PATH_PROP:
+    case PROP_PATH:
       g_value_set_string (value,plugin->priv->path);
       break;
 
@@ -141,10 +141,11 @@
 	
   switch (prop_id)
   {
-    case HDPLUGIN_PATH_PROP:
+    case PROP_PATH:
       g_free (plugin->priv->path);
       plugin->priv->path = g_strdup (g_value_get_string (value));
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -214,7 +215,7 @@
 
   g_return_val_if_fail (path != NULL, NULL);
 
-  plugin = g_object_new (HILDON_DESKTOP_TYPE_PLUGIN, "path", path);
+  plugin = g_object_new (HILDON_DESKTOP_TYPE_PLUGIN, "path", path, NULL);
 
   return plugin;
 }

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-plugin.h
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-plugin.h	2006-12-15 09:16:52 UTC (rev 8776)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-plugin.h	2006-12-15 10:26:59 UTC (rev 8777)
@@ -42,10 +42,12 @@
 #define HILDON_DESKTOP_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), HILDON_DESKTOP_TYPE_PLUGIN, HildonDesktopPluginClass))
 
 #define HILDON_DESKTOP_PLUGIN_SYMBOLS(o) \
+G_MODULE_EXPORT void hildon_desktop_plugin_load (HildonDesktopPlugin *plugin); \
 G_MODULE_EXPORT void hildon_desktop_plugin_load (HildonDesktopPlugin *plugin) \
 { \
   hildon_desktop_plugin_add_type (plugin, o##_get_type()); \
 } \
+G_MODULE_EXPORT void hildon_desktop_plugin_unload (HildonDesktopPlugin *plugin); \
 G_MODULE_EXPORT void hildon_desktop_plugin_unload (HildonDesktopPlugin *plugin) \
 { \
 }


More information about the maemo-commits mailing list