[maemo-commits] [maemo-commits] r8481 - projects/haf/branches/hildon-fm/1.x/hildon-fm

[From: www-data at stage.maemo.org]

Author: marivoll
Date: 2006-11-29 20:31:59 +0200 (Wed, 29 Nov 2006)
New Revision: 8481

Modified:
   projects/haf/branches/hildon-fm/1.x/hildon-fm/hildon-file-chooser-dialog.c
Log:
	* hildon-fm/hildon-file-chooser-dialog.c (set_stub_and_ext): Do
	not set entry widget, that was confusing the internal state
	related to autonaming somehow.
	(hildon_file_chooser_dialog_set_current_folder): Terminate
	g_strconcat argument list with NULL, stupid.


Modified: projects/haf/branches/hildon-fm/1.x/hildon-fm/hildon-file-chooser-dialog.c
===================================================================
--- projects/haf/branches/hildon-fm/1.x/hildon-fm/hildon-file-chooser-dialog.c	2006-11-29 17:29:11 UTC (rev 8480)
+++ projects/haf/branches/hildon-fm/1.x/hildon-fm/hildon-file-chooser-dialog.c	2006-11-29 18:31:59 UTC (rev 8481)
@@ -317,7 +317,6 @@
      length when the user hits "Ok".
   */
 
-  ULOG_DEBUG ("Setting maximum length to %d", max_length);
   gtk_entry_set_max_length (GTK_ENTRY (self->priv->entry_name),
 			    self->priv->max_filename_length);
 }
@@ -365,8 +364,6 @@
 
   if (ext && !_hildon_file_system_is_known_extension (ext))
     {
-      fprintf (stderr, "'%s' not known\n", ext);
-
       gint position = strlen (name);
       gtk_editable_insert_text (GTK_EDITABLE (entry),
 				ext, strlen (ext), 
@@ -478,8 +475,6 @@
     priv->ext_name = g_strdup(dot);
     *dot = '\0';
   }
-
-  set_entry (priv->entry_name, priv->stub_name, priv->ext_name);
 }
 
 static void
@@ -529,7 +524,7 @@
             gtk_editable_set_position(GTK_EDITABLE(priv->entry_name), pos);
         }
         else
-          set_entry (priv->entry_name, priv->stub_name, priv->ext_name);
+	  set_entry (priv->entry_name, priv->stub_name, priv->ext_name);
 
         g_signal_handler_unblock(priv->entry_name, priv->changed_handler);
     }
@@ -623,8 +618,7 @@
        situation might have as to whether it is a folder or not.
     */
     if (self->priv->ext_name)
-      name = g_strconcat (self->priv->stub_name,
-			  self->priv->ext_name);
+      name = g_strconcat (self->priv->stub_name, self->priv->ext_name, NULL);
     else
       name = g_strdup (self->priv->stub_name);
 
@@ -650,7 +644,7 @@
 {
     HildonFileChooserDialogPrivate *priv =
         HILDON_FILE_CHOOSER_DIALOG(chooser)->priv;
-
+    
     set_stub_and_ext (priv, name);
 
     /* If we have autonaming enabled, we try to remove possible