[maemo-commits] [maemo-commits] r16557 - projects/haf/branches/hildon-fm/fremantle/hildon-fm

[From: subversion at stage.maemo.org]

Author: yangli
Date: 2008-11-03 16:00:32 +0200 (Mon, 03 Nov 2008)
New Revision: 16557

Modified:
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-mmc.c
Log:
default device name is null is fail to get the device name

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-11-03 13:54:42 UTC (rev 16556)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c	2008-11-03 14:00:32 UTC (rev 16557)
@@ -188,6 +188,9 @@
 static void hildon_response_path_button_clicked(GtkWidget *widget,
 					        gpointer   data);
 
+static void hildon_chooser_dialog_extension_button_clicked(GtkWidget *widget,
+						    gpointer   data);
+
 static void hildon_file_chooser_dialog_iface_init(GtkFileChooserIface *
                                                   iface);
 static GObject *
@@ -2122,7 +2125,7 @@
     } else
         ULOG_INFO("Failed to get current folder iter");  
     if(!g_strcasecmp(gtk_tree_path_str, "0")) {
-      gtk_widget_set_sensitive(priv->up_button, FALSE);
+      gtk_widget_set_sensitive(priv->up_button, TRUE);
     }
     else {
       gtk_widget_set_sensitive(priv->up_button, TRUE);
@@ -2131,7 +2134,7 @@
     while(g_strcasecmp(title, "/")/*!g_strcasecmp(gtk_tree_path_str, "0")*/){
         //free(title);     
 	if(strlen(title) == 0)
-	  list = g_list_append(list, "Nokia"); 
+	  list = g_list_append(list, " "); 
 	else
 	  list = g_list_append(list, title); 
 	cur_iter = iter;
@@ -2146,13 +2149,15 @@
     path_string = g_malloc(MAXPATHLEN);
     memset(path_string, 0, MAXPATHLEN);
     for (list = g_list_last(list); list; list = list->prev) {
-      if(strlen(path_string) == 0)
-	strcpy(path_string, list->data);
-      else {
-	if(strlen(list->data) + strlen(path_string) < MAXPATHLEN)
-	  strcat(path_string, list->data);
-	else
-	  ULOG_INFO("path length exceeds the maximum path length 1024\n");
+      if(strlen(list->data) > 0) {
+	if(strlen(path_string) == 0)
+	  strcpy(path_string, list->data);
+	else {
+	  if(strlen(list->data) + strlen(path_string) < MAXPATHLEN)
+	    strcat(path_string, list->data);
+	  else
+	    ULOG_INFO("path length exceeds the maximum path length 1024\n");
+	}
       }
       strcat(path_string, "/");
     }
@@ -2577,7 +2582,7 @@
 
       /* if there is a valid extension selected, just leave it */
       if (hildon_touch_selector_get_selected (selector, 0, &iter))
-	//if (hildon_touch_selector_get_active_iter (selector, 0, &iter))
+      //if (hildon_touch_selector_get_active_iter (selector, 0, &iter))
         {
 	  gboolean matches;
 	  gchar *ext;
@@ -2643,6 +2648,28 @@
   }
 }
 
+static void hildon_chooser_dialog_extension_button_clicked(GtkWidget *widget,
+							   gpointer   data)
+{
+  GtkDialog *dialog;
+  GtkWidget *selector;
+  gint result;
+  
+  //g_assert(IS_HILDON_TOUCH_SELECTOR (data));
+  selector = HILDON_TOUCH_SELECTOR (data);
+  //dialog = GTK_DIALOG(selector);
+  printf("yang: dialog created\n");
+  result = gtk_dialog_run (GTK_DIALOG (selector));
+  switch (result)
+  {
+     case GTK_RESPONSE_OK:
+     case GTK_RESPONSE_ACCEPT:
+        break;
+     default:
+       break;
+  }
+}
+
 /**
  * hildon_file_chooser_dialog_add_extensions_combo:
  * @self: dialog widget
@@ -2674,8 +2701,10 @@
 
   g_return_val_if_fail (self->priv->extensions_combo == NULL, NULL);
     
-  button = hildon_picker_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, 
-				    HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+  button = hildon_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, 
+		 	     HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+  hildon_button_set_text(HILDON_BUTTON(button), NULL, extensions[0]);
+
   selector = hildon_touch_selector_new_text();
 
   self->priv->extensions_combo = button;
@@ -2685,7 +2714,10 @@
         hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), extensions[i]);
     }
 
-  hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (button), HILDON_TOUCH_SELECTOR (selector));
+  g_signal_connect(G_OBJECT(button), "clicked",
+		   G_CALLBACK(hildon_chooser_dialog_extension_button_clicked), 
+		   selector);
+  hildon_picker_button_set_selector (HILDON_BUTTON (button), HILDON_TOUCH_SELECTOR (selector));
   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);

Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-mmc.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-mmc.c	2008-11-03 13:54:42 UTC (rev 16556)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-mmc.c	2008-11-03 14:00:32 UTC (rev 16557)
@@ -245,7 +245,7 @@
 
     if (was_available != priv->available)
     {
-        g_signal_emit_by_name (HILDON_FILE_SYSTEM_MMC (location),
+      g_signal_emit_by_name (HILDON_FILE_SYSTEM_MMC (location),
                                "connection-state");
     }
 }