[maemo-commits] [maemo-commits] r13916 - projects/haf/trunk/hildon-fm/hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-09-19 16:26:05 +0300 (Wed, 19 Sep 2007)
New Revision: 13916

Modified:
   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): Call set_entry always
	even when no autonaming has been done so.
	(hildon_file_chooser_dialog_set_current_name): Do not call
	set_entry explicitly, it would overwrite the autonaming done
	previously.


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-09-19 12:04:03 UTC (rev 13915)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-09-19 13:26:05 UTC (rev 13916)
@@ -63,6 +63,9 @@
 #include <glib.h>
 
 #include "hildon-file-common-private.h"
+
+/*#define DEBUG*/
+
 #define HILDON_RESPONSE_FOLDER_BUTTON 12345
 #define HILDON_RESPONSE_FOLDER_CREATED 54321
 /* Common height for filetrees. About 8 lines. Filetree sets default margins,
@@ -73,6 +76,12 @@
 #define FILE_SELECTION_WIDTH_TOTAL 590  /* Width for full filetree (both
                                            content and navigation pane) */
 
+#ifdef DEBUG
+#define DBG(args...) fprintf (stderr, ## args)
+#else
+#define DBG(...) do { } while (0)
+#endif
+
 static void sync_extensions_combo (HildonFileChooserDialogPrivate *priv);
 
 #define HILDON_FILE_CHOOSER_DIALOG_TYPE_SELECTION_MODE (hildon_file_chooser_dialog_selection_mode_get_type())
@@ -361,6 +370,8 @@
   if (name == NULL)
     return;
 
+  DBG ("SET ENTRY %s %s\n", name, ext);
+
   gtk_entry_set_text (GTK_ENTRY(entry), name);
 
   /* Include the extension in the name when it is not recognized.  EXT
@@ -417,14 +428,14 @@
         if (priv->autonaming_enabled) {
             GtkTreeIter iter;
 
-            ULOG_INFO("Trying [%s] [%s]", priv->stub_name, priv->ext_name);
+            DBG ("Trying [%s] [%s]\n", priv->stub_name, priv->ext_name);
             if (hildon_file_selection_get_current_folder_iter
                 (priv->filetree, &iter)) {
                 name =
                     hildon_file_system_model_new_item(priv->model, &iter,
                                                       priv->stub_name,
                                                       priv->ext_name);
-                ULOG_INFO("Got [%s]", name);
+                DBG ("Got [%s]\n", name);
             }
         }
 
@@ -451,6 +462,8 @@
 
         g_signal_handler_unblock(priv->entry_name, priv->changed_handler);
     }
+    else
+      set_entry (priv->entry_name, priv->stub_name, priv->ext_name);
 }
 
 /* Set PRIV->stub_name and PRIV->ext_name from NAME so that stub_name
@@ -739,8 +752,6 @@
     ULOG_INFO("Current name set: body = %s, ext = %s", priv->stub_name, priv->ext_name);
     hildon_file_chooser_dialog_set_limit(HILDON_FILE_CHOOSER_DIALOG(chooser));
     hildon_file_chooser_dialog_do_autonaming(priv);
-
-    set_entry (priv->entry_name, priv->stub_name, priv->ext_name);
 }
 
 static gboolean hildon_file_chooser_dialog_select_path(GtkFileChooser *