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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-08-14 20:03:35 +0300 (Tue, 14 Aug 2007)
New Revision: 13190

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
	(hildon_file_chooser_dialog_do_autonaming): Do not autoname an
	empty name.
	(hildon_file_chooser_dialog_set_current_folder): Do not resplit an
	empty name.
	(set_stub_and_ext): Reset ext_name always.


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-08-14 17:02:51 UTC (rev 13189)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-08-14 17:03:35 UTC (rev 13190)
@@ -1,3 +1,12 @@
+2007-08-14  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* hildon-fm/hildon-file-chooser-dialog.c
+	(hildon_file_chooser_dialog_do_autonaming): Do not autoname an
+	empty name.
+	(hildon_file_chooser_dialog_set_current_folder): Do not resplit an
+	empty name.
+	(set_stub_and_ext): Reset ext_name always.
+
 2007-08-13  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 1.9.38

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-08-14 17:02:51 UTC (rev 13189)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-08-14 17:03:35 UTC (rev 13190)
@@ -408,7 +408,7 @@
     g_assert(HILDON_IS_FILE_SELECTION(priv->filetree));
 
     if (GTK_WIDGET_VISIBLE(priv->caption_control_name) &&
-        priv->stub_name && !priv->edited)
+        priv->stub_name && priv->stub_name[0] && !priv->edited)
     {
         gchar *name = NULL;
         gboolean selection;
@@ -469,12 +469,10 @@
   char *dot;
   gboolean is_folder;
 
-  /* XXX - We do not always reset the extension here since the old
-           code didn't do it and some code out there might rely on it
-           not being done.
-  */
   g_free (priv->stub_name);
+  g_free (priv->ext_name);
   priv->stub_name = g_strdup (name);
+  priv->ext_name = NULL;
 
   /* XXX - Determine whether we are talking about a folder here.  If
            action is CREATE_FOLDER, the dialog might actually be used
@@ -697,16 +695,20 @@
 
     /* Now resplit the name into stub and ext parts since now the
        situation might have changed as to whether it is a folder or
-       not.
+       not.  Only do this with a non-empty stub, tho.
     */
-    if (self->priv->ext_name)
-      name = g_strconcat (self->priv->stub_name, self->priv->ext_name, NULL);
-    else
-      name = g_strdup (self->priv->stub_name);
+    if (self->priv->stub_name && self->priv->stub_name[0])
+      {
+	if (self->priv->ext_name)
+	  name = g_strconcat (self->priv->stub_name,
+			      self->priv->ext_name, NULL);
+	else
+	  name = g_strdup (self->priv->stub_name);
+	
+	set_stub_and_ext (self->priv, name);
+	g_free (name);
+      }
 
-    set_stub_and_ext (self->priv, name);
-    g_free (name);
-
     return result;
 }