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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-02-20 16:59:51 +0200 (Wed, 20 Feb 2008)
New Revision: 15209

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
Log:
	* hildon-fm/hildon-file-chooser-dialog.c (sync_extensions_combo):
	Do not change the extensions combobox selection if there's already
	a valid extension selected. (N76380)


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 14:54:20 UTC (rev 15208)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 14:59:51 UTC (rev 15209)
@@ -1,5 +1,9 @@
 2008-02-20  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	* hildon-fm/hildon-file-chooser-dialog.c (sync_extensions_combo):
+	Do not change the extensions combobox selection if there's already
+	a valid extension selected. (N76380)
+
 	* hildon-fm/hildon-file-system-smb.c
 	(my_file_folder_collaps_path): Avoid calling strcpy with
 	two pointers into the same string (N79427).

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 14:54:20 UTC (rev 15208)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 14:59:51 UTC (rev 15209)
@@ -1,6 +1,6 @@
 libhildonfm (1:2.0.1~unreleased) unstable; urgency=low
 
-  * Fixes: NB#76517, NB#79427.
+  * Fixes: NB#76517, NB#79427, NB#76380.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 20 Feb 2008 16:42:40 +0200
 

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	2008-02-20 14:54:20 UTC (rev 15208)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2008-02-20 14:59:51 UTC (rev 15209)
@@ -2255,6 +2255,20 @@
 
       model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->extensions_combo));
 
+      /* if there is a valid extension selected, just leave it */
+      if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->extensions_combo), &iter))
+        {
+	  gboolean matches;
+	  gchar *ext;
+
+	  gtk_tree_model_get (model, &iter, 1, &ext, -1);
+	  matches = (strcmp (ext, priv->ext_name + 1) == 0);
+	  g_free (ext);
+
+	  if (matches)
+	    return;
+	}
+
       i = 0;
       valid = gtk_tree_model_get_iter_first (model, &iter);
       while (valid)