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

[From: www-data at stage.maemo.org]

Author: moimart
Date: 2006-11-27 13:07:45 +0200 (Mon, 27 Nov 2006)
New Revision: 8326

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac
   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
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildondesktop.h
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/Makefile.am
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.h
Log:

	* libhildonwm/*: Updated libhildonwm.
	* ChangeLog updated.



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2006-11-27 10:45:16 UTC (rev 8325)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2006-11-27 11:07:45 UTC (rev 8326)
@@ -1,3 +1,7 @@
+2006-11-27  Moises Martinez  <moises.martinzes at nokia.com>
+
+	* libhildonwm/*: Updated libhildonwm.
+
 2006-11-27  Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildondesktop/libhildonmenu.c: Fixed a potential crash when

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2006-11-27 10:45:16 UTC (rev 8325)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2006-11-27 11:07:45 UTC (rev 8326)
@@ -149,4 +149,6 @@
 	libhildondesktop/Makefile \
 	libhildondesktop/libhildondesktop.pc \
 	data/Makefile \
-	src/Makefile)
+	src/Makefile
+	plugins/Makefile \
+	plugins/appswitcher/Makefile)

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-11-27 10:45:16 UTC (rev 8325)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-plugin.c	2006-11-27 11:07:45 UTC (rev 8326)
@@ -220,10 +220,7 @@
 }
 
 void
-hildon_desktop_plugin_query (HildonDesktopPlugin *plugin)
+hildon_desktop_plugin_add_type (HildonDesktopPlugin *plugin, GType type)
 {
-  g_return_if_fail (HILDON_DESKTOP_IS_PLUGIN (plugin));
-
-  plugin->priv->query (plugin);
+  plugin->gtypes = g_list_append (plugin->gtypes, GINT_TO_POINTER (type));
 }
-

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-11-27 10:45:16 UTC (rev 8325)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-plugin.h	2006-11-27 11:07:45 UTC (rev 8326)
@@ -46,6 +46,8 @@
 {
   GTypeModule parent;
 
+  GList *gtypes;
+
   HildonDesktopPluginPrivate *priv;
 };
 
@@ -63,7 +65,7 @@
 hildon_desktop_plugin_new (GType module_type, const gchar *path);
 
 void
-hildon_desktop_plugin_query (HildonDesktopPlugin *plugin);
+hildon_desktop_plugin_add_type (HildonDesktopPlugin *plugin, GType type);
 
 G_END_DECLS
 

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildondesktop.h
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildondesktop.h	2006-11-27 10:45:16 UTC (rev 8325)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildondesktop.h	2006-11-27 11:07:45 UTC (rev 8326)
@@ -44,7 +44,7 @@
 
 #define HD_DEFINE_PLUGIN(TN, t_n, T_P)
 
-#define HD_DEFINE_TYPE(TN, t_n, T_P) HD_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
+#define HD_DEFINE_TYPE(TN, t_n, T_P) HD_DEFINE_TYPE_MODULE_EXTENDED (TN, t_n, T_P, 0, {})
 
 #define HD_DEFINE_TYPE_MODULE_EXTENDED(TypeName, type_name, TYPE_PARENT, flags, CODE) \
 \

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/Makefile.am
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/Makefile.am	2006-11-27 10:45:16 UTC (rev 8325)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/Makefile.am	2006-11-27 11:07:45 UTC (rev 8326)
@@ -4,7 +4,16 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgincludedir = $(includedir)/libhildonwm/libhildonwm
 pkgconfig_DATA = libhildonwm.pc
-pkginclude_HEADERS = hd-wm.h hd-wm-types.h
+pkginclude_HEADERS = hd-entry-info.h \
+		     hd-keys.h \
+		     hd-wm-memory.h \
+		     hd-wm-types.h \
+		     hd-wm-util.h \
+		     hd-wm-watchable-app.h \
+		     hd-wm-watched-window-view.h \
+		     hd-wm-watched-window.h \
+		     hd-wm.h \
+		     osso-manager.h
 		     
 
 EXTRA_DIST = .empty

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.h
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.h	2006-11-27 10:45:16 UTC (rev 8325)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.h	2006-11-27 11:07:45 UTC (rev 8326)
@@ -36,6 +36,8 @@
 #include <gtk/gtk.h>
 
 #include <libhildonwm/hd-wm-types.h>
+#include <libhildonwm/hd-entry-info.h>
+#include <libhildonwm/hd-wm-watchable-app.h>
 
 #define HN_WANT_DEBUG 0 /* Set to 1 for more verbose hn */