callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use bookmark labels in the combobox.

Browse Source 
2006-09-17  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserbutton.c: Use bookmark labels in
	the combobox.
This commit is contained in:
Matthias Clasen
2006-09-17 04:20:43 +00:00
committed by Matthias Clasen
parent 993e1a1e76
commit ec62ff149d
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkfilechooserbutton.c
View File

@ -1386,6 +1386,7 @@ get_icon_theme (GtkWidget *widget)
struct SetDisplayNameData
{
GtkFileChooserButton *button;
char *label;
GtkTreeRowReference *row_ref;
};
@ -1432,9 +1433,12 @@ set_info_get_info_cb (GtkFileSystemHandle *handle,
pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->button),
data->button->priv->icon_size, NULL);
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, gtk_file_info_get_display_name (info),
DISPLAY_NAME_COLUMN, data->label,
IS_FOLDER_COLUMN, gtk_file_info_get_is_folder (info),
-1);
@ -1443,6 +1447,7 @@ set_info_get_info_cb (GtkFileSystemHandle *handle,
out:
g_object_unref (data->button);
g_free (data->label);
gtk_tree_row_reference_free (data->row_ref);
g_free (data);
@ -1461,6 +1466,8 @@ set_info_for_path_at_iter (GtkFileChooserButton *button,
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);