[maemo-commits] [maemo-commits] r12641 - in projects/haf/trunk/hildon-desktop: . policies

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-07-04 13:44:12 +0300 (Wed, 04 Jul 2007)
New Revision: 12641

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/policies/tasknavigator-policy.c
Log:
2007-07-04  Lucas Rocha  <lucas.rocha at nokia.com>

	* policies/tasknavigator-policy.c (is_gap_plugin,
	hd_ui_policy_module_filter_plugin_list): allow setting the position of
	the applications menu plugin but keep it as mandatory.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-04 09:58:09 UTC (rev 12640)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-04 10:44:12 UTC (rev 12641)
@@ -1,3 +1,9 @@
+2007-07-04  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* policies/tasknavigator-policy.c (is_gap_plugin,
+	hd_ui_policy_module_filter_plugin_list): allow setting the position of
+	the applications menu plugin but keep it as mandatory.
+
 2007-07-03  Johan Bilien  <johan.bilien at nokia.com>
 
 	* src/hd-app-menu-dialog.[ch]:
@@ -39,7 +45,7 @@
 	be shown on top of vkb.
 	* src/hd-switcher-menu.c: (hd_switcher_menu_constructor):
 	- Not attach the widget in order to be transient for root window and
-        be shown on top of vkb.
+	be shown on top of vkb.
 	- Fixes: NB#62048.
 
 2007-07-02  Johan Bilien  <johan.bilien at nokia.com>

Modified: projects/haf/trunk/hildon-desktop/policies/tasknavigator-policy.c
===================================================================
--- projects/haf/trunk/hildon-desktop/policies/tasknavigator-policy.c	2007-07-04 09:58:09 UTC (rev 12640)
+++ projects/haf/trunk/hildon-desktop/policies/tasknavigator-policy.c	2007-07-04 10:44:12 UTC (rev 12641)
@@ -46,8 +46,7 @@
 static gboolean
 is_gap_plugin (const gchar *plugin_id)
 {
-  if (!g_str_equal (plugin_id, HD_TN_ENTRY_PATH "/" HD_TN_APPS_MENU_PLUGIN)    &&
-      !g_str_equal (plugin_id, HD_TN_ENTRY_PATH "/" HD_TN_APP_SWITCHER_PLUGIN) &&
+  if (!g_str_equal (plugin_id, HD_TN_ENTRY_PATH "/" HD_TN_APP_SWITCHER_PLUGIN) &&
       !g_str_equal (plugin_id, HD_TN_ENTRY_PATH "/" HD_TN_SWITCHER_MENU_PLUGIN))
   {
     return TRUE;
@@ -62,13 +61,21 @@
   GList *i, *f_plugin_list = NULL;
   gboolean used_browser_plugin = FALSE;
   gboolean used_contact_plugin = FALSE;
+  gboolean used_appsmenu_plugin = FALSE;
   gint position = 0;
   gint n_items;
 
-  for (i = plugin_list; i && position < 2; i = i->next)
+  for (i = plugin_list; i && position < 3; i = i->next)
   {
     const gchar *plugin_id = (const gchar *) i->data;
 
+    if (position == 2 && !used_appsmenu_plugin)
+    {
+      f_plugin_list = g_list_append (f_plugin_list, 
+		                     g_strdup (HD_TN_ENTRY_PATH "/" HD_TN_APPS_MENU_PLUGIN));
+      break;
+    }
+ 
     if (is_gap_plugin (plugin_id))
     {
       f_plugin_list = g_list_append (f_plugin_list, g_strdup (plugin_id));
@@ -84,28 +91,34 @@
     if (g_str_equal (plugin_id, HD_TN_ENTRY_PATH "/" HD_TN_CONTACT_PLUGIN))
       used_contact_plugin = TRUE;
  
+    if (g_str_equal (plugin_id, HD_TN_ENTRY_PATH "/" HD_TN_APPS_MENU_PLUGIN))
+      used_appsmenu_plugin = TRUE;
+    
     position++;
   }
 
   n_items = g_list_length (f_plugin_list);
   
-  if (n_items < 2 && !used_browser_plugin)
+  if (n_items < 3 && !used_browser_plugin)
   {
     f_plugin_list = g_list_prepend (f_plugin_list, 
 		    		    g_strdup (HD_TN_ENTRY_PATH "/" HD_TN_BROWSER_PLUGIN));
     n_items++;
   }
   
-  if (n_items < 2 && !used_contact_plugin)
+  if (n_items < 3 && !used_contact_plugin)
   {
     f_plugin_list = g_list_append (f_plugin_list, 
 		    		   g_strdup (HD_TN_ENTRY_PATH "/" HD_TN_CONTACT_PLUGIN));
   }
 
+  if (n_items < 3 && !used_appsmenu_plugin)
+  {
+    f_plugin_list = g_list_append (f_plugin_list, 
+		    		   g_strdup (HD_TN_ENTRY_PATH "/" HD_TN_APPS_MENU_PLUGIN));
+  }
+
   f_plugin_list = g_list_append (f_plugin_list, 
-		  		 g_strdup (HD_TN_ENTRY_PATH "/" HD_TN_APPS_MENU_PLUGIN));
-  
-  f_plugin_list = g_list_append (f_plugin_list, 
 		  		 g_strdup (HD_TN_ENTRY_PATH "/" HD_TN_APP_SWITCHER_PLUGIN));
 
   f_plugin_list = g_list_append (f_plugin_list,