Commit 0c7e1c16 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

Don't looks the bookmark label when reordering. (#320720, Jeremy Cook)

2005-11-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserdefault.c (shortcuts_reorder): Don't
	looks the bookmark label when reordering.  (#320720, Jeremy Cook)
parent fb02547e
2005-11-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c (shortcuts_reorder): Don't
looks the bookmark label when reordering. (#320720, Jeremy Cook)
* gtk/gtkpathbar.[hc]: Set focus-on-click to FALSE for all buttons.
Don't grab focus when a slider button is pressed, instead, use
a bit in the pathbar struct to determine whether to scroll up
......
2005-11-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c (shortcuts_reorder): Don't
looks the bookmark label when reordering. (#320720, Jeremy Cook)
* gtk/gtkpathbar.[hc]: Set focus-on-click to FALSE for all buttons.
Don't grab focus when a slider button is pressed, instead, use
a bit in the pathbar struct to determine whether to scroll up
......
......@@ -2813,6 +2813,7 @@ shortcuts_reorder (GtkFileChooserDefault *impl,
const GtkFilePath *file_path;
GtkFilePath *file_path_copy;
GError *error;
gchar *name;
/* Get the selected path */
......@@ -2828,12 +2829,13 @@ shortcuts_reorder (GtkFileChooserDefault *impl,
g_assert (old_position >= 0 && old_position < impl->num_bookmarks);
gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
SHORTCUTS_COL_NAME, &name,
SHORTCUTS_COL_DATA, &col_data,
SHORTCUTS_COL_IS_VOLUME, &is_volume,
-1);
g_assert (col_data != NULL);
g_assert (!is_volume);
file_path = col_data;
file_path_copy = gtk_file_path_copy (file_path); /* removal below will free file_path, so we need a copy */
......@@ -2847,7 +2849,10 @@ shortcuts_reorder (GtkFileChooserDefault *impl,
error = NULL;
if (gtk_file_system_remove_bookmark (impl->file_system, file_path_copy, &error))
shortcuts_add_bookmark_from_path (impl, file_path_copy, new_position);
{
shortcuts_add_bookmark_from_path (impl, file_path_copy, new_position);
gtk_file_system_set_bookmark_label (impl->file_system, file_path_copy, name);
}
else
error_adding_bookmark_dialog (impl, file_path_copy, error);
......@@ -6910,6 +6915,8 @@ path_bar_clicked (GtkPathBar *path_bar,
*/
if (child_is_hidden)
g_object_set (impl, "show-hidden", TRUE, NULL);
//gtk_widget_grab_focus (impl->browse_files_tree_view);
}
static const GtkFileInfo *
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment