* Boston, MA 02111-1307, USA.
*/
-#include <config.h>
+#include "config.h"
#include <sys/types.h>
#include <sys/stat.h>
#include "gtkfilechooserbutton.h"
-#ifdef G_OS_WIN32
-#include "gtkfilesystemwin32.h"
-#endif
-
#include "gtkprivate.h"
#include "gtkalias.h"
TYPE_COLUMN,
DATA_COLUMN,
IS_FOLDER_COLUMN,
- HANDLE_COLUMN,
+ CANCELLABLE_COLUMN,
NUM_COLUMNS
};
GtkTreeModel *model;
GtkTreeModel *filter_model;
- gchar *backend;
GtkFileSystem *fs;
- GtkFilePath *old_path;
+ GFile *old_file;
gulong combo_box_changed_id;
gulong dialog_file_activated_id;
gulong fs_volumes_changed_id;
gulong fs_bookmarks_changed_id;
- GtkFileSystemHandle *dnd_select_folder_handle;
- GtkFileSystemHandle *update_button_handle;
- GSList *change_icon_theme_handles;
+ GCancellable *dnd_select_folder_cancellable;
+ GCancellable *update_button_cancellable;
+ GSList *change_icon_theme_cancellables;
gint icon_size;
guint8 n_volumes;
guint8 n_shortcuts;
guint8 n_bookmarks;
- guint8 has_bookmark_separator : 1;
- guint8 has_current_folder_separator : 1;
- guint8 has_current_folder : 1;
- guint8 has_other_separator : 1;
+ guint has_bookmark_separator : 1;
+ guint has_current_folder_separator : 1;
+ guint has_current_folder : 1;
+ guint has_other_separator : 1;
/* Used for hiding/showing the dialog when the button is hidden */
- guint8 active : 1;
-
- /* Used to remember whether a title has been set yet, so we can use the default if it has not been set. */
- guint8 has_title : 1;
+ guint active : 1;
/* Used to track whether we need to set a default current folder on ::map() */
- guint8 folder_has_been_set : 1;
+ guint folder_has_been_set : 1;
- guint8 focus_on_click : 1;
+ guint focus_on_click : 1;
};
/* GtkFileChooserIface Functions */
static void gtk_file_chooser_button_file_chooser_iface_init (GtkFileChooserIface *iface);
static gboolean gtk_file_chooser_button_add_shortcut_folder (GtkFileChooser *chooser,
- const GtkFilePath *path,
+ GFile *file,
GError **error);
static gboolean gtk_file_chooser_button_remove_shortcut_folder (GtkFileChooser *chooser,
- const GtkFilePath *path,
+ GFile *file,
GError **error);
/* GObject Functions */
/* Utility Functions */
static GtkIconTheme *get_icon_theme (GtkWidget *widget);
-static void set_info_for_path_at_iter (GtkFileChooserButton *fs,
- const GtkFilePath *path,
+static void set_info_for_file_at_iter (GtkFileChooserButton *fs,
+ GFile *file,
GtkTreeIter *iter);
static gint model_get_type_position (GtkFileChooserButton *button,
static void model_add_bookmarks (GtkFileChooserButton *button,
GSList *bookmarks);
static void model_update_current_folder (GtkFileChooserButton *button,
- const GtkFilePath *path);
+ GFile *file);
static void model_remove_rows (GtkFileChooserButton *button,
gint pos,
gint n_rows);
widget_class->style_set = gtk_file_chooser_button_style_set;
widget_class->screen_changed = gtk_file_chooser_button_screen_changed;
widget_class->mnemonic_activate = gtk_file_chooser_button_mnemonic_activate;
-
+
/**
- * GtkFileChooserButtons::file-set:
+ * GtkFileChooserButton::file-set:
* @widget: the object which received the signal.
*
* The ::file-set signal is emitted when the user selects a file.
- *
+ *
* Note that this signal is only emitted when the <emphasis>user</emphasis>
- * changes the file.
+ * changes the file.
*
* Since: 2.12
*/
file_chooser_button_signals[FILE_SET] =
g_signal_new (I_("file-set"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkFileChooserButtonClass, file_set),
NULL, NULL,
_gtk_marshal_VOID__VOID,
G_TYPE_CHAR, /* Row Type */
G_TYPE_POINTER /* Volume || Path */,
G_TYPE_BOOLEAN /* Is Folder? */,
- G_TYPE_POINTER /* handle */));
+ G_TYPE_POINTER /* cancellable */));
priv->combo_box = gtk_combo_box_new ();
priv->combo_box_changed_id =
}
static gboolean
-gtk_file_chooser_button_add_shortcut_folder (GtkFileChooser *chooser,
- const GtkFilePath *path,
- GError **error)
+gtk_file_chooser_button_add_shortcut_folder (GtkFileChooser *chooser,
+ GFile *file,
+ GError **error)
{
GtkFileChooser *delegate;
gboolean retval;
delegate = g_object_get_qdata (G_OBJECT (chooser),
GTK_FILE_CHOOSER_DELEGATE_QUARK);
- retval = _gtk_file_chooser_add_shortcut_folder (delegate, path, error);
+ retval = _gtk_file_chooser_add_shortcut_folder (delegate, file, error);
if (retval)
{
ICON_COLUMN, NULL,
DISPLAY_NAME_COLUMN, _(FALLBACK_DISPLAY_NAME),
TYPE_COLUMN, ROW_TYPE_SHORTCUT,
- DATA_COLUMN, gtk_file_path_copy (path),
+ DATA_COLUMN, g_object_ref (file),
IS_FOLDER_COLUMN, FALSE,
-1);
- set_info_for_path_at_iter (button, path, &iter);
+ set_info_for_file_at_iter (button, file, &iter);
priv->n_shortcuts++;
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->filter_model));
}
static gboolean
-gtk_file_chooser_button_remove_shortcut_folder (GtkFileChooser *chooser,
- const GtkFilePath *path,
- GError **error)
+gtk_file_chooser_button_remove_shortcut_folder (GtkFileChooser *chooser,
+ GFile *file,
+ GError **error)
{
GtkFileChooser *delegate;
gboolean retval;
delegate = g_object_get_qdata (G_OBJECT (chooser),
GTK_FILE_CHOOSER_DELEGATE_QUARK);
- retval = _gtk_file_chooser_remove_shortcut_folder (delegate, path, error);
+ retval = _gtk_file_chooser_remove_shortcut_folder (delegate, file, error);
if (retval)
{
-1);
if (type == ROW_TYPE_SHORTCUT &&
- data &&
- gtk_file_path_compare (data, path) == 0)
+ data && g_file_equal (data, file))
{
model_free_row_data (GTK_FILE_CHOOSER_BUTTON (chooser), &iter);
gtk_list_store_remove (GTK_LIST_STORE (priv->model), &iter);
GSList *list;
char *current_folder;
- object = (*G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->constructor) (type,
- n_params,
- params);
+ object = G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->constructor (type,
+ n_params,
+ params);
button = GTK_FILE_CHOOSER_BUTTON (object);
priv = button->priv;
if (!priv->dialog)
{
- if (priv->backend)
- priv->dialog = gtk_file_chooser_dialog_new_with_backend (NULL, NULL,
- GTK_FILE_CHOOSER_ACTION_OPEN,
- priv->backend,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN,
- GTK_RESPONSE_ACCEPT,
- NULL);
- else
- priv->dialog = gtk_file_chooser_dialog_new (NULL, NULL,
- GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN,
- GTK_RESPONSE_ACCEPT,
- NULL);
+ priv->dialog = gtk_file_chooser_dialog_new (NULL, NULL,
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN,
+ GTK_RESPONSE_ACCEPT,
+ NULL);
gtk_dialog_set_default_response (GTK_DIALOG (priv->dialog),
GTK_RESPONSE_ACCEPT);
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_CANCEL,
-1);
- }
- /* Set the default title if necessary. We must wait until the dialog has been created to do this. */
- if (!priv->has_title)
- gtk_file_chooser_button_set_title (button, _(DEFAULT_TITLE));
+ gtk_file_chooser_button_set_title (button, _(DEFAULT_TITLE));
+ }
+ else if (!GTK_WINDOW (priv->dialog)->title)
+ {
+ gtk_file_chooser_button_set_title (button, _(DEFAULT_TITLE));
+ }
current_folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (priv->dialog));
if (current_folder != NULL)
g_free (current_folder);
}
- g_free (priv->backend);
- priv->backend = NULL;
-
- g_signal_connect (priv->dialog, "delete_event",
+ g_signal_connect (priv->dialog, "delete-event",
G_CALLBACK (dialog_delete_event_cb), object);
g_signal_connect (priv->dialog, "response",
G_CALLBACK (dialog_response_cb), object);
g_signal_connect (priv->dialog, "notify",
G_CALLBACK (dialog_notify_cb), object);
g_object_add_weak_pointer (G_OBJECT (priv->dialog),
- (gpointer *) (&priv->dialog));
+ (gpointer) (&priv->dialog));
priv->fs =
g_object_ref (_gtk_file_chooser_get_file_system (GTK_FILE_CHOOSER (priv->dialog)));
model_add_special (button);
- list = gtk_file_system_list_volumes (priv->fs);
+ list = _gtk_file_system_list_volumes (priv->fs);
model_add_volumes (button, list);
g_slist_free (list);
- list = gtk_file_system_list_bookmarks (priv->fs);
+ list = _gtk_file_system_list_bookmarks (priv->fs);
model_add_bookmarks (button, list);
- gtk_file_paths_free (list);
+ g_slist_foreach (list, (GFunc) g_object_unref, NULL);
+ g_slist_free (list);
model_add_other (button);
break;
case PROP_TITLE:
- /* Remember that a title has been set, so we do no try to set it to the default in _init(). */
- priv->has_title = TRUE;
- /* Intentionally fall through instead of breaking here, to actually set the property. */
case GTK_FILE_CHOOSER_PROP_FILTER:
case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET:
case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE:
case GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET:
case GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN:
case GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION:
+ case GTK_FILE_CHOOSER_PROP_CREATE_FOLDERS:
g_object_set_property (G_OBJECT (priv->dialog), pspec->name, value);
break;
break;
case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
- /* Construct-only */
- priv->backend = g_value_dup_string (value);
+ /* Ignore property */
break;
case GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE:
case GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE:
case GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN:
case GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION:
+ case GTK_FILE_CHOOSER_PROP_CREATE_FOLDERS:
g_object_get_property (G_OBJECT (priv->dialog), pspec->name, value);
break;
GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (object);
GtkFileChooserButtonPrivate *priv = button->priv;
- if (priv->old_path)
- gtk_file_path_free (priv->old_path);
+ if (priv->old_file)
+ g_object_unref (priv->old_file);
- if (G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->finalize != NULL)
- (*G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->finalize) (object);
+ G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->finalize (object);
}
/* ********************* *
}
while (gtk_tree_model_iter_next (priv->model, &iter));
- if (priv->dnd_select_folder_handle)
+ if (priv->dnd_select_folder_cancellable)
{
- gtk_file_system_cancel_operation (priv->dnd_select_folder_handle);
- priv->dnd_select_folder_handle = NULL;
+ g_cancellable_cancel (priv->dnd_select_folder_cancellable);
+ priv->dnd_select_folder_cancellable = NULL;
}
- if (priv->update_button_handle)
+ if (priv->update_button_cancellable)
{
- gtk_file_system_cancel_operation (priv->update_button_handle);
- priv->update_button_handle = NULL;
+ g_cancellable_cancel (priv->update_button_cancellable);
+ priv->update_button_cancellable = NULL;
}
- if (priv->change_icon_theme_handles)
+ if (priv->change_icon_theme_cancellables)
{
- for (l = priv->change_icon_theme_handles; l; l = l->next)
+ for (l = priv->change_icon_theme_cancellables; l; l = l->next)
{
- GtkFileSystemHandle *handle = GTK_FILE_SYSTEM_HANDLE (l->data);
- gtk_file_system_cancel_operation (handle);
+ GCancellable *cancellable = G_CANCELLABLE (l->data);
+ g_cancellable_cancel (cancellable);
}
- g_slist_free (priv->change_icon_theme_handles);
- priv->change_icon_theme_handles = NULL;
+ g_slist_free (priv->change_icon_theme_cancellables);
+ priv->change_icon_theme_cancellables = NULL;
}
if (priv->model)
priv->fs = NULL;
}
- if (GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy != NULL)
- (*GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy) (object);
+ GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy (object);
}
struct DndSelectFolderData
{
+ GtkFileSystem *file_system;
GtkFileChooserButton *button;
GtkFileChooserAction action;
- GtkFilePath *path;
+ GFile *file;
gchar **uris;
guint i;
gboolean selected;
};
static void
-dnd_select_folder_get_info_cb (GtkFileSystemHandle *handle,
- const GtkFileInfo *info,
- const GError *error,
- gpointer user_data)
+dnd_select_folder_get_info_cb (GCancellable *cancellable,
+ GFileInfo *info,
+ const GError *error,
+ gpointer user_data)
{
- gboolean cancelled = handle->cancelled;
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
struct DndSelectFolderData *data = user_data;
- if (handle != data->button->priv->dnd_select_folder_handle)
+ if (cancellable != data->button->priv->dnd_select_folder_cancellable)
{
g_object_unref (data->button);
- gtk_file_path_free (data->path);
+ g_object_unref (data->file);
g_strfreev (data->uris);
g_free (data);
- g_object_unref (handle);
+ g_object_unref (cancellable);
return;
}
- data->button->priv->dnd_select_folder_handle = NULL;
+ data->button->priv->dnd_select_folder_cancellable = NULL;
if (!cancelled && !error && info != NULL)
{
- data->selected =
- (((data->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER &&
- gtk_file_info_get_is_folder (info)) ||
- (data->action == GTK_FILE_CHOOSER_ACTION_OPEN &&
- !gtk_file_info_get_is_folder (info))) &&
- _gtk_file_chooser_select_path (GTK_FILE_CHOOSER (data->button->priv->dialog),
- data->path, NULL));
+ gboolean is_folder;
+
+ is_folder = _gtk_file_info_consider_as_directory (info);
+
+ data->selected =
+ (((data->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER && is_folder) ||
+ (data->action == GTK_FILE_CHOOSER_ACTION_OPEN && !is_folder)) &&
+ gtk_file_chooser_select_file (GTK_FILE_CHOOSER (data->button->priv->dialog),
+ data->file, NULL));
}
else
data->selected = FALSE;
if (data->selected || data->uris[++data->i] == NULL)
{
+ g_signal_emit (data->button, file_chooser_button_signals[FILE_SET], 0);
+
g_object_unref (data->button);
- gtk_file_path_free (data->path);
+ g_object_unref (data->file);
g_strfreev (data->uris);
g_free (data);
- g_object_unref (handle);
+ g_object_unref (cancellable);
return;
}
- if (data->path)
- gtk_file_path_free (data->path);
+ if (data->file)
+ g_object_unref (data->file);
- data->path = gtk_file_system_uri_to_path (handle->file_system,
- data->uris[data->i]);
+ data->file = g_file_new_for_uri (data->uris[data->i]);
- data->button->priv->dnd_select_folder_handle =
- gtk_file_system_get_info (handle->file_system, data->path,
- GTK_FILE_INFO_IS_FOLDER,
- dnd_select_folder_get_info_cb, user_data);
+ data->button->priv->dnd_select_folder_cancellable =
+ _gtk_file_system_get_info (data->file_system, data->file,
+ "standard::type",
+ dnd_select_folder_get_info_cb, user_data);
- g_object_unref (handle);
+ g_object_unref (cancellable);
}
static void
{
GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (widget);
GtkFileChooserButtonPrivate *priv = button->priv;
- GtkFilePath *path;
+ GFile *file;
gchar *text;
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received != NULL)
- (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received) (widget,
- context,
- x, y,
- data, type,
- drag_time);
+ GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received (widget,
+ context,
+ x, y,
+ data, type,
+ drag_time);
if (widget == NULL || context == NULL || data == NULL || data->length < 0)
return;
info->i = 0;
info->uris = uris;
info->selected = FALSE;
+ info->file_system = priv->fs;
g_object_get (priv->dialog, "action", &info->action, NULL);
- info->path = gtk_file_system_uri_to_path (priv->fs,
- info->uris[info->i]);
+ info->file = g_file_new_for_uri (info->uris[info->i]);
- if (priv->dnd_select_folder_handle)
- gtk_file_system_cancel_operation (priv->dnd_select_folder_handle);
+ if (priv->dnd_select_folder_cancellable)
+ g_cancellable_cancel (priv->dnd_select_folder_cancellable);
- priv->dnd_select_folder_handle =
- gtk_file_system_get_info (priv->fs, info->path,
- GTK_FILE_INFO_IS_FOLDER,
- dnd_select_folder_get_info_cb, info);
+ priv->dnd_select_folder_cancellable =
+ _gtk_file_system_get_info (priv->fs, info->file,
+ "standard::type",
+ dnd_select_folder_get_info_cb, info);
}
break;
case TEXT_PLAIN:
text = (char*) gtk_selection_data_get_text (data);
- path = gtk_file_path_new_steal (text);
- _gtk_file_chooser_select_path (GTK_FILE_CHOOSER (priv->dialog), path,
- NULL);
- gtk_file_path_free (path);
+ file = g_file_new_for_uri (text);
+ gtk_file_chooser_select_file (GTK_FILE_CHOOSER (priv->dialog), file,
+ NULL);
+ g_object_unref (file);
+ g_free (text);
+ g_signal_emit (button, file_chooser_button_signals[FILE_SET], 0);
break;
default:
GtkFileChooserButtonPrivate *priv = button->priv;
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->show)
- (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->show) (widget);
+ GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->show (widget);
if (priv->active)
open_dialog (GTK_FILE_CHOOSER_BUTTON (widget));
gtk_widget_hide (priv->dialog);
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->hide)
- (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->hide) (widget);
+ GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->hide (widget);
}
static void
priv->folder_has_been_set = TRUE;
}
- if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map)
- (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map) (widget);
+ GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map (widget);
}
static gboolean
};
static void
-change_icon_theme_get_info_cb (GtkFileSystemHandle *handle,
- const GtkFileInfo *info,
- const GError *error,
- gpointer user_data)
+change_icon_theme_get_info_cb (GCancellable *cancellable,
+ GFileInfo *info,
+ const GError *error,
+ gpointer user_data)
{
- gboolean cancelled = handle->cancelled;
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
GdkPixbuf *pixbuf;
struct ChangeIconThemeData *data = user_data;
- if (!g_slist_find (data->button->priv->change_icon_theme_handles, handle))
+ if (!g_slist_find (data->button->priv->change_icon_theme_cancellables, cancellable))
goto out;
- data->button->priv->change_icon_theme_handles =
- g_slist_remove (data->button->priv->change_icon_theme_handles, handle);
+ data->button->priv->change_icon_theme_cancellables =
+ g_slist_remove (data->button->priv->change_icon_theme_cancellables, cancellable);
if (cancelled || error)
goto out;
- pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->button),
- data->button->priv->icon_size, NULL);
+ pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->button), data->button->priv->icon_size);
if (pixbuf)
{
gtk_tree_row_reference_free (data->row_ref);
g_free (data);
- g_object_unref (handle);
+ g_object_unref (cancellable);
}
static void
GSList *l;
gint width = 0, height = 0;
- for (l = button->priv->change_icon_theme_handles; l; l = l->next)
+ for (l = button->priv->change_icon_theme_cancellables; l; l = l->next)
{
- GtkFileSystemHandle *handle = GTK_FILE_SYSTEM_HANDLE (l->data);
- gtk_file_system_cancel_operation (handle);
+ GCancellable *cancellable = G_CANCELLABLE (l->data);
+ g_cancellable_cancel (cancellable);
}
- g_slist_free (button->priv->change_icon_theme_handles);
- button->priv->change_icon_theme_handles = NULL;
+ g_slist_free (button->priv->change_icon_theme_cancellables);
+ button->priv->change_icon_theme_cancellables = NULL;
settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
case ROW_TYPE_CURRENT_FOLDER:
if (data)
{
- if (gtk_file_system_path_is_local (priv->fs, (GtkFilePath *)data))
+ if (g_file_is_native (G_FILE (data)))
{
GtkTreePath *path;
- GtkFileSystemHandle *handle;
+ GCancellable *cancellable;
struct ChangeIconThemeData *info;
info = g_new0 (struct ChangeIconThemeData, 1);
path = gtk_tree_model_get_path (priv->model, &iter);
info->row_ref = gtk_tree_row_reference_new (priv->model, path);
gtk_tree_path_free (path);
-
- handle =
- gtk_file_system_get_info (priv->fs, data, GTK_FILE_INFO_ICON,
- change_icon_theme_get_info_cb,
- info);
- button->priv->change_icon_theme_handles =
- g_slist_append (button->priv->change_icon_theme_handles, handle);
+
+ cancellable =
+ _gtk_file_system_get_info (priv->fs, data,
+ "standard::icon",
+ change_icon_theme_get_info_cb,
+ info);
+ button->priv->change_icon_theme_cancellables =
+ g_slist_append (button->priv->change_icon_theme_cancellables, cancellable);
pixbuf = NULL;
}
else
* If we switch to a better bookmarks file format (XBEL), we
* should use mime info to get a better icon.
*/
- pixbuf = gtk_icon_theme_load_icon (theme, "gnome-fs-share",
+ pixbuf = gtk_icon_theme_load_icon (theme, "folder-remote",
priv->icon_size, 0, NULL);
}
else
break;
case ROW_TYPE_VOLUME:
if (data)
- pixbuf = gtk_file_system_volume_render_icon (priv->fs, data,
- GTK_WIDGET (button),
- priv->icon_size,
- NULL);
+ pixbuf = _gtk_file_system_volume_render_icon (data,
+ GTK_WIDGET (button),
+ priv->icon_size,
+ NULL);
else
pixbuf = gtk_icon_theme_load_icon (theme, FALLBACK_ICON_NAME,
priv->icon_size, 0, NULL);
gtk_file_chooser_button_style_set (GtkWidget *widget,
GtkStyle *old_style)
{
- if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set)
- (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set) (widget,
- old_style);
+ GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set (widget,
+ old_style);
if (gtk_widget_has_screen (widget))
change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget));
GdkScreen *old_screen)
{
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->screen_changed)
- (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->screen_changed) (widget,
- old_screen);
+ GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->screen_changed (widget,
+ old_screen);
- change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget));
+ change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget));
}
};
static void
-set_info_get_info_cb (GtkFileSystemHandle *handle,
- const GtkFileInfo *info,
- const GError *error,
- gpointer callback_data)
+set_info_get_info_cb (GCancellable *cancellable,
+ GFileInfo *info,
+ const GError *error,
+ gpointer callback_data)
{
- gboolean cancelled = handle->cancelled;
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
GdkPixbuf *pixbuf;
GtkTreePath *path;
GtkTreeIter iter;
- GtkFileSystemHandle *model_handle;
+ GCancellable *model_cancellable;
struct SetDisplayNameData *data = callback_data;
+ gboolean is_folder;
if (!data->button->priv->model)
/* button got destroyed */
path = gtk_tree_row_reference_get_path (data->row_ref);
if (!path)
- /* Handle doesn't exist anymore in the model */
+ /* Cancellable doesn't exist anymore in the model */
goto out;
gtk_tree_model_get_iter (data->button->priv->model, &iter, path);
gtk_tree_path_free (path);
- /* Validate the handle */
+ /* Validate the cancellable */
gtk_tree_model_get (data->button->priv->model, &iter,
- HANDLE_COLUMN, &model_handle,
+ CANCELLABLE_COLUMN, &model_cancellable,
-1);
- if (handle != model_handle)
+ if (cancellable != model_cancellable)
goto out;
gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
- HANDLE_COLUMN, NULL,
+ CANCELLABLE_COLUMN, NULL,
-1);
if (cancelled || error)
/* There was an error, leave the fallback name in there */
goto out;
- pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->button),
- data->button->priv->icon_size, NULL);
+ pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->button), data->button->priv->icon_size);
if (!data->label)
- data->label = g_strdup (gtk_file_info_get_display_name (info));
+ data->label = g_strdup (g_file_info_get_display_name (info));
+
+ is_folder = _gtk_file_info_consider_as_directory (info);
gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
ICON_COLUMN, pixbuf,
DISPLAY_NAME_COLUMN, data->label,
- IS_FOLDER_COLUMN, gtk_file_info_get_is_folder (info),
+ IS_FOLDER_COLUMN, is_folder,
-1);
if (pixbuf)
gtk_tree_row_reference_free (data->row_ref);
g_free (data);
- g_object_unref (handle);
+ g_object_unref (cancellable);
}
static void
-set_info_for_path_at_iter (GtkFileChooserButton *button,
- const GtkFilePath *path,
+set_info_for_file_at_iter (GtkFileChooserButton *button,
+ GFile *file,
GtkTreeIter *iter)
{
struct SetDisplayNameData *data;
GtkTreePath *tree_path;
- GtkFileSystemHandle *handle;
+ GCancellable *cancellable;
data = g_new0 (struct SetDisplayNameData, 1);
data->button = g_object_ref (button);
- data->label = gtk_file_system_get_bookmark_label (button->priv->fs, path);
+ data->label = _gtk_file_system_get_bookmark_label (button->priv->fs, file);
tree_path = gtk_tree_model_get_path (button->priv->model, iter);
data->row_ref = gtk_tree_row_reference_new (button->priv->model, tree_path);
gtk_tree_path_free (tree_path);
- handle = gtk_file_system_get_info (button->priv->fs, path,
- GTK_FILE_INFO_DISPLAY_NAME | GTK_FILE_INFO_IS_FOLDER | GTK_FILE_INFO_ICON,
- set_info_get_info_cb, data);
+ cancellable = _gtk_file_system_get_info (button->priv->fs, file,
+ "standard::type,standard::icon,standard::display-name",
+ set_info_get_info_cb, data);
gtk_list_store_set (GTK_LIST_STORE (button->priv->model), iter,
- HANDLE_COLUMN, handle,
+ CANCELLABLE_COLUMN, cancellable,
-1);
}
{
gchar type;
gpointer data;
- GtkFileSystemHandle *handle;
+ GCancellable *cancellable;
gtk_tree_model_get (button->priv->model, iter,
TYPE_COLUMN, &type,
DATA_COLUMN, &data,
- HANDLE_COLUMN, &handle,
+ CANCELLABLE_COLUMN, &cancellable,
-1);
- if (handle)
- gtk_file_system_cancel_operation (handle);
+ if (cancellable)
+ g_cancellable_cancel (cancellable);
switch (type)
{
case ROW_TYPE_SHORTCUT:
case ROW_TYPE_BOOKMARK:
case ROW_TYPE_CURRENT_FOLDER:
- gtk_file_path_free (data);
+ g_object_unref (data);
break;
case ROW_TYPE_VOLUME:
- gtk_file_system_volume_free (button->priv->fs, data);
+ _gtk_file_system_volume_free (data);
break;
default:
break;
}
static void
-model_add_special_get_info_cb (GtkFileSystemHandle *handle,
- const GtkFileInfo *info,
- const GError *error,
- gpointer user_data)
+model_add_special_get_info_cb (GCancellable *cancellable,
+ GFileInfo *info,
+ const GError *error,
+ gpointer user_data)
{
- gboolean cancelled = handle->cancelled;
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
GtkTreeIter iter;
GtkTreePath *path;
GdkPixbuf *pixbuf;
- GtkFileSystemHandle *model_handle;
+ GCancellable *model_cancellable;
struct ChangeIconThemeData *data = user_data;
- const gchar *name;
+ gchar *name;
if (!data->button->priv->model)
/* button got destroyed */
path = gtk_tree_row_reference_get_path (data->row_ref);
if (!path)
- /* Handle doesn't exist anymore in the model */
+ /* Cancellable doesn't exist anymore in the model */
goto out;
gtk_tree_model_get_iter (data->button->priv->model, &iter, path);
gtk_tree_path_free (path);
gtk_tree_model_get (data->button->priv->model, &iter,
- HANDLE_COLUMN, &model_handle,
+ CANCELLABLE_COLUMN, &model_cancellable,
-1);
- if (handle != model_handle)
+ if (cancellable != model_cancellable)
goto out;
gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
- HANDLE_COLUMN, NULL,
+ CANCELLABLE_COLUMN, NULL,
-1);
if (cancelled || error)
goto out;
- pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->button),
- data->button->priv->icon_size, NULL);
+ pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->button), data->button->priv->icon_size);
if (pixbuf)
{
-1);
if (!name)
gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
- DISPLAY_NAME_COLUMN, gtk_file_info_get_display_name (info),
+ DISPLAY_NAME_COLUMN, g_file_info_get_display_name (info),
-1);
-
+ g_free (name);
+
out:
g_object_unref (data->button);
gtk_tree_row_reference_free (data->row_ref);
g_free (data);
- g_object_unref (handle);
+ g_object_unref (cancellable);
}
static inline void
model_add_special (GtkFileChooserButton *button)
{
const gchar *homedir;
- gchar *desktopdir = NULL;
+ const gchar *desktopdir;
GtkListStore *store;
GtkTreeIter iter;
- GtkFilePath *path;
+ GFile *file;
gint pos;
store = GTK_LIST_STORE (button->priv->model);
if (homedir)
{
GtkTreePath *tree_path;
- GtkFileSystemHandle *handle;
+ GCancellable *cancellable;
struct ChangeIconThemeData *info;
- path = gtk_file_system_filename_to_path (button->priv->fs, homedir);
+ file = g_file_new_for_path (homedir);
gtk_list_store_insert (store, &iter, pos);
pos++;
tree_path);
gtk_tree_path_free (tree_path);
- handle = gtk_file_system_get_info (button->priv->fs, path,
- GTK_FILE_INFO_DISPLAY_NAME | GTK_FILE_INFO_ICON,
- model_add_special_get_info_cb, info);
+ cancellable = _gtk_file_system_get_info (button->priv->fs, file,
+ "standard::icon,standard::display-name",
+ model_add_special_get_info_cb, info);
gtk_list_store_set (store, &iter,
ICON_COLUMN, NULL,
DISPLAY_NAME_COLUMN, NULL,
TYPE_COLUMN, ROW_TYPE_SPECIAL,
- DATA_COLUMN, path,
+ DATA_COLUMN, file,
IS_FOLDER_COLUMN, TRUE,
- HANDLE_COLUMN, handle,
+ CANCELLABLE_COLUMN, cancellable,
-1);
button->priv->n_special++;
if (desktopdir)
{
GtkTreePath *tree_path;
- GtkFileSystemHandle *handle;
+ GCancellable *cancellable;
struct ChangeIconThemeData *info;
- path = gtk_file_system_filename_to_path (button->priv->fs, desktopdir);
+ file = g_file_new_for_path (desktopdir);
gtk_list_store_insert (store, &iter, pos);
pos++;
tree_path);
gtk_tree_path_free (tree_path);
- handle = gtk_file_system_get_info (button->priv->fs, path,
- GTK_FILE_INFO_DISPLAY_NAME | GTK_FILE_INFO_ICON,
- model_add_special_get_info_cb, info);
+ cancellable = _gtk_file_system_get_info (button->priv->fs, file,
+ "standard::icon,standard::display-name",
+ model_add_special_get_info_cb, info);
gtk_list_store_set (store, &iter,
TYPE_COLUMN, ROW_TYPE_SPECIAL,
ICON_COLUMN, NULL,
DISPLAY_NAME_COLUMN, _(DESKTOP_DISPLAY_NAME),
- DATA_COLUMN, path,
+ DATA_COLUMN, file,
IS_FOLDER_COLUMN, TRUE,
- HANDLE_COLUMN, handle,
+ CANCELLABLE_COLUMN, cancellable,
-1);
button->priv->n_special++;
if (local_only)
{
- if (gtk_file_system_volume_get_is_mounted (file_system, volume))
+ if (_gtk_file_system_volume_is_mounted (volume))
{
- GtkFilePath *base_path;
+ GFile *base_file;
- base_path = gtk_file_system_volume_get_base_path (file_system, volume);
- if (base_path != NULL)
+ base_file = _gtk_file_system_volume_get_root (volume);
+ if (base_file != NULL && !g_file_is_native (base_file))
{
- gboolean is_local = gtk_file_system_path_is_local (file_system, base_path);
- gtk_file_path_free (base_path);
-
- if (!is_local)
- {
- gtk_file_system_volume_free (file_system, volume);
- continue;
- }
+ _gtk_file_system_volume_free (volume);
+ continue;
}
}
}
- pixbuf = gtk_file_system_volume_render_icon (file_system,
- volume,
- GTK_WIDGET (button),
- button->priv->icon_size,
- NULL);
- display_name = gtk_file_system_volume_get_display_name (file_system, volume);
+ pixbuf = _gtk_file_system_volume_render_icon (volume,
+ GTK_WIDGET (button),
+ button->priv->icon_size,
+ NULL);
+ display_name = _gtk_file_system_volume_get_display_name (volume);
gtk_list_store_insert (store, &iter, pos);
gtk_list_store_set (store, &iter,
}
}
-extern gchar * _gtk_file_chooser_label_for_uri (const gchar *uri);
+extern gchar * _gtk_file_chooser_label_for_file (GFile *file);
static void
model_add_bookmarks (GtkFileChooserButton *button,
for (l = bookmarks; l; l = l->next)
{
- GtkFilePath *path;
+ GFile *file;
- path = l->data;
+ file = l->data;
- if (gtk_file_system_path_is_local (button->priv->fs, path))
+ if (g_file_is_native (file))
{
gtk_list_store_insert (store, &iter, pos);
gtk_list_store_set (store, &iter,
ICON_COLUMN, NULL,
DISPLAY_NAME_COLUMN, _(FALLBACK_DISPLAY_NAME),
TYPE_COLUMN, ROW_TYPE_BOOKMARK,
- DATA_COLUMN, gtk_file_path_copy (path),
+ DATA_COLUMN, g_object_ref (file),
IS_FOLDER_COLUMN, FALSE,
-1);
- set_info_for_path_at_iter (button, path, &iter);
+ set_info_for_file_at_iter (button, file, &iter);
}
else
{
* If we switch to a better bookmarks file format (XBEL), we
* should use mime info to get a better icon.
*/
- label = gtk_file_system_get_bookmark_label (button->priv->fs, path);
+ label = _gtk_file_system_get_bookmark_label (button->priv->fs, file);
if (!label)
- {
- gchar *uri;
-
- uri = gtk_file_system_path_to_uri (button->priv->fs, path);
- label = _gtk_file_chooser_label_for_uri (uri);
- g_free (uri);
- }
+ label = _gtk_file_chooser_label_for_file (file);
icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
- pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share",
+ pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder-remote",
button->priv->icon_size, 0, NULL);
gtk_list_store_insert (store, &iter, pos);
ICON_COLUMN, pixbuf,
DISPLAY_NAME_COLUMN, label,
TYPE_COLUMN, ROW_TYPE_BOOKMARK,
- DATA_COLUMN, gtk_file_path_copy (path),
+ DATA_COLUMN, g_object_ref (file),
IS_FOLDER_COLUMN, TRUE,
-1);
static void
model_update_current_folder (GtkFileChooserButton *button,
- const GtkFilePath *path)
+ GFile *file)
{
GtkListStore *store;
GtkTreeIter iter;
gint pos;
- if (!path)
+ if (!file)
return;
store = GTK_LIST_STORE (button->priv->model);
model_free_row_data (button, &iter);
}
- if (gtk_file_system_path_is_local (button->priv->fs, path))
+ if (g_file_is_native (file))
{
gtk_list_store_set (store, &iter,
ICON_COLUMN, NULL,
DISPLAY_NAME_COLUMN, _(FALLBACK_DISPLAY_NAME),
TYPE_COLUMN, ROW_TYPE_CURRENT_FOLDER,
- DATA_COLUMN, gtk_file_path_copy (path),
+ DATA_COLUMN, g_object_ref (file),
IS_FOLDER_COLUMN, FALSE,
-1);
- set_info_for_path_at_iter (button, path, &iter);
+ set_info_for_file_at_iter (button, file, &iter);
}
else
{
* If we switch to a better bookmarks file format (XBEL), we
* should use mime info to get a better icon.
*/
- label = gtk_file_system_get_bookmark_label (button->priv->fs, path);
+ label = _gtk_file_system_get_bookmark_label (button->priv->fs, file);
if (!label)
- {
- gchar *uri;
-
- uri = gtk_file_system_path_to_uri (button->priv->fs, path);
- label = _gtk_file_chooser_label_for_uri (uri);
- g_free (uri);
- }
-
+ label = _gtk_file_chooser_label_for_file (file);
+
icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
- if (gtk_file_system_path_is_local (button->priv->fs, path))
- {
- pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory",
+
+ if (g_file_is_native (file))
+ pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder",
button->priv->icon_size, 0, NULL);
- }
else
- {
- pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share",
+ pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder-remote",
button->priv->icon_size, 0, NULL);
- }
-
+
gtk_list_store_set (store, &iter,
ICON_COLUMN, pixbuf,
DISPLAY_NAME_COLUMN, label,
TYPE_COLUMN, ROW_TYPE_CURRENT_FOLDER,
- DATA_COLUMN, gtk_file_path_copy (path),
+ DATA_COLUMN, g_object_ref (file),
IS_FOLDER_COLUMN, TRUE,
-1);
-
+
g_free (label);
g_object_unref (pixbuf);
}
/* Filter Model */
static inline gboolean
-test_if_path_is_visible (GtkFileSystem *fs,
- const GtkFilePath *path,
- gboolean local_only,
- gboolean is_folder)
+test_if_file_is_visible (GtkFileSystem *fs,
+ GFile *file,
+ gboolean local_only,
+ gboolean is_folder)
{
- if (!path)
+ if (!file)
return FALSE;
- if (local_only && !gtk_file_system_path_is_local (fs, path))
+ if (local_only && !g_file_is_native (file))
return FALSE;
if (!is_folder)
case ROW_TYPE_SPECIAL:
case ROW_TYPE_SHORTCUT:
case ROW_TYPE_BOOKMARK:
- retval = test_if_path_is_visible (priv->fs, data, local_only, is_folder);
+ retval = test_if_file_is_visible (priv->fs, data, local_only, is_folder);
break;
case ROW_TYPE_VOLUME:
{
retval = TRUE;
if (local_only)
{
- if (gtk_file_system_volume_get_is_mounted (priv->fs, data))
+ if (_gtk_file_system_volume_is_mounted (data))
{
- GtkFilePath *base_path;
-
- base_path = gtk_file_system_volume_get_base_path (priv->fs, data);
- if (base_path)
- {
- gboolean is_local = gtk_file_system_path_is_local (priv->fs, base_path);
-
- gtk_file_path_free (base_path);
+ GFile *base_file;
+
+ base_file = _gtk_file_system_volume_get_root (data);
- if (!is_local)
+ if (base_file)
+ {
+ if (!g_file_is_native (base_file))
retval = FALSE;
+ g_object_unref (base_file);
}
else
retval = FALSE;
update_combo_box (GtkFileChooserButton *button)
{
GtkFileChooserButtonPrivate *priv = button->priv;
- GSList *paths;
+ GSList *files;
GtkTreeIter iter;
gboolean row_found;
gtk_tree_model_get_iter_first (priv->filter_model, &iter);
- paths = _gtk_file_chooser_get_paths (GTK_FILE_CHOOSER (priv->dialog));
+ files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (priv->dialog));
row_found = FALSE;
case ROW_TYPE_SHORTCUT:
case ROW_TYPE_BOOKMARK:
case ROW_TYPE_CURRENT_FOLDER:
- row_found = (paths &&
- paths->data &&
- gtk_file_path_compare (data, paths->data) == 0);
+ row_found = (files &&
+ files->data &&
+ g_file_equal (data, files->data));
break;
case ROW_TYPE_VOLUME:
{
- GtkFilePath *base_path;
+ GFile *base_file;
- base_path = gtk_file_system_volume_get_base_path (priv->fs, data);
- if (base_path)
+ base_file = _gtk_file_system_volume_get_root (data);
+ if (base_file)
{
- row_found = (paths &&
- paths->data &&
- gtk_file_path_compare (base_path, paths->data) == 0);
- gtk_file_path_free (base_path);
+ row_found = (files &&
+ files->data &&
+ g_file_equal (base_file, files->data));
+ g_object_unref (base_file);
}
}
break;
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 && paths && paths->data)
+ if (!row_found && files && files->data)
{
GtkTreeIter filter_iter;
gint pos;
- model_update_current_folder (button, paths->data);
+ model_update_current_folder (button, files->data);
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->filter_model));
pos = model_get_type_position (button, ROW_TYPE_CURRENT_FOLDER);
g_signal_handler_unblock (priv->combo_box, priv->combo_box_changed_id);
}
- gtk_file_paths_free (paths);
+ g_slist_foreach (files, (GFunc) g_object_unref, NULL);
+ g_slist_free (files);
}
/* Button */
static void
-update_label_get_info_cb (GtkFileSystemHandle *handle,
- const GtkFileInfo *info,
- const GError *error,
- gpointer data)
+update_label_get_info_cb (GCancellable *cancellable,
+ GFileInfo *info,
+ const GError *error,
+ gpointer data)
{
- gboolean cancelled = handle->cancelled;
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
GdkPixbuf *pixbuf;
GtkFileChooserButton *button = data;
GtkFileChooserButtonPrivate *priv = button->priv;
- if (handle != priv->update_button_handle)
+ if (cancellable != priv->update_button_cancellable)
goto out;
- priv->update_button_handle = NULL;
+ priv->update_button_cancellable = NULL;
if (cancelled || error)
goto out;
- gtk_label_set_text (GTK_LABEL (priv->label), gtk_file_info_get_display_name (info));
+ gtk_label_set_text (GTK_LABEL (priv->label), g_file_info_get_display_name (info));
+
+ pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (priv->image), priv->icon_size);
- pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (priv->image),
- priv->icon_size, NULL);
if (!pixbuf)
pixbuf = gtk_icon_theme_load_icon (get_icon_theme (GTK_WIDGET (priv->image)),
FALLBACK_ICON_NAME,
out:
g_object_unref (button);
- g_object_unref (handle);
+ g_object_unref (cancellable);
}
static void
GtkFileChooserButtonPrivate *priv = button->priv;
GdkPixbuf *pixbuf;
gchar *label_text;
- GSList *paths;
+ GSList *files;
- paths = _gtk_file_chooser_get_paths (GTK_FILE_CHOOSER (priv->dialog));
+ files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (priv->dialog));
label_text = NULL;
pixbuf = NULL;
- if (paths && paths->data)
+ if (priv->update_button_cancellable)
+ {
+ g_cancellable_cancel (priv->update_button_cancellable);
+ priv->update_button_cancellable = NULL;
+ }
+
+ if (files && files->data)
{
- GtkFilePath *path;
+ GFile *file;
GtkFileSystemVolume *volume = NULL;
-
- path = paths->data;
- volume = gtk_file_system_get_volume_for_path (priv->fs, path);
+ file = files->data;
+
+ volume = _gtk_file_system_get_volume_for_file (priv->fs, file);
if (volume)
{
- GtkFilePath *base_path;
+ GFile *base_file;
- base_path = gtk_file_system_volume_get_base_path (priv->fs, volume);
- if (base_path && gtk_file_path_compare (base_path, path) == 0)
+ base_file = _gtk_file_system_volume_get_root (volume);
+ if (base_file && g_file_equal (base_file, file))
{
- label_text = gtk_file_system_volume_get_display_name (priv->fs,
- volume);
- pixbuf = gtk_file_system_volume_render_icon (priv->fs, volume,
- GTK_WIDGET (button),
- priv->icon_size,
- NULL);
+ label_text = _gtk_file_system_volume_get_display_name (volume);
+ pixbuf = _gtk_file_system_volume_render_icon (volume,
+ GTK_WIDGET (button),
+ priv->icon_size,
+ NULL);
}
- if (base_path)
- gtk_file_path_free (base_path);
+ if (base_file)
+ g_object_unref (base_file);
- gtk_file_system_volume_free (priv->fs, volume);
+ _gtk_file_system_volume_free (volume);
if (label_text)
goto out;
}
- if (priv->update_button_handle)
- {
- gtk_file_system_cancel_operation (priv->update_button_handle);
- priv->update_button_handle = NULL;
- }
-
- if (gtk_file_system_path_is_local (priv->fs, path))
+ if (g_file_is_native (file))
{
- priv->update_button_handle =
- gtk_file_system_get_info (priv->fs, path,
- GTK_FILE_INFO_DISPLAY_NAME | GTK_FILE_INFO_ICON,
- update_label_get_info_cb,
- g_object_ref (button));
+ priv->update_button_cancellable =
+ _gtk_file_system_get_info (priv->fs, file,
+ "standard::icon,standard::display-name",
+ update_label_get_info_cb,
+ g_object_ref (button));
}
else
{
GdkPixbuf *pixbuf;
- label_text = gtk_file_system_get_bookmark_label (button->priv->fs, path);
+ label_text = _gtk_file_system_get_bookmark_label (button->priv->fs, file);
pixbuf = gtk_icon_theme_load_icon (get_icon_theme (GTK_WIDGET (priv->image)),
- "gnome-fs-regular",
+ "text-x-generic",
priv->icon_size, 0, NULL);
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf);
}
}
out:
- gtk_file_paths_free (paths);
+ g_slist_foreach (files, (GFunc) g_object_unref, NULL);
+ g_slist_free (files);
if (label_text)
{
g_free (label_text);
}
else
- gtk_label_set_text (GTK_LABEL (priv->label), _(FALLBACK_DISPLAY_NAME));
+ {
+ gtk_label_set_text (GTK_LABEL (priv->label), _(FALLBACK_DISPLAY_NAME));
+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), NULL);
+ }
}
priv->n_volumes = 0;
- volumes = gtk_file_system_list_volumes (fs);
+ volumes = _gtk_file_system_list_volumes (fs);
model_add_volumes (user_data, volumes);
g_slist_free (volumes);
GtkFileChooserButtonPrivate *priv = button->priv;
GSList *bookmarks;
- bookmarks = gtk_file_system_list_bookmarks (fs);
+ bookmarks = _gtk_file_system_list_bookmarks (fs);
model_remove_rows (user_data,
model_get_type_position (user_data,
ROW_TYPE_BOOKMARK_SEPARATOR),
priv->has_bookmark_separator = FALSE;
priv->n_bookmarks = 0;
model_add_bookmarks (user_data, bookmarks);
- gtk_file_paths_free (bookmarks);
+ g_slist_foreach (bookmarks, (GFunc) g_object_unref, NULL);
+ g_slist_free (bookmarks);
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->filter_model));
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
- if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_IS_WINDOW (toplevel))
+ if (gtk_widget_is_toplevel (toplevel) && GTK_IS_WINDOW (toplevel))
{
if (GTK_WINDOW (toplevel) != gtk_window_get_transient_for (GTK_WINDOW (priv->dialog)))
gtk_window_set_transient_for (GTK_WINDOW (priv->dialog),
if (!priv->active)
{
- GSList *paths;
+ GSList *files;
g_signal_handler_block (priv->dialog,
priv->dialog_folder_changed_id);
priv->dialog_file_activated_id);
g_signal_handler_block (priv->dialog,
priv->dialog_selection_changed_id);
- paths = _gtk_file_chooser_get_paths (GTK_FILE_CHOOSER (priv->dialog));
- if (paths)
+ files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (priv->dialog));
+ if (files)
{
- if (paths->data)
- priv->old_path = gtk_file_path_copy (paths->data);
+ if (files->data)
+ priv->old_file = g_object_ref (files->data);
- gtk_file_paths_free (paths);
+ g_slist_foreach (files, (GFunc) g_object_unref, NULL);
+ g_slist_free (files);
}
priv->active = TRUE;
case ROW_TYPE_CURRENT_FOLDER:
gtk_file_chooser_unselect_all (GTK_FILE_CHOOSER (priv->dialog));
if (data)
- _gtk_file_chooser_set_current_folder_path (GTK_FILE_CHOOSER (priv->dialog),
- data, NULL);
+ gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (priv->dialog),
+ data, NULL);
break;
case ROW_TYPE_VOLUME:
{
- GtkFilePath *base_path;
+ GFile *base_file;
gtk_file_chooser_unselect_all (GTK_FILE_CHOOSER (priv->dialog));
- base_path = gtk_file_system_volume_get_base_path (priv->fs, data);
- if (base_path)
+ base_file = _gtk_file_system_volume_get_root (data);
+ if (base_file)
{
- _gtk_file_chooser_set_current_folder_path (GTK_FILE_CHOOSER (priv->dialog),
- base_path, NULL);
- gtk_file_path_free (base_path);
+ gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (priv->dialog),
+ base_file, NULL);
+ g_object_unref (base_file);
}
}
break;
/* If the path isn't local but we're in local-only mode now, remove
* the custom-folder row */
- if (data &&
- (!gtk_file_system_path_is_local (priv->fs, data) &&
- gtk_file_chooser_get_local_only (GTK_FILE_CHOOSER (priv->dialog))))
+ if (data && g_file_is_native (G_FILE (data)) &&
+ gtk_file_chooser_get_local_only (GTK_FILE_CHOOSER (priv->dialog)))
{
pos--;
model_remove_rows (user_data, pos, 2);
GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
GtkFileChooserButtonPrivate *priv = button->priv;
- if (response == GTK_RESPONSE_ACCEPT)
+ if (response == GTK_RESPONSE_ACCEPT ||
+ response == GTK_RESPONSE_OK)
{
g_signal_emit_by_name (user_data, "current-folder-changed");
g_signal_emit_by_name (user_data, "selection-changed");
}
- else if (priv->old_path)
+ else if (priv->old_file)
{
switch (gtk_file_chooser_get_action (GTK_FILE_CHOOSER (dialog)))
{
case GTK_FILE_CHOOSER_ACTION_OPEN:
- _gtk_file_chooser_select_path (GTK_FILE_CHOOSER (dialog), priv->old_path,
- NULL);
+ gtk_file_chooser_select_file (GTK_FILE_CHOOSER (dialog), priv->old_file,
+ NULL);
break;
case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:
- _gtk_file_chooser_set_current_folder_path (GTK_FILE_CHOOSER (dialog),
- priv->old_path, NULL);
+ gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (dialog),
+ priv->old_file, NULL);
break;
default:
g_assert_not_reached ();
else
gtk_file_chooser_unselect_all (GTK_FILE_CHOOSER (dialog));
- if (priv->old_path)
+ if (priv->old_file)
{
- gtk_file_path_free (priv->old_path);
- priv->old_path = NULL;
+ g_object_unref (priv->old_file);
+ priv->old_file = NULL;
}
update_label_and_image (user_data);
gtk_widget_set_sensitive (priv->combo_box, TRUE);
gtk_widget_hide (priv->dialog);
- g_signal_emit_by_name (user_data, "file-set");
+ if (response == GTK_RESPONSE_ACCEPT ||
+ response == GTK_RESPONSE_OK)
+ g_signal_emit (user_data, file_chooser_button_signals[FILE_SET], 0);
}
* Returns: a new button widget.
*
* Since: 2.6
+ * Deprecated: 2.14: Use gtk_file_chooser_button_new() instead.
**/
GtkWidget *
gtk_file_chooser_button_new_with_backend (const gchar *title,
return g_object_new (GTK_TYPE_FILE_CHOOSER_BUTTON,
"action", action,
"title", (title ? title : _(DEFAULT_TITLE)),
- "file-system-backend", backend,
NULL);
}
/**
* gtk_file_chooser_button_new_with_dialog:
* @dialog: the widget to use as dialog
- *
- * Creates a #GtkFileChooserButton widget which uses @dialog as it's
- * file-picking window. Note that @dialog must be a #GtkDialog (or
- * subclass) which implements the #GtkFileChooser interface and must
- * not have %GTK_DIALOG_DESTROY_WITH_PARENT set.
- *
+ *
+ * Creates a #GtkFileChooserButton widget which uses @dialog as its
+ * file-picking window.
+ *
+ * Note that @dialog must be a #GtkDialog (or subclass) which
+ * implements the #GtkFileChooser interface and must not have
+ * %GTK_DIALOG_DESTROY_WITH_PARENT set.
+ *
+ * Also note that the dialog needs to have its confirmative button
+ * added with response %GTK_RESPONSE_ACCEPT or %GTK_RESPONSE_OK in
+ * order for the button to take over the file selected in the dialog.
+ *
* Returns: a new button widget.
- *
+ *
* Since: 2.6
**/
GtkWidget *
projects / ~andy / gtk / blobdiff