[maemo-commits] [maemo-commits] r14043 - in projects/haf/trunk/hildon-desktop: . libhildondesktop src

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-09-24 16:51:42 +0300 (Mon, 24 Sep 2007)
New Revision: 14043

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
   projects/haf/trunk/hildon-desktop/src/hd-desktop.c
Log:
2007-09-24  Moises Martinez  <moises.martinez at nokia.com>

        * libhildondesktop/hildon-desktop-panel-expandable.c:
        (hildon_desktop_panel_expandable_get_children):
        - Return plugins already sorted.
        * src/hd-desktop.c: (hd_desktop_plugin_list_from_container),
        (hd_desktop_select_plugins):
        - Fully support for HildonDesktopContainer.
        Fixes: NB#66911
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-24 13:51:04 UTC (rev 14042)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-24 13:51:42 UTC (rev 14043)
@@ -1,3 +1,13 @@
+2007-09-24  Moises Martinez  <moises.martinez at nokia.com>
+
+	* libhildondesktop/hildon-desktop-panel-expandable.c:
+	(hildon_desktop_panel_expandable_get_children):
+	- Return plugins already sorted.
+	* src/hd-desktop.c: (hd_desktop_plugin_list_from_container),
+	(hd_desktop_select_plugins):
+	- Fully support for HildonDesktopContainer.
+	Fixes: NB#66911
+
 2007-09-24 Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildondesktop/libhildonmenu.c: Fixed potential leaks of

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2007-09-24 13:51:04 UTC (rev 14042)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2007-09-24 13:51:42 UTC (rev 14043)
@@ -149,6 +149,9 @@
 static void hildon_desktop_panel_embed_applet (HildonDesktopPanelExpandable *panel, Window wid);
 #endif
 
+static gint
+hildon_desktop_panel_expandable_sort_items (gconstpointer a, gconstpointer b);
+
 static GList *
 hildon_desktop_panel_expandable_get_children (HildonDesktopContainer *container);
 
@@ -460,6 +463,11 @@
 		  	(GHFunc)hildon_desktop_panel_expandable_hash_adding,
 			(gpointer)&retval);
 
+  retval =
+    g_list_sort (retval,(GCompareFunc)hildon_desktop_panel_expandable_sort_items);
+
+  retval = g_list_reverse (retval);
+  
   return retval;
 }	
 

Modified: projects/haf/trunk/hildon-desktop/src/hd-desktop.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2007-09-24 13:51:04 UTC (rev 14042)
+++ projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2007-09-24 13:51:42 UTC (rev 14043)
@@ -373,9 +373,13 @@
 hd_desktop_plugin_list_from_container (GtkContainer *container)
 {
   GList *plugin_list = NULL, *children, *iter;
+  
+  if (HILDON_DESKTOP_IS_CONTAINER (container))
+    children = 
+      hildon_desktop_container_get_children (HILDON_DESKTOP_CONTAINER (container));
+  else	  
+    children = gtk_container_get_children (container);
 
-  children = gtk_container_get_children (container);
-
   for (iter = children; iter; iter = g_list_next (iter))
   {
     gchar *id;
@@ -581,7 +585,13 @@
 
   priv = info->desktop->priv;
 
-  loaded_plugins = gtk_container_get_children (window->container);
+  if (HILDON_DESKTOP_IS_CONTAINER (window->container))
+    loaded_plugins = 
+      hildon_desktop_container_get_children 
+        (HILDON_DESKTOP_CONTAINER (window->container));
+  else
+    loaded_plugins = 
+      gtk_container_get_children (window->container);
 
   response = hd_select_plugins_dialog_run (loaded_plugins,
 #ifdef HAVE_LIBHILDONHELP