[maemo-commits] [maemo-commits] r11760 - in projects/haf/trunk/hildon-fm: . hildon-fm

[From: subversion at stage.maemo.org]

Author: ogorter
Date: 2007-05-22 17:55:49 +0300 (Tue, 22 May 2007)
New Revision: 11760

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
Log:
	* hildon-fm/hildon-file-chooser-dialog.c:
	Fix minor issue with named filters, fixes NB#55408
	Proper fix needed though, because named filters and the filter list are
	not kept in sync properly.

Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-05-22 13:52:35 UTC (rev 11759)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-05-22 14:55:49 UTC (rev 11760)
@@ -1,3 +1,10 @@
+2007-05-22  Onne Gorter  <onne.gorter at nokia.com>
+
+	* hildon-fm/hildon-file-chooser-dialog.c:
+	Fix minor issue with named filters, fixes NB#55408
+	Proper fix needed though, because named filters and the filter list are
+	not kept in sync properly.
+
 2007-05-21  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	* hildon-fm/hildon-file-chooser-dialog.c (handle_folder_popup):

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-05-22 13:52:35 UTC (rev 11759)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-05-22 14:55:49 UTC (rev 11760)
@@ -1739,27 +1739,20 @@
 
     /* Updates the radio button of filters, if any */
     filter = hildon_file_selection_get_filter(priv->filetree);
-    if (filter != NULL)
-      {
-	filter_index = g_slist_index(priv->filters, filter);
-	if (filter_index >= 0)
-	  {
-	    menu_item = g_slist_nth_data (priv->filter_menu_items,
-					  filter_index);
-	    if (filter != NULL)
-	      {
-		gulong *signal_handler = NULL;
-		signal_handler =
-		  g_slist_nth_data (priv->filter_item_menu_toggle_handlers,
-				    filter_index);
-		g_signal_handler_block (G_OBJECT(menu_item), *signal_handler);
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(menu_item),
-						TRUE);
-		g_signal_handler_unblock (G_OBJECT(menu_item),
-					  *signal_handler);
-	      }
-	  }
-      }
+    if (filter) {
+        filter_index = g_slist_index(priv->filters, filter);
+        if (filter_index >= 0) {
+            menu_item = g_slist_nth_data (priv->filter_menu_items, filter_index);
+            if (filter && menu_item) {
+                /* if we find a valid filter and menu item */
+                gulong *signal_handler = NULL;
+                signal_handler = g_slist_nth_data (priv->filter_item_menu_toggle_handlers, filter_index);
+                g_signal_handler_block (G_OBJECT(menu_item), *signal_handler);
+                gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(menu_item), TRUE);
+                g_signal_handler_unblock (G_OBJECT(menu_item), *signal_handler);
+            }
+        }
+    }
 }
 
 static void