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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-20 15:53:07 +0300 (Thu, 20 Sep 2007)
New Revision: 13944

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-app-menu-dialog.c
Log:

2007-09-20 Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-app-menu-settings-dialog.c: check for duplicate names
	on the stripped name, not the original. Fixes: NB#70314



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-20 12:51:54 UTC (rev 13943)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-20 12:53:07 UTC (rev 13944)
@@ -1,5 +1,10 @@
 2007-09-20 Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-app-menu-settings-dialog.c: check for duplicate names
+	on the stripped name, not the original. Fixes: NB#70314
+
+2007-09-20 Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildonwm/hd-wm-window.c: set the parent pointer to the
 	parent app when creating a new window. Fixes: NB#70125
 

Modified: projects/haf/trunk/hildon-desktop/src/hd-app-menu-dialog.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-app-menu-dialog.c	2007-09-20 12:51:54 UTC (rev 13943)
+++ projects/haf/trunk/hildon-desktop/src/hd-app-menu-dialog.c	2007-09-20 12:53:07 UTC (rev 13944)
@@ -369,7 +369,8 @@
       GdkPixbuf          *icon;
       gchar              *stripped;
 
-      if (hd_app_menu_dialog_category_exists (dialog, name))
+      stripped = g_strstrip (g_strdup (name));
+      if (hd_app_menu_dialog_category_exists (dialog, stripped))
       {
         hildon_banner_show_information (GTK_WIDGET (dialog),
                                         NULL,
@@ -381,7 +382,6 @@
 
       gtk_tree_store_append (GTK_TREE_STORE (dialog->priv->model), &iter, NULL);
 
-      stripped = g_strstrip (g_strdup (name));
       gtk_tree_store_set (GTK_TREE_STORE (dialog->priv->model), &iter,
                           TREE_MODEL_NAME, stripped,
                           TREE_MODEL_LOCALIZED_NAME, stripped,
@@ -476,7 +476,8 @@
     {
       gchar *stripped;
 
-      if (hd_app_menu_dialog_category_exists (dialog, name))
+      stripped = g_strstrip (g_strdup (name));
+      if (hd_app_menu_dialog_category_exists (dialog, stripped))
       {
         hildon_banner_show_information (GTK_WIDGET (dialog),
                                         NULL,
@@ -484,7 +485,6 @@
         continue;
       }
 
-      stripped = g_strstrip (g_strdup (name));
       gtk_tree_store_set (GTK_TREE_STORE (dialog->priv->model), &iter,
                           TREE_MODEL_NAME, stripped,
                           TREE_MODEL_LOCALIZED_NAME, stripped,