#include "gtkfilechooserdialog.h"
#include "gtkfilechooserprivate.h"
#include "gtkfilechooserutils.h"
+#include "gtkmarshalers.h"
#include "gtkfilechooserbutton.h"
#define GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButtonPrivate))
#define DEFAULT_TITLE N_("Select A File")
-#define HOME_DISPLAY_NAME N_("Home")
#define DESKTOP_DISPLAY_NAME N_("Desktop")
#define FALLBACK_DISPLAY_NAME N_("(None)")
#define FALLBACK_ICON_NAME "stock_unknown"
PROP_WIDTH_CHARS
};
+/* Signals */
+enum
+{
+ FILE_SET,
+ LAST_SIGNAL
+};
+
/* TreeModel Columns */
enum
{
DISPLAY_NAME_COLUMN,
TYPE_COLUMN,
DATA_COLUMN,
+ IS_FOLDER_COLUMN,
+ HANDLE_COLUMN,
NUM_COLUMNS
};
gulong fs_volumes_changed_id;
gulong fs_bookmarks_changed_id;
+ GtkFileSystemHandle *dnd_select_folder_handle;
+ GtkFileSystemHandle *update_button_handle;
+ GSList *change_icon_theme_handles;
+
gint icon_size;
guint8 n_special;
/* 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;
+
/* Used to track whether we need to set a default current folder on ::map() */
guint8 folder_has_been_set : 1;
gint x,
gint y,
GtkSelectionData *data,
- guint info,
+ guint type,
guint drag_time);
static void gtk_file_chooser_button_show_all (GtkWidget *widget);
static void gtk_file_chooser_button_hide_all (GtkWidget *widget);
/* Utility Functions */
static GtkIconTheme *get_icon_theme (GtkWidget *widget);
-static gchar *get_display_name_for_path (GtkFileSystem *fs,
- const GtkFilePath *path);
+static void set_info_for_path_at_iter (GtkFileChooserButton *fs,
+ const GtkFilePath *path,
+ GtkTreeIter *iter);
static gint model_get_type_position (GtkFileChooserButton *button,
RowType row_type);
gint response,
gpointer user_data);
+static guint file_chooser_button_signals[LAST_SIGNAL] = { 0 };
/* ******************* *
* GType Declaration *
G_DEFINE_TYPE_WITH_CODE (GtkFileChooserButton, gtk_file_chooser_button, GTK_TYPE_HBOX, { \
G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_CHOOSER, gtk_file_chooser_button_file_chooser_iface_init) \
-});
+})
/* ***************** *
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:
+ * @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.
+ *
+ * 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_STRUCT_OFFSET (GtkFileChooserButtonClass, file_set),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
/**
* GtkFileChooserButton:dialog:
g_param_spec_object ("dialog",
P_("Dialog"),
P_("The file chooser dialog to use."),
- GTK_TYPE_FILE_CHOOSER_DIALOG,
+ GTK_TYPE_FILE_CHOOSER,
(GTK_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY)));
GDK_TYPE_PIXBUF, /* Icon */
G_TYPE_STRING, /* Display Name */
G_TYPE_CHAR, /* Row Type */
- G_TYPE_POINTER /* Volume || Path */));
+ G_TYPE_POINTER /* Volume || Path */,
+ G_TYPE_BOOLEAN /* Is Folder? */,
+ G_TYPE_POINTER /* handle */));
priv->combo_box = gtk_combo_box_new ();
priv->combo_box_changed_id =
GtkFileChooserButtonPrivate *priv = button->priv;
GtkTreeIter iter;
gint pos;
- GdkPixbuf *pixbuf;
- gchar *display_name;
pos = model_get_type_position (button, ROW_TYPE_SHORTCUT);
pos += priv->n_shortcuts;
- pixbuf = gtk_file_system_render_icon (priv->fs, path,
- GTK_WIDGET (chooser),
- priv->icon_size, NULL);
- display_name = get_display_name_for_path (priv->fs, path);
-
gtk_list_store_insert (GTK_LIST_STORE (priv->model), &iter, pos);
gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter,
- ICON_COLUMN, pixbuf,
- DISPLAY_NAME_COLUMN, display_name,
+ ICON_COLUMN, NULL,
+ DISPLAY_NAME_COLUMN, _(FALLBACK_DISPLAY_NAME),
TYPE_COLUMN, ROW_TYPE_SHORTCUT,
DATA_COLUMN, gtk_file_path_copy (path),
+ IS_FOLDER_COLUMN, FALSE,
-1);
+ set_info_for_path_at_iter (button, path, &iter);
priv->n_shortcuts++;
- if (pixbuf)
- g_object_unref (pixbuf);
- g_free (display_name);
-
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->filter_model));
}
gchar type;
pos = model_get_type_position (button, ROW_TYPE_SHORTCUT);
- g_assert (gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos));
+ gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos);
do
{
-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));
+
current_folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (priv->dialog));
if (current_folder != NULL)
{
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);
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_LOCAL_ONLY:
case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET:
case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE:
case GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL:
g_object_set_property (G_OBJECT (priv->dialog), pspec->name, value);
break;
+ case GTK_FILE_CHOOSER_PROP_LOCAL_ONLY:
+ g_object_set_property (G_OBJECT (priv->dialog), pspec->name, value);
+ fs_volumes_changed_cb (priv->fs, button);
+ fs_bookmarks_changed_cb (priv->fs, button);
+ break;
+
case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
/* Construct-only */
priv->backend = g_value_dup_string (value);
{
GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (object);
GtkFileChooserButtonPrivate *priv = button->priv;
- GtkTreeIter iter;
if (priv->old_path)
gtk_file_path_free (priv->old_path);
- g_assert (gtk_tree_model_get_iter_first (priv->model, &iter));
-
- do
- {
- model_free_row_data (button, &iter);
- }
- while (gtk_tree_model_iter_next (priv->model, &iter));
-
- g_object_unref (priv->model);
- g_object_unref (priv->filter_model);
-
- g_signal_handler_disconnect (priv->fs, priv->fs_volumes_changed_id);
- g_signal_handler_disconnect (priv->fs, priv->fs_bookmarks_changed_id);
- g_object_unref (priv->fs);
-
if (G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->finalize != NULL)
(*G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->finalize) (object);
}
{
GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (object);
GtkFileChooserButtonPrivate *priv = button->priv;
+ GtkTreeIter iter;
+ GSList *l;
if (priv->dialog != NULL)
- gtk_widget_destroy (priv->dialog);
+ {
+ gtk_widget_destroy (priv->dialog);
+ priv->dialog = NULL;
+ }
+
+ if (priv->model && gtk_tree_model_get_iter_first (priv->model, &iter)) do
+ {
+ model_free_row_data (button, &iter);
+ }
+ while (gtk_tree_model_iter_next (priv->model, &iter));
+
+ if (priv->dnd_select_folder_handle)
+ {
+ gtk_file_system_cancel_operation (priv->dnd_select_folder_handle);
+ priv->dnd_select_folder_handle = NULL;
+ }
+
+ if (priv->update_button_handle)
+ {
+ gtk_file_system_cancel_operation (priv->update_button_handle);
+ priv->update_button_handle = NULL;
+ }
+
+ if (priv->change_icon_theme_handles)
+ {
+ for (l = priv->change_icon_theme_handles; l; l = l->next)
+ {
+ GtkFileSystemHandle *handle = GTK_FILE_SYSTEM_HANDLE (l->data);
+ gtk_file_system_cancel_operation (handle);
+ }
+ g_slist_free (priv->change_icon_theme_handles);
+ priv->change_icon_theme_handles = NULL;
+ }
+
+ if (priv->model)
+ {
+ g_object_unref (priv->model);
+ priv->model = NULL;
+ }
+
+ if (priv->filter_model)
+ {
+ g_object_unref (priv->filter_model);
+ priv->filter_model = NULL;
+ }
+
+ if (priv->fs)
+ {
+ g_signal_handler_disconnect (priv->fs, priv->fs_volumes_changed_id);
+ g_signal_handler_disconnect (priv->fs, priv->fs_bookmarks_changed_id);
+ g_object_unref (priv->fs);
+ 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);
* GtkWidget Functions *
* ********************* */
+struct DndSelectFolderData
+{
+ GtkFileChooserButton *button;
+ GtkFileChooserAction action;
+ GtkFilePath *path;
+ 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)
+{
+ gboolean cancelled = handle->cancelled;
+ struct DndSelectFolderData *data = user_data;
+
+ if (handle != data->button->priv->dnd_select_folder_handle)
+ {
+ g_object_unref (data->button);
+ gtk_file_path_free (data->path);
+ g_strfreev (data->uris);
+ g_free (data);
+
+ g_object_unref (handle);
+ return;
+ }
+
+ data->button->priv->dnd_select_folder_handle = 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));
+ }
+ else
+ data->selected = FALSE;
+
+ if (data->selected || data->uris[++data->i] == NULL)
+ {
+ g_object_unref (data->button);
+ gtk_file_path_free (data->path);
+ g_strfreev (data->uris);
+ g_free (data);
+
+ g_object_unref (handle);
+ return;
+ }
+
+ if (data->path)
+ gtk_file_path_free (data->path);
+
+ data->path = gtk_file_system_uri_to_path (handle->file_system,
+ 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);
+
+ g_object_unref (handle);
+}
+
static void
gtk_file_chooser_button_drag_data_received (GtkWidget *widget,
GdkDragContext *context,
gint x,
gint y,
GtkSelectionData *data,
- guint info,
+ guint type,
guint drag_time)
{
GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (widget);
(*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received) (widget,
context,
x, y,
- data, info,
+ data, type,
drag_time);
if (widget == NULL || context == NULL || data == NULL || data->length < 0)
return;
- switch (info)
+ switch (type)
{
case TEXT_URI_LIST:
{
gchar **uris;
- GtkFilePath *base_path;
- guint i;
- gboolean selected;
+ struct DndSelectFolderData *info;
uris = gtk_selection_data_get_uris (data);
if (uris == NULL)
break;
- selected = FALSE;
- for (i = 0; !selected && uris[i] != NULL; i++)
- {
- path = gtk_file_system_uri_to_path (priv->fs, uris[i]);
-
- base_path = NULL;
- if (path != NULL &&
- gtk_file_system_get_parent (priv->fs, path, &base_path, NULL))
- {
- GtkFileFolder *folder;
- GtkFileInfo *info;
-
- folder = gtk_file_system_get_folder (priv->fs, base_path,
- GTK_FILE_INFO_IS_FOLDER,
- NULL);
-
- info = gtk_file_folder_get_info (folder, path, NULL);
+ info = g_new0 (struct DndSelectFolderData, 1);
+ info->button = g_object_ref (button);
+ info->i = 0;
+ info->uris = uris;
+ info->selected = FALSE;
+ g_object_get (priv->dialog, "action", &info->action, NULL);
- if (info != NULL)
- {
- GtkFileChooserAction action;
-
- g_object_get (priv->dialog, "action", &action, NULL);
-
- selected =
- (((action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER &&
- gtk_file_info_get_is_folder (info)) ||
- (action == GTK_FILE_CHOOSER_ACTION_OPEN &&
- !gtk_file_info_get_is_folder (info))) &&
- _gtk_file_chooser_select_path (GTK_FILE_CHOOSER (priv->dialog),
- path, NULL));
+ info->path = gtk_file_system_uri_to_path (priv->fs,
+ info->uris[info->i]);
- gtk_file_info_free (info);
- }
- else
- selected = FALSE;
+ if (priv->dnd_select_folder_handle)
+ gtk_file_system_cancel_operation (priv->dnd_select_folder_handle);
- gtk_file_path_free (base_path);
- }
-
- gtk_file_path_free (path);
- }
-
- g_strfreev (uris);
+ 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);
}
break;
}
/* Changes the icons wherever it is needed */
+struct ChangeIconThemeData
+{
+ GtkFileChooserButton *button;
+ GtkTreeRowReference *row_ref;
+};
+
+static void
+change_icon_theme_get_info_cb (GtkFileSystemHandle *handle,
+ const GtkFileInfo *info,
+ const GError *error,
+ gpointer user_data)
+{
+ gboolean cancelled = handle->cancelled;
+ GdkPixbuf *pixbuf;
+ struct ChangeIconThemeData *data = user_data;
+
+ if (!g_slist_find (data->button->priv->change_icon_theme_handles, handle))
+ goto out;
+
+ data->button->priv->change_icon_theme_handles =
+ g_slist_remove (data->button->priv->change_icon_theme_handles, handle);
+
+ if (cancelled || error)
+ goto out;
+
+ pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->button),
+ data->button->priv->icon_size, NULL);
+
+ if (pixbuf)
+ {
+ gint width = 0;
+ GtkTreeIter iter;
+ GtkTreePath *path;
+
+ width = MAX (width, gdk_pixbuf_get_width (pixbuf));
+
+ path = gtk_tree_row_reference_get_path (data->row_ref);
+ if (path)
+ {
+ gtk_tree_model_get_iter (data->button->priv->model, &iter, path);
+ gtk_tree_path_free (path);
+
+ gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
+ ICON_COLUMN, pixbuf,
+ -1);
+
+ g_object_set (data->button->priv->icon_cell,
+ "width", width,
+ NULL);
+ }
+ g_object_unref (pixbuf);
+ }
+
+out:
+ g_object_unref (data->button);
+ gtk_tree_row_reference_free (data->row_ref);
+ g_free (data);
+
+ g_object_unref (handle);
+}
+
static void
change_icon_theme (GtkFileChooserButton *button)
{
GtkSettings *settings;
GtkIconTheme *theme;
GtkTreeIter iter;
- gint width, height;
+ GSList *l;
+ gint width = 0, height = 0;
+
+ for (l = button->priv->change_icon_theme_handles; l; l = l->next)
+ {
+ GtkFileSystemHandle *handle = GTK_FILE_SYSTEM_HANDLE (l->data);
+ gtk_file_system_cancel_operation (handle);
+ }
+ g_slist_free (button->priv->change_icon_theme_handles);
+ button->priv->change_icon_theme_handles = NULL;
settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
update_label_and_image (button);
- g_assert (gtk_tree_model_get_iter_first (priv->model, &iter));
+ gtk_tree_model_get_iter_first (priv->model, &iter);
theme = get_icon_theme (GTK_WIDGET (button));
case ROW_TYPE_BOOKMARK:
case ROW_TYPE_CURRENT_FOLDER:
if (data)
- pixbuf = gtk_file_system_render_icon (priv->fs, data,
- GTK_WIDGET (button),
- priv->icon_size, NULL);
+ {
+ if (gtk_file_system_path_is_local (priv->fs, (GtkFilePath *)data))
+ {
+ GtkTreePath *path;
+ GtkFileSystemHandle *handle;
+ struct ChangeIconThemeData *info;
+
+ info = g_new0 (struct ChangeIconThemeData, 1);
+ info->button = g_object_ref (button);
+ 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);
+ pixbuf = NULL;
+ }
+ else
+ /* Don't call get_info for remote paths to avoid latency and
+ * auth dialogs.
+ * 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-regular",
+ priv->icon_size, 0, NULL);
+ }
else
pixbuf = gtk_icon_theme_load_icon (theme, FALLBACK_ICON_NAME,
priv->icon_size, 0, NULL);
return gtk_icon_theme_get_default ();
}
-static gchar *
-get_display_name_for_path (GtkFileSystem *fs,
- const GtkFilePath *path)
+
+struct SetDisplayNameData
{
- GtkFilePath *parent_path;
- GtkFileFolder *folder;
- gchar *retval;
+ GtkFileChooserButton *button;
+ char *label;
+ GtkTreeRowReference *row_ref;
+};
- parent_path = NULL;
- retval = NULL;
+static void
+set_info_get_info_cb (GtkFileSystemHandle *handle,
+ const GtkFileInfo *info,
+ const GError *error,
+ gpointer callback_data)
+{
+ gboolean cancelled = handle->cancelled;
+ GdkPixbuf *pixbuf;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ GtkFileSystemHandle *model_handle;
+ struct SetDisplayNameData *data = callback_data;
- gtk_file_system_get_parent (fs, path, &parent_path, NULL);
+ if (!data->button->priv->model)
+ /* button got destroyed */
+ goto out;
- folder = gtk_file_system_get_folder (fs, parent_path ? parent_path : path,
- GTK_FILE_INFO_DISPLAY_NAME, NULL);
+ path = gtk_tree_row_reference_get_path (data->row_ref);
+ if (!path)
+ /* Handle doesn't exist anymore in the model */
+ goto out;
- if (folder)
- {
- GtkFileInfo *info;
+ gtk_tree_model_get_iter (data->button->priv->model, &iter, path);
+ gtk_tree_path_free (path);
- info = gtk_file_folder_get_info (folder, path, NULL);
- g_object_unref (folder);
+ /* Validate the handle */
+ gtk_tree_model_get (data->button->priv->model, &iter,
+ HANDLE_COLUMN, &model_handle,
+ -1);
+ if (handle != model_handle)
+ goto out;
- if (info)
- {
- retval = g_strdup (gtk_file_info_get_display_name (info));
- gtk_file_info_free (info);
- }
- }
+ gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
+ HANDLE_COLUMN, NULL,
+ -1);
- if (parent_path)
- gtk_file_path_free (parent_path);
+ if (cancelled || error)
+ /* There was an error, leave the fallback name in there */
+ goto out;
- if (!retval)
- retval = g_strdup (_(FALLBACK_DISPLAY_NAME));
+ pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->button),
+ data->button->priv->icon_size, NULL);
- return retval;
+ if (!data->label)
+ data->label = g_strdup (gtk_file_info_get_display_name (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),
+ -1);
+
+ if (pixbuf)
+ g_object_unref (pixbuf);
+
+out:
+ g_object_unref (data->button);
+ g_free (data->label);
+ gtk_tree_row_reference_free (data->row_ref);
+ g_free (data);
+
+ g_object_unref (handle);
+}
+
+static void
+set_info_for_path_at_iter (GtkFileChooserButton *button,
+ const GtkFilePath *path,
+ GtkTreeIter *iter)
+{
+ struct SetDisplayNameData *data;
+ GtkTreePath *tree_path;
+ GtkFileSystemHandle *handle;
+
+ data = g_new0 (struct SetDisplayNameData, 1);
+ data->button = g_object_ref (button);
+ data->label = gtk_file_system_get_bookmark_label (button->priv->fs, path);
+
+ 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);
+
+ gtk_list_store_set (GTK_LIST_STORE (button->priv->model), iter,
+ HANDLE_COLUMN, handle,
+ -1);
}
/* Shortcuts Model */
{
gchar type;
gpointer data;
+ GtkFileSystemHandle *handle;
gtk_tree_model_get (button->priv->model, iter,
TYPE_COLUMN, &type,
DATA_COLUMN, &data,
+ HANDLE_COLUMN, &handle,
-1);
+ if (handle)
+ gtk_file_system_cancel_operation (handle);
+
switch (type)
{
case ROW_TYPE_SPECIAL:
}
}
+static void
+model_add_special_get_info_cb (GtkFileSystemHandle *handle,
+ const GtkFileInfo *info,
+ const GError *error,
+ gpointer user_data)
+{
+ gboolean cancelled = handle->cancelled;
+ GtkTreeIter iter;
+ GtkTreePath *path;
+ GdkPixbuf *pixbuf;
+ GtkFileSystemHandle *model_handle;
+ struct ChangeIconThemeData *data = user_data;
+
+ if (!data->button->priv->model)
+ /* button got destroyed */
+ goto out;
+
+ path = gtk_tree_row_reference_get_path (data->row_ref);
+ if (!path)
+ /* Handle 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,
+ -1);
+ if (handle != model_handle)
+ goto out;
+
+ gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
+ HANDLE_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);
+
+ if (pixbuf)
+ {
+ gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
+ ICON_COLUMN, pixbuf,
+ -1);
+ g_object_unref (pixbuf);
+ }
+
+ gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
+ DISPLAY_NAME_COLUMN, gtk_file_info_get_display_name (info),
+ -1);
+
+out:
+ g_object_unref (data->button);
+ gtk_tree_row_reference_free (data->row_ref);
+ g_free (data);
+
+ g_object_unref (handle);
+}
+
static inline void
model_add_special (GtkFileChooserButton *button)
{
GtkListStore *store;
GtkTreeIter iter;
GtkFilePath *path;
- GdkPixbuf *pixbuf;
gint pos;
store = GTK_LIST_STORE (button->priv->model);
if (homedir)
{
+ GtkTreePath *tree_path;
+ GtkFileSystemHandle *handle;
+ struct ChangeIconThemeData *info;
+
path = gtk_file_system_filename_to_path (button->priv->fs, homedir);
- pixbuf = gtk_file_system_render_icon (button->priv->fs, path,
- GTK_WIDGET (button),
- button->priv->icon_size, NULL);
gtk_list_store_insert (store, &iter, pos);
pos++;
+
+ info = g_new0 (struct ChangeIconThemeData, 1);
+ info->button = g_object_ref (button);
+ tree_path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
+ info->row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (store),
+ 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);
+
gtk_list_store_set (store, &iter,
- ICON_COLUMN, pixbuf,
- DISPLAY_NAME_COLUMN, _(HOME_DISPLAY_NAME),
+ ICON_COLUMN, NULL,
+ DISPLAY_NAME_COLUMN, NULL,
TYPE_COLUMN, ROW_TYPE_SPECIAL,
DATA_COLUMN, path,
+ IS_FOLDER_COLUMN, TRUE,
+ HANDLE_COLUMN, handle,
-1);
- if (pixbuf)
- g_object_unref (pixbuf);
button->priv->n_special++;
#ifndef G_OS_WIN32
if (desktopdir)
{
+ GtkTreePath *tree_path;
+ GtkFileSystemHandle *handle;
+ struct ChangeIconThemeData *info;
+
path = gtk_file_system_filename_to_path (button->priv->fs, desktopdir);
g_free (desktopdir);
- pixbuf = gtk_file_system_render_icon (button->priv->fs, path,
- GTK_WIDGET (button),
- button->priv->icon_size, NULL);
gtk_list_store_insert (store, &iter, pos);
pos++;
+
+ info = g_new0 (struct ChangeIconThemeData, 1);
+ info->button = g_object_ref (button);
+ tree_path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
+ info->row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (store),
+ 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);
+
gtk_list_store_set (store, &iter,
TYPE_COLUMN, ROW_TYPE_SPECIAL,
- ICON_COLUMN, pixbuf,
+ ICON_COLUMN, NULL,
DISPLAY_NAME_COLUMN, _(DESKTOP_DISPLAY_NAME),
DATA_COLUMN, path,
+ IS_FOLDER_COLUMN, TRUE,
+ HANDLE_COLUMN, handle,
-1);
- if (pixbuf)
- g_object_unref (pixbuf);
button->priv->n_special++;
}
}
{
GtkListStore *store;
gint pos;
-
+ gboolean local_only;
+ GtkFileSystem *file_system;
+ GSList *l;
+
if (!volumes)
return;
store = GTK_LIST_STORE (button->priv->model);
pos = model_get_type_position (button, ROW_TYPE_VOLUME);
+ local_only = gtk_file_chooser_get_local_only (GTK_FILE_CHOOSER (button->priv->dialog));
+ file_system = button->priv->fs;
- do
+ for (l = volumes; l; l = l->next)
{
+ GtkFileSystemVolume *volume;
GtkTreeIter iter;
GdkPixbuf *pixbuf;
gchar *display_name;
- pixbuf = gtk_file_system_volume_render_icon (button->priv->fs,
- volumes->data,
+ volume = l->data;
+
+ if (local_only)
+ {
+ if (gtk_file_system_volume_get_is_mounted (file_system, volume))
+ {
+ GtkFilePath *base_path;
+
+ base_path = gtk_file_system_volume_get_base_path (file_system, volume);
+ if (base_path != NULL)
+ {
+ 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;
+ }
+ }
+ }
+ }
+
+ 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 (button->priv->fs,
- volumes->data);
+ display_name = gtk_file_system_volume_get_display_name (file_system, volume);
gtk_list_store_insert (store, &iter, pos);
gtk_list_store_set (store, &iter,
ICON_COLUMN, pixbuf,
DISPLAY_NAME_COLUMN, display_name,
TYPE_COLUMN, ROW_TYPE_VOLUME,
- DATA_COLUMN, volumes->data,
+ DATA_COLUMN, volume,
+ IS_FOLDER_COLUMN, TRUE,
-1);
if (pixbuf)
button->priv->n_volumes++;
pos++;
- volumes = volumes->next;
}
- while (volumes);
}
+extern gchar * _gtk_file_chooser_label_for_uri (const gchar *uri);
+
static void
model_add_bookmarks (GtkFileChooserButton *button,
GSList *bookmarks)
GtkListStore *store;
GtkTreeIter iter;
gint pos;
+ gboolean local_only;
+ GSList *l;
if (!bookmarks)
return;
store = GTK_LIST_STORE (button->priv->model);
- pos = model_get_type_position (button, ROW_TYPE_BOOKMARK_SEPARATOR);
+ pos = model_get_type_position (button, ROW_TYPE_BOOKMARK);
+ local_only = gtk_file_chooser_get_local_only (GTK_FILE_CHOOSER (button->priv->dialog));
- if (!button->priv->has_bookmark_separator)
+ for (l = bookmarks; l; l = l->next)
{
+ GtkFilePath *path;
+
+ path = l->data;
+
+ if (gtk_file_system_path_is_local (button->priv->fs, path))
+ {
+ 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),
+ IS_FOLDER_COLUMN, FALSE,
+ -1);
+ set_info_for_path_at_iter (button, path, &iter);
+ }
+ else
+ {
+ gchar *label;
+ GtkIconTheme *icon_theme;
+ GdkPixbuf *pixbuf;
+
+ if (local_only)
+ continue;
+
+ /* Don't call get_info for remote paths to avoid latency and
+ * auth dialogs.
+ * 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);
+ 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);
+ }
+
+ 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-directory",
+ button->priv->icon_size, 0, NULL);
+
+ gtk_list_store_insert (store, &iter, pos);
+ gtk_list_store_set (store, &iter,
+ ICON_COLUMN, pixbuf,
+ DISPLAY_NAME_COLUMN, label,
+ TYPE_COLUMN, ROW_TYPE_BOOKMARK,
+ DATA_COLUMN, gtk_file_path_copy (path),
+ IS_FOLDER_COLUMN, TRUE,
+ -1);
+
+ g_free (label);
+ g_object_unref (pixbuf);
+ }
+
+ button->priv->n_bookmarks++;
+ pos++;
+ }
+
+ if (button->priv->n_bookmarks > 0 &&
+ !button->priv->has_bookmark_separator)
+ {
+ pos = model_get_type_position (button, ROW_TYPE_BOOKMARK_SEPARATOR);
+
gtk_list_store_insert (store, &iter, pos);
gtk_list_store_set (store, &iter,
ICON_COLUMN, NULL,
DISPLAY_NAME_COLUMN, NULL,
TYPE_COLUMN, ROW_TYPE_BOOKMARK_SEPARATOR,
DATA_COLUMN, NULL,
+ IS_FOLDER_COLUMN, FALSE,
-1);
button->priv->has_bookmark_separator = TRUE;
}
-
- do
- {
- GdkPixbuf *pixbuf;
- gchar *display_name;
-
- pos++;
- pixbuf = gtk_file_system_render_icon (button->priv->fs, bookmarks->data,
- GTK_WIDGET (button),
- button->priv->icon_size, NULL);
- display_name = get_display_name_for_path (button->priv->fs,
- bookmarks->data);
-
- gtk_list_store_insert (store, &iter, pos);
- gtk_list_store_set (store, &iter,
- ICON_COLUMN, pixbuf,
- DISPLAY_NAME_COLUMN, display_name,
- TYPE_COLUMN, ROW_TYPE_BOOKMARK,
- DATA_COLUMN, gtk_file_path_copy (bookmarks->data),
- -1);
- if (pixbuf)
- g_object_unref (pixbuf);
- g_free (display_name);
-
- button->priv->n_bookmarks++;
- bookmarks = bookmarks->next;
- }
- while (bookmarks);
}
static void
GtkListStore *store;
GtkTreeIter iter;
gint pos;
- GdkPixbuf *pixbuf;
- gchar *display_name;
if (!path)
return;
DISPLAY_NAME_COLUMN, NULL,
TYPE_COLUMN, ROW_TYPE_CURRENT_FOLDER_SEPARATOR,
DATA_COLUMN, NULL,
+ IS_FOLDER_COLUMN, FALSE,
-1);
button->priv->has_current_folder_separator = TRUE;
}
model_free_row_data (button, &iter);
}
- pixbuf = gtk_file_system_render_icon (button->priv->fs, path,
- GTK_WIDGET (button),
- button->priv->icon_size, NULL);
- display_name = get_display_name_for_path (button->priv->fs, path);
- gtk_list_store_set (store, &iter,
- ICON_COLUMN, pixbuf,
- DISPLAY_NAME_COLUMN, display_name,
- TYPE_COLUMN, ROW_TYPE_CURRENT_FOLDER,
- DATA_COLUMN, gtk_file_path_copy (path),
- -1);
- if (pixbuf)
- g_object_unref (pixbuf);
- g_free (display_name);
+ if (gtk_file_system_path_is_local (button->priv->fs, path))
+ {
+ 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),
+ IS_FOLDER_COLUMN, FALSE,
+ -1);
+ set_info_for_path_at_iter (button, path, &iter);
+ }
+ else
+ {
+ gchar *label;
+ GtkIconTheme *icon_theme;
+ GdkPixbuf *pixbuf;
+
+ /* Don't call get_info for remote paths to avoid latency and
+ * auth dialogs.
+ * 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);
+ 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);
+ }
+
+ 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-directory",
+ 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),
+ IS_FOLDER_COLUMN, TRUE,
+ -1);
+
+ g_free (label);
+ g_object_unref (pixbuf);
+ }
}
static inline void
DISPLAY_NAME_COLUMN, NULL,
TYPE_COLUMN, ROW_TYPE_OTHER_SEPARATOR,
DATA_COLUMN, NULL,
+ IS_FOLDER_COLUMN, FALSE,
-1);
button->priv->has_other_separator = TRUE;
pos++;
DISPLAY_NAME_COLUMN, _("Other..."),
TYPE_COLUMN, ROW_TYPE_OTHER,
DATA_COLUMN, NULL,
+ IS_FOLDER_COLUMN, FALSE,
-1);
}
static inline gboolean
test_if_path_is_visible (GtkFileSystem *fs,
const GtkFilePath *path,
- gboolean local_only)
+ gboolean local_only,
+ gboolean is_folder)
{
- GtkFilePath *parent_path;
- GtkFileFolder *folder;
- GtkFileInfo *info;
-
if (!path)
return FALSE;
if (local_only && !gtk_file_system_path_is_local (fs, path))
return FALSE;
- parent_path = NULL;
- gtk_file_system_get_parent (fs, path, &parent_path, NULL);
-
- folder = gtk_file_system_get_folder (fs, parent_path ? parent_path : path,
- GTK_FILE_INFO_IS_FOLDER, NULL);
- gtk_file_path_free (parent_path);
-
- if (folder)
- {
- info = gtk_file_folder_get_info (folder, path, NULL);
- g_object_unref (folder);
- }
- else
- info = NULL;
-
- if (!info)
+ if (!is_folder)
return FALSE;
- else if (!gtk_file_info_get_is_folder (info))
- {
- gtk_file_info_free (info);
- return FALSE;
- }
-
- gtk_file_info_free (info);
return TRUE;
}
GtkFileChooserButtonPrivate *priv = button->priv;
gchar type;
gpointer data;
- gboolean local_only, retval;
+ gboolean local_only, retval, is_folder;
type = ROW_TYPE_INVALID;
data = NULL;
gtk_tree_model_get (model, iter,
TYPE_COLUMN, &type,
DATA_COLUMN, &data,
+ IS_FOLDER_COLUMN, &is_folder,
-1);
switch (type)
case ROW_TYPE_SPECIAL:
case ROW_TYPE_SHORTCUT:
case ROW_TYPE_BOOKMARK:
- retval = test_if_path_is_visible (priv->fs, data, local_only);
+ retval = test_if_path_is_visible (priv->fs, data, local_only, is_folder);
break;
case ROW_TYPE_VOLUME:
{
- GtkFilePath *base_path;
-
- base_path = gtk_file_system_volume_get_base_path (priv->fs, data);
- if (base_path)
+ retval = TRUE;
+ if (local_only)
{
- retval = (!local_only ||
- gtk_file_system_path_is_local (priv->fs, base_path));
- gtk_file_path_free (base_path);
+ if (gtk_file_system_volume_get_is_mounted (priv->fs, 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);
+
+ if (!is_local)
+ retval = FALSE;
+ }
+ else
+ retval = FALSE;
+ }
}
- else
- retval = FALSE;
}
break;
default:
GtkTreeIter iter;
gboolean row_found;
- g_assert (gtk_tree_model_get_iter_first (priv->filter_model, &iter));
+ gtk_tree_model_get_iter_first (priv->filter_model, &iter);
paths = _gtk_file_chooser_get_paths (GTK_FILE_CHOOSER (priv->dialog));
GtkFilePath *base_path;
base_path = gtk_file_system_volume_get_base_path (priv->fs, data);
- row_found = (paths &&
- paths->data &&
- gtk_file_path_compare (base_path, paths->data) == 0);
- gtk_file_path_free (base_path);
+ if (base_path)
+ {
+ row_found = (paths &&
+ paths->data &&
+ gtk_file_path_compare (base_path, paths->data) == 0);
+ gtk_file_path_free (base_path);
+ }
}
break;
default:
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->filter_model));
pos = model_get_type_position (button, ROW_TYPE_CURRENT_FOLDER);
- g_assert (gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos));
+ gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos);
gtk_tree_model_filter_convert_child_iter_to_iter (GTK_TREE_MODEL_FILTER (priv->filter_model),
&filter_iter, &iter);
}
/* Button */
+static void
+update_label_get_info_cb (GtkFileSystemHandle *handle,
+ const GtkFileInfo *info,
+ const GError *error,
+ gpointer data)
+{
+ gboolean cancelled = handle->cancelled;
+ GdkPixbuf *pixbuf;
+ GtkFileChooserButton *button = data;
+ GtkFileChooserButtonPrivate *priv = button->priv;
+
+ if (handle != priv->update_button_handle)
+ goto out;
+
+ priv->update_button_handle = NULL;
+
+ if (cancelled || error)
+ goto out;
+
+ gtk_label_set_text (GTK_LABEL (priv->label), gtk_file_info_get_display_name (info));
+
+ 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,
+ priv->icon_size, 0, NULL);
+
+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf);
+ if (pixbuf)
+ g_object_unref (pixbuf);
+
+out:
+ g_object_unref (button);
+ g_object_unref (handle);
+}
+
static void
update_label_and_image (GtkFileChooserButton *button)
{
gchar *label_text;
GSList *paths;
- paths = _gtk_file_chooser_get_paths (GTK_FILE_CHOOSER (button->priv->dialog));
+ paths = _gtk_file_chooser_get_paths (GTK_FILE_CHOOSER (priv->dialog));
label_text = NULL;
pixbuf = NULL;
- if (paths)
+ if (paths && paths->data)
{
- GtkFilePath *path, *parent_path;
- GtkFileSystemVolume *volume;
- GtkFileFolder *folder;
+ GtkFilePath *path;
+ GtkFileSystemVolume *volume = NULL;
path = paths->data;
goto out;
}
- if (!pixbuf)
- pixbuf = gtk_file_system_render_icon (priv->fs, path,
- GTK_WIDGET (button),
- priv->icon_size, NULL);
-
- parent_path = NULL;
- gtk_file_system_get_parent (priv->fs, path, &parent_path, NULL);
-
- folder = gtk_file_system_get_folder (priv->fs,
- parent_path ? parent_path : path,
- GTK_FILE_INFO_DISPLAY_NAME, NULL);
- gtk_file_path_free (parent_path);
-
- if (folder)
+ if (priv->update_button_handle)
{
- GtkFileInfo *info;
-
- info = gtk_file_folder_get_info (folder, path, NULL);
- g_object_unref (folder);
-
- if (info)
- {
- label_text = g_strdup (gtk_file_info_get_display_name (info));
- gtk_file_info_free (info);
- }
+ gtk_file_system_cancel_operation (priv->update_button_handle);
+ priv->update_button_handle = NULL;
+ }
+
+ if (gtk_file_system_path_is_local (priv->fs, path))
+ {
+ 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));
+ }
+ else
+ {
+ GdkPixbuf *pixbuf;
+
+ label_text = gtk_file_system_get_bookmark_label (button->priv->fs, path);
+
+ pixbuf = gtk_icon_theme_load_icon (get_icon_theme (GTK_WIDGET (priv->image)),
+ "gnome-fs-regular",
+ priv->icon_size, 0, NULL);
+
+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf);
+
+ if (pixbuf)
+ g_object_unref (pixbuf);
}
-
- out:
- gtk_file_paths_free (paths);
}
+out:
+ gtk_file_paths_free (paths);
if (label_text)
{
}
else
gtk_label_set_text (GTK_LABEL (priv->label), _(FALLBACK_DISPLAY_NAME));
-
- if (!pixbuf)
- pixbuf = gtk_icon_theme_load_icon (get_icon_theme (GTK_WIDGET (button)),
- FALLBACK_ICON_NAME,
- priv->icon_size, 0, NULL);
-
- gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf);
- if (pixbuf)
- g_object_unref (pixbuf);
}
GSList *bookmarks;
bookmarks = gtk_file_system_list_bookmarks (fs);
- if (!bookmarks)
- {
- model_remove_rows (user_data,
- model_get_type_position (user_data,
- ROW_TYPE_BOOKMARK_SEPARATOR),
- (priv->n_bookmarks + priv->has_bookmark_separator));
- priv->has_bookmark_separator = FALSE;
- }
- else
- model_remove_rows (user_data,
- model_get_type_position (user_data, ROW_TYPE_BOOKMARK),
- priv->n_bookmarks);
-
+ model_remove_rows (user_data,
+ model_get_type_position (user_data,
+ ROW_TYPE_BOOKMARK_SEPARATOR),
+ (priv->n_bookmarks + priv->has_bookmark_separator));
+ priv->has_bookmark_separator = FALSE;
priv->n_bookmarks = 0;
model_add_bookmarks (user_data, bookmarks);
gtk_file_paths_free (bookmarks);
pos = model_get_type_position (user_data,
ROW_TYPE_CURRENT_FOLDER);
- g_assert (gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos));
+ gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos);
data = NULL;
gtk_tree_model_get (priv->model, &iter, DATA_COLUMN, &data, -1);
gtk_widget_set_sensitive (priv->combo_box, TRUE);
gtk_widget_hide (priv->dialog);
+
+ g_signal_emit_by_name (user_data, "file-set");
}
/**
* gtk_file_chooser_button_new_with_dialog:
- * @dialog: the #GtkFileChooserDialog widget to use.
+ * @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 #GtkFileChooserDialog (or
- * subclass) and must not have %GTK_DIALOG_DESTROY_WITH_PARENT set.
+ * 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.
*
* Returns: a new button widget.
*
GtkWidget *
gtk_file_chooser_button_new_with_dialog (GtkWidget *dialog)
{
- g_return_val_if_fail (GTK_IS_FILE_CHOOSER_DIALOG (dialog), NULL);
+ g_return_val_if_fail (GTK_IS_FILE_CHOOSER (dialog) && GTK_IS_DIALOG (dialog), NULL);
return g_object_new (GTK_TYPE_FILE_CHOOSER_BUTTON,
"dialog", dialog,
projects / ~andy / gtk / blobdiff