Oops, call shortcuts_add_bookmarks() here.

2004-01-05  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkfilechooserdefault.c (shortcuts_append_bookmarks): Oops,
	call shortcuts_add_bookmarks() here.
	(remove_bookmark_button_clicked_cb): Ahem, fetch the selected
	iter.
	(shortcuts_append_paths): Don't display error dialogs here.
	(create_file_list): Remove the @#$% rules hint.

diff --git a/ChangeLog b/ChangeLog
index f2716cdbdc1668c61caf4f6cb16161ef87a43a77..be3b9f5a6cddf1f84483f3062fdb6ddce2a651fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-05  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_append_bookmarks): Oops,
+       call shortcuts_add_bookmarks() here.
+       (remove_bookmark_button_clicked_cb): Ahem, fetch the selected
+       iter.
+       (shortcuts_append_paths): Don't display error dialogs here.
+       (create_file_list): Remove the @#$% rules hint.
+
 2004-01-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (toolbar_button_new): New helper

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f2716cdbdc1668c61caf4f6cb16161ef87a43a77..be3b9f5a6cddf1f84483f3062fdb6ddce2a651fa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2004-01-05  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_append_bookmarks): Oops,
+       call shortcuts_add_bookmarks() here.
+       (remove_bookmark_button_clicked_cb): Ahem, fetch the selected
+       iter.
+       (shortcuts_append_paths): Don't display error dialogs here.
+       (create_file_list): Remove the @#$% rules hint.
+
 2004-01-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (toolbar_button_new): New helper

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f2716cdbdc1668c61caf4f6cb16161ef87a43a77..be3b9f5a6cddf1f84483f3062fdb6ddce2a651fa 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2004-01-05  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_append_bookmarks): Oops,
+       call shortcuts_add_bookmarks() here.
+       (remove_bookmark_button_clicked_cb): Ahem, fetch the selected
+       iter.
+       (shortcuts_append_paths): Don't display error dialogs here.
+       (create_file_list): Remove the @#$% rules hint.
+
 2004-01-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (toolbar_button_new): New helper

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f2716cdbdc1668c61caf4f6cb16161ef87a43a77..be3b9f5a6cddf1f84483f3062fdb6ddce2a651fa 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2004-01-05  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_append_bookmarks): Oops,
+       call shortcuts_add_bookmarks() here.
+       (remove_bookmark_button_clicked_cb): Ahem, fetch the selected
+       iter.
+       (shortcuts_append_paths): Don't display error dialogs here.
+       (create_file_list): Remove the @#$% rules hint.
+
 2004-01-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (toolbar_button_new): New helper

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f2716cdbdc1668c61caf4f6cb16161ef87a43a77..be3b9f5a6cddf1f84483f3062fdb6ddce2a651fa 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2004-01-05  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_append_bookmarks): Oops,
+       call shortcuts_add_bookmarks() here.
+       (remove_bookmark_button_clicked_cb): Ahem, fetch the selected
+       iter.
+       (shortcuts_append_paths): Don't display error dialogs here.
+       (create_file_list): Remove the @#$% rules hint.
+
 2004-01-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (toolbar_button_new): New helper

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 615487fcc000294273c43f20a0ab9feec8def781..9a0456b6f2df2b34148b555b0b12754122429050 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -628,10 +628,10 @@ shortcuts_append_paths (GtkFileChooserDefault *impl,
       path = paths->data;
       error = NULL;
 
-      if (shortcuts_insert_path (impl, -1, FALSE, NULL, path, NULL, &error))
+      /* NULL GError, but we don't really want to show error boxes here */
+
+      if (shortcuts_insert_path (impl, -1, FALSE, NULL, path, NULL, NULL))
        num_inserted++;
-      else
-       error_getting_info_dialog (impl, path, error);
     }
 
   return num_inserted;
@@ -791,6 +791,7 @@ shortcuts_append_bookmarks (GtkFileChooserDefault *impl)
                      SHORTCUTS_COL_NAME, NULL,
                      SHORTCUTS_COL_PATH, NULL,
                      -1);
+  shortcuts_add_bookmarks (impl);
 }
 
 /* Creates the GtkTreeStore used as the shortcuts model */
@@ -1070,6 +1071,7 @@ static void
 remove_bookmark_button_clicked_cb (GtkButton *button,
                                   GtkFileChooserDefault *impl)
 {
+  GtkTreeSelection *selection;
   GtkTreeIter iter;
   GtkFilePath *path;
   int selected, start_row;
@@ -1081,6 +1083,9 @@ remove_bookmark_button_clicked_cb (GtkButton *button,
   if (selected < start_row || selected >= start_row + impl->num_bookmarks)
     g_assert_not_reached ();
 
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->shortcuts_tree));
+  gtk_tree_selection_get_selected (selection, NULL, &iter);
+
   gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter, SHORTCUTS_COL_PATH, &path, -1);
 
   error = NULL;
@@ -1350,7 +1355,6 @@ create_file_list (GtkFileChooserDefault *impl)
   /* Tree/list view */
 
   impl->list = gtk_tree_view_new ();
-  gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (impl->list), TRUE);
   gtk_container_add (GTK_CONTAINER (impl->list_scrollwin), impl->list);
   g_signal_connect (impl->list, "row_activated",
                    G_CALLBACK (list_row_activated), impl);