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

[From: subversion at stage.maemo.org]

Author: ogorter
Date: 2007-05-23 14:24:24 +0300 (Wed, 23 May 2007)
New Revision: 11770

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/configure.ac
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
Log:
	* hildon-fm/hildon-file-chooser-dialog.c:
	When calculating new name, don't turn it into a known extension.
	Fixes NB#52803 (hopefully)

Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-05-23 11:13:25 UTC (rev 11769)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-05-23 11:24:24 UTC (rev 11770)
@@ -1,5 +1,11 @@
 2007-05-23  Onne Gorter  <onne.gorter at nokia.com>
 
+	* hildon-fm/hildon-file-chooser-dialog.c:
+	When calculating new name, don't turn it into a known extension.
+	Fixes NB#52803 (hopefully)
+
+2007-05-23  Onne Gorter  <onne.gorter at nokia.com>
+
 	Tabs to 8 spaces, remove trailing spaces
 
 2007-05-22  Marius Vollmer  <marius.vollmer at nokia.com>

Modified: projects/haf/trunk/hildon-fm/configure.ac
===================================================================
--- projects/haf/trunk/hildon-fm/configure.ac	2007-05-23 11:13:25 UTC (rev 11769)
+++ projects/haf/trunk/hildon-fm/configure.ac	2007-05-23 11:24:24 UTC (rev 11770)
@@ -25,7 +25,7 @@
     esac
   ])
 
-CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations -Werror -Wno-format-extra-args $LOGFLAGS"
+CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-format-extra-args $LOGFLAGS"
 
 GTK_VERSION=2.10.0
 

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-23 11:13:25 UTC (rev 11769)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-05-23 11:24:24 UTC (rev 11770)
@@ -518,14 +518,20 @@
       is_folder = FALSE;
     }
 
-  dot = _hildon_file_system_search_extension (priv->stub_name,
-                                              FALSE, is_folder);
+  // TODO this should change, we should know:
+  // * what the user typed in the entry box
+  // * what the system proposed for the entry box (autonamed files parts)
+  // * what the system extension is
+  // Mixing all that together in the text field loses information, leading to corner cases
 
-  /* Is there a dot, but not as first character */
-  if (dot && dot != priv->stub_name) {
-    g_free(priv->ext_name);
-    priv->ext_name = g_strdup(dot);
-    *dot = '\0';
+  dot = _hildon_file_system_search_extension (priv->stub_name, FALSE, is_folder);
+  if (dot) {
+      /* if there is a dot and the extension is not the whole name, or the extension is known, separate them */
+      if (_hildon_file_system_is_known_extension (dot) || dot != priv->stub_name) {
+            g_free(priv->ext_name);
+            priv->ext_name = g_strdup(dot);
+            *dot = '\0';
+      }
   }
 
   hildon_file_chooser_dialog_do_autonaming (priv);