filechooser: Also convert get_uris() to returning native paths

[~andy/gtk] / gtk / gtkfilechooserbutton.c

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index eefabc73704d00bb744845765a20d358f83fb7bb..c66769382cffcb792689b9b834ab30be0e3e3a08 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -652,8 +652,6 @@ gtk_file_chooser_button_select_file (GtkFileChooser *chooser,
 
       priv->selection_while_inactive = g_object_ref (file);
 
-      g_signal_emit (button, file_chooser_button_signals[FILE_SET], 0);
-
       return TRUE;
     }
 }
@@ -680,8 +678,6 @@ gtk_file_chooser_button_unselect_file (GtkFileChooser *chooser,
              g_object_unref (priv->selection_while_inactive);
              priv->selection_while_inactive = NULL;
            }
-
-         g_signal_emit (button, file_chooser_button_signals[FILE_SET], 0);
        }
     }
 }
@@ -705,8 +701,6 @@ gtk_file_chooser_button_unselect_all (GtkFileChooser *chooser)
          g_object_unref (priv->selection_while_inactive);
          priv->selection_while_inactive = NULL;
        }
-
-      g_signal_emit (button, file_chooser_button_signals[FILE_SET], 0);
     }
 }
 
@@ -726,10 +720,18 @@ gtk_file_chooser_button_get_files (GtkFileChooser *chooser)
     {
       GSList *result;
 
+      result = NULL;
+
       if (priv->selection_while_inactive)
        result = g_slist_prepend (NULL, g_object_ref (priv->selection_while_inactive));
-      else
-       result = NULL;
+      else if (gtk_file_chooser_get_action (GTK_FILE_CHOOSER (priv->dialog)) == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+       {
+         /* If there is no "real" selection in SELECT_FOLDER mode, then we'll just return
+          * the current folder, since that is what GtkFileChooserDefault would do.
+          */
+         if (priv->current_folder_while_inactive)
+           result = g_slist_prepend (NULL, g_object_ref (priv->current_folder_while_inactive));
+       }
 
       return result;
     }
@@ -2344,13 +2346,13 @@ static void
 update_combo_box (GtkFileChooserButton *button)
 {
   GtkFileChooserButtonPrivate *priv = button->priv;
-  GSList *files;
+  GFile *file;
   GtkTreeIter iter;
   gboolean row_found;
 
   gtk_tree_model_get_iter_first (priv->filter_model, &iter);
 
-  files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (priv->dialog));
+  file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (priv->dialog));
 
   row_found = FALSE;
 
@@ -2373,9 +2375,7 @@ update_combo_box (GtkFileChooserButton *button)
        case ROW_TYPE_SHORTCUT:
        case ROW_TYPE_BOOKMARK:
        case ROW_TYPE_CURRENT_FOLDER:
-         row_found = (files &&
-                      files->data &&
-                      g_file_equal (data, files->data));
+         row_found = (file && g_file_equal (data, file));
          break;
        case ROW_TYPE_VOLUME:
          {
@@ -2384,9 +2384,7 @@ update_combo_box (GtkFileChooserButton *button)
            base_file = _gtk_file_system_volume_get_root (data);
             if (base_file)
               {
-               row_found = (files &&
-                            files->data &&
-                            g_file_equal (base_file, files->data));
+               row_found = (file && g_file_equal (base_file, file));
                g_object_unref (base_file);
               }
          }
@@ -2408,12 +2406,12 @@ update_combo_box (GtkFileChooserButton *button)
   while (!row_found && gtk_tree_model_iter_next (priv->filter_model, &iter));
 
   /* If it hasn't been found already, update & select the current-folder row. */
-  if (!row_found && files && files->data)
+  if (!row_found && file)
     {
       GtkTreeIter filter_iter;
       gint pos;
     
-      model_update_current_folder (button, files->data);
+      model_update_current_folder (button, file);
       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->filter_model));
 
       pos = model_get_type_position (button, ROW_TYPE_CURRENT_FOLDER);
@@ -2427,8 +2425,8 @@ update_combo_box (GtkFileChooserButton *button)
       g_signal_handler_unblock (priv->combo_box, priv->combo_box_changed_id);
     }
 
-  g_slist_foreach (files, (GFunc) g_object_unref, NULL);
-  g_slist_free (files);
+  if (file)
+    g_object_unref (file);
 }
 
 /* Button */
@@ -2474,9 +2472,9 @@ update_label_and_image (GtkFileChooserButton *button)
 {
   GtkFileChooserButtonPrivate *priv = button->priv;
   gchar *label_text;
-  GSList *files;
+  GFile *file;
 
-  files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (priv->dialog));
+  file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (priv->dialog));
   label_text = NULL;
 
   if (priv->update_button_cancellable)
@@ -2485,13 +2483,10 @@ update_label_and_image (GtkFileChooserButton *button)
       priv->update_button_cancellable = NULL;
     }
 
-  if (files && files->data)
+  if (file)
     {
-      GFile *file;
       GtkFileSystemVolume *volume = NULL;
 
-      file = files->data;
-
       volume = _gtk_file_system_get_volume_for_file (priv->fs, file);
       if (volume)
         {
@@ -2541,10 +2536,10 @@ update_label_and_image (GtkFileChooserButton *button)
           if (pixbuf)
             g_object_unref (pixbuf);
         }
+
+      g_object_unref (file);
     }
 out:
-  g_slist_foreach (files, (GFunc) g_object_unref, NULL);
-  g_slist_free (files);
 
   if (label_text)
     {