[maemo-commits] [maemo-commits] r17036 - in projects/haf/branches/hildon-fm/fremantle: . hildon-fm

[From: subversion at stage.maemo.org]

Author: yangli
Date: 2008-12-22 14:33:44 +0200 (Mon, 22 Dec 2008)
New Revision: 17036

Modified:
   projects/haf/branches/hildon-fm/fremantle/ChangeLog
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c
Log:
no showing file type dialog when no extensions input

Modified: projects/haf/branches/hildon-fm/fremantle/ChangeLog
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/ChangeLog	2008-12-19 15:24:03 UTC (rev 17035)
+++ projects/haf/branches/hildon-fm/fremantle/ChangeLog	2008-12-22 12:33:44 UTC (rev 17036)
@@ -1,3 +1,8 @@
+'2008-12-22 Yang Li <yang.li at d\igia.com>
+
+	* hildon-fm/hildon-file-chooser.c:
+	no showing the file type dialog when no extension inputs
+	
 2008-12-19 Mikko Tuhkanen <mikko.tuhkanen at d\igia.com>
 
 	* hildon-fm/hildon-file-chooser-dialog.c:

Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c	2008-12-19 15:24:03 UTC (rev 17035)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c	2008-12-22 12:33:44 UTC (rev 17036)
@@ -725,7 +725,13 @@
         GSList *files = _hildon_file_selection_get_selected_files(
                                       HILDON_FILE_SELECTION(priv->filetree));
 
-        gtk_widget_set_sensitive(priv->action_button, files != NULL);
+	if(files != NULL) {
+	  gtk_widget_set_sensitive(priv->action_button, TRUE);
+	}
+	else {
+	  ULOG_DEBUG("SELECTION NULL");
+	  gtk_widget_set_sensitive(priv->action_button, FALSE);
+	}
         gtk_file_paths_free(files);
     }
 }
@@ -2759,9 +2765,15 @@
         priv->extensions_list = g_list_append (priv->extensions_list, 
 					       extensions[i]);
     }
-  g_signal_connect(G_OBJECT(button), "clicked",
-		   G_CALLBACK(hildon_chooser_dialog_extension_button_clicked), 
-		   self);
+  if (extensions[0]) {
+    g_signal_connect(G_OBJECT(button), "clicked",
+		     G_CALLBACK(hildon_chooser_dialog_extension_button_clicked), 
+		     self);
+  }
+  else {
+    ULOG_DEBUG_F("no type selection available");
+  }
+
   gtk_button_set_alignment(GTK_BUTTON(button), 0, 0.5);
   hildon_button_set_title(HILDON_BUTTON(button), _("sfil_fi_save_object_dialog_type"));
   hildon_button_set_title(HILDON_BUTTON(button), NULL);