gtk+: remove 2.12.7

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

19 files changed, 0 insertions, 12965 deletions

diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch
deleted file mode 100644
index 2524b99465..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Pending
-
-Index: gtk/gtkcellrenderer.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v
-retrieving revision 1.55
-diff -u -r1.55 gtkcellrenderer.c
---- gtk/gtkcellrenderer.c	14 May 2006 04:25:28 -0000	1.55
-+++ gtk/gtkcellrenderer.c	30 Jun 2006 10:57:43 -0000
-@@ -551,6 +551,7 @@
- 
-   if (cell->cell_background_set && !selected)
-     {
-+#ifdef USE_CAIRO_INTERNALLY
-       cairo_t *cr = gdk_cairo_create (window);
- 
-       gdk_cairo_rectangle (cr, background_area);
-@@ -558,6 +559,16 @@
-       cairo_fill (cr);
-       
-       cairo_destroy (cr);
-+#else
-+      GdkGC *gc;
-+
-+      gc = gdk_gc_new (window);
-+      gdk_gc_set_rgb_fg_color (gc, &priv->cell_background);
-+      gdk_draw_rectangle (window, gc, TRUE,
-+                          background_area->x, background_area->y,
-+                          background_area->width, background_area->height);
-+      g_object_unref (gc);
-+#endif
-     }
- 
-   GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell,
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch
deleted file mode 100644
index 62d23556a1..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Upstream-Status: Inappropriate [enable feature]
-
-Index: gtk/gtkcombobox.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkcombobox.c,v
-retrieving revision 1.185
-diff -u -p -r1.185 gtkcombobox.c
---- gtk/gtkcombobox.c	12 Oct 2006 13:48:07 -0000	1.185
-+++ gtk/gtkcombobox.c	1 Nov 2006 19:01:09 -0000
-@@ -756,6 +756,25 @@ gtk_combo_box_class_init (GtkComboBoxCla
-                                                                  FALSE,
-                                                                  GTK_PARAM_READABLE));
- 
-+  /**
-+   * GtkComboBox:arrow-size:
-+   *
-+   * Sets the minimum size of the arrow in the combo box.  Note
-+   * that the arrow size is coupled to the font size, so in case
-+   * a larger font is used, the arrow will be larger than set
-+   * by arrow size.
-+   *
-+   * Since: 2.12
-+   */
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_int ("arrow-size",
-+							     P_("Arrow Size"),
-+							     P_("The minimum size of the arrow in the combo box"),
-+							     0,
-+							     G_MAXINT,
-+							     15,
-+							     GTK_PARAM_READABLE));
-+
-   g_type_class_add_private (object_class, sizeof (GtkComboBoxPrivate));
- }
- 
-@@ -1897,7 +1916,12 @@ gtk_combo_box_size_request (GtkWidget   
- {
-   gint width, height;
-   gint focus_width, focus_pad;
-+  gint font_size;
-+  gint arrow_size;
-   GtkRequisition bin_req;
-+  PangoContext *context;
-+  PangoFontMetrics *metrics;
-+  PangoFontDescription *font_desc;
- 
-   GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
-  
-@@ -1910,7 +1934,20 @@ gtk_combo_box_size_request (GtkWidget   
-   gtk_widget_style_get (GTK_WIDGET (widget),
- 			"focus-line-width", &focus_width,
- 			"focus-padding", &focus_pad,
-+			"arrow-size", &arrow_size,
- 			NULL);
-+
-+  font_desc = GTK_BIN (widget)->child->style->font_desc;
-+  context = gtk_widget_get_pango_context (widget);
-+  metrics = pango_context_get_metrics (context, font_desc,
-+				       pango_context_get_language (context));
-+  font_size = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
-+			    pango_font_metrics_get_descent (metrics));
-+  pango_font_metrics_unref (metrics);
-+
-+  arrow_size = MAX (arrow_size, font_size);
-+
-+  gtk_widget_set_size_request (combo_box->priv->arrow, arrow_size, arrow_size);
- 
-   if (!combo_box->priv->tree_view)
-     {
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch
deleted file mode 100644
index 78903cf4b7..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- gtk+-2.12.0/configure.in~	2006-07-05 18:11:44.000000000 +0200
-+++ gtk+-2.12.0/configure.in	2006-07-05 18:11:44.000000000 +0200
-@@ -1554,22 +1554 @@
--AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
--if test "x$CUPS_CONFIG" != "xno"; then
--  CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
--  CUPS_LIBS=`$CUPS_CONFIG --libs`
--
--  CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
--  CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
--  CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
--
--  if test $CUPS_API_MAJOR -gt 1 -o \
--          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
--    AC_DEFINE(HAVE_CUPS_API_1_2)
--  fi
--
--  AC_SUBST(CUPS_API_MAJOR)
--  AC_SUBST(CUPS_API_MINOR)
--  AC_SUBST(CUPS_CFLAGS)
--  AC_SUBST(CUPS_LIBS)
--
--  AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]]))
--fi
--AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+AM_CONDITIONAL(HAVE_CUPS, false)
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch
deleted file mode 100644
index 3083b77830..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Upstream-Status: Pending
-
-Index: gtk/gtkentry.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
-retrieving revision 1.317
-diff -u -r1.317 gtkentry.c
---- gtk/gtkentry.c	29 Jun 2006 09:18:05 -0000	1.317
-+++ gtk/gtkentry.c	2 Jul 2006 14:14:24 -0000
-@@ -3337,7 +3337,9 @@
-   if (GTK_WIDGET_DRAWABLE (entry))
-     {
-       PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE);
-+#ifdef USE_CAIRO_INTERNALLY
-       cairo_t *cr;
-+#endif
-       gint x, y;
-       gint start_pos, end_pos;
-       
-@@ -3345,23 +3347,35 @@
-       
-       get_layout_position (entry, &x, &y);
- 
-+#ifdef USE_CAIRO_INTERNALLY
-       cr = gdk_cairo_create (entry->text_area);
- 
-       cairo_move_to (cr, x, y);
-       gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]);
-       pango_cairo_show_layout (cr, layout);
-+#else
-+      gdk_draw_layout (entry->text_area, widget->style->text_gc [widget->state],
-+                       x, y,
-+                       layout);
-+#endif
- 
-       if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos))
- 	{
- 	  gint *ranges;
- 	  gint n_ranges, i;
-           PangoRectangle logical_rect;
--	  GdkColor *selection_color, *text_color;
-           GtkBorder inner_border;
-+#ifdef USE_CAIRO_INTERNALLY
-+	  GdkColor *selection_color, *text_color;
-+#else
-+	  GdkGC *selection_gc, *text_gc;
-+          GdkRegion *clip_region;
-+#endif
- 
- 	  pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
- 	  gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges);
- 
-+#ifdef USE_CAIRO_INTERNALLY
- 	  if (GTK_WIDGET_HAS_FOCUS (entry))
- 	    {
- 	      selection_color = &widget->style->base [GTK_STATE_SELECTED];
-@@ -3390,11 +3404,46 @@
- 	  cairo_move_to (cr, x, y);
- 	  gdk_cairo_set_source_color (cr, text_color);
- 	  pango_cairo_show_layout (cr, layout);
--	  
-+#else
-+          if (GTK_WIDGET_HAS_FOCUS (entry))
-+            {
-+              selection_gc = widget->style->base_gc [GTK_STATE_SELECTED];
-+              text_gc = widget->style->text_gc [GTK_STATE_SELECTED];
-+            }
-+          else
-+            {
-+              selection_gc = widget->style->base_gc [GTK_STATE_ACTIVE];
-+              text_gc = widget->style->text_gc [GTK_STATE_ACTIVE];
-+            }
-+
-+          clip_region = gdk_region_new ();
-+          for (i = 0; i < n_ranges; ++i)
-+            {
-+              GdkRectangle rect;
-+
-+              rect.x = inner_border.left - entry->scroll_offset + ranges[2 * i];
-+              rect.y = y;
-+              rect.width = ranges[2 * i + 1];
-+              rect.height = logical_rect.height;
-+
-+              gdk_draw_rectangle (entry->text_area, selection_gc, TRUE,
-+                                  rect.x, rect.y, rect.width, rect.height);
-+
-+              gdk_region_union_with_rect (clip_region, &rect);
-+            }
-+
-+          gdk_gc_set_clip_region (text_gc, clip_region);
-+          gdk_draw_layout (entry->text_area, text_gc,
-+                           x, y,
-+                           layout);
-+          gdk_gc_set_clip_region (text_gc, NULL);
-+          gdk_region_destroy (clip_region);
-+#endif	  
- 	  g_free (ranges);
- 	}
--
-+#ifdef USE_CAIRO_INTERNALLY
-       cairo_destroy (cr);
-+#endif
-     }
- }
- 
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch
deleted file mode 100644
index 816594f5a8..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch
+++ /dev/null
@@ -1,9523 +0,0 @@
-Upstream-Status: Inappropriate [enable feature]
-
-Index: gtk+-2.12.5/gtk/gtkfilechooserdefault.c
-================ ===================================================
---- gtk+-2.12.5/gtk/gtkfilechooserdefault.c	(revision 19337)
-+++ gtk+-2.12.5/gtk/gtkfilechooserdefault.c	(working copy)
-@@ -27,12 +27,12 @@
- #include "gtkcelllayout.h"
- #include "gtkcellrendererpixbuf.h"
- #include "gtkcellrenderertext.h"
-+#include "gtkcellrenderertext.h"
- #include "gtkcheckmenuitem.h"
- #include "gtkclipboard.h"
- #include "gtkcombobox.h"
- #include "gtkentry.h"
- #include "gtkeventbox.h"
--#include "gtkexpander.h"
- #include "gtkfilechooserprivate.h"
- #include "gtkfilechooserdefault.h"
- #include "gtkfilechooserembed.h"
-@@ -53,17 +53,13 @@
- #include "gtkmarshalers.h"
- #include "gtkmenuitem.h"
- #include "gtkmessagedialog.h"
--#include "gtkpathbar.h"
- #include "gtkprivate.h"
- #include "gtkradiobutton.h"
--#include "gtkrecentfilter.h"
--#include "gtkrecentmanager.h"
- #include "gtkscrolledwindow.h"
- #include "gtkseparatormenuitem.h"
- #include "gtksizegroup.h"
- #include "gtkstock.h"
- #include "gtktable.h"
--#include "gtktooltip.h"
- #include "gtktreednd.h"
- #include "gtktreeprivate.h"
- #include "gtktreeselection.h"
-@@ -81,8 +77,6 @@
- #include <errno.h>
- #include <string.h>
- #include <time.h>
--#include <sys/stat.h>
--#include <sys/types.h>
- 
- 
- #ifdef HAVE_UNISTD_H
-@@ -92,6 +86,8 @@
- #include <io.h>
- #endif
- 
-+#define DEFAULT_SPACING 5
-+
- /* Profiling stuff */
- #undef PROFILE_FILE_CHOOSER
- #ifdef PROFILE_FILE_CHOOSER
-@@ -150,6 +145,7 @@
- #define GTK_FILE_CHOOSER_DEFAULT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_CHOOSER_DEFAULT, GtkFileChooserDefaultClass))
- 
- #define MAX_LOADING_TIME 500
-+#define LONG_CLICK_LENGTH 500
- 
- struct _GtkFileChooserDefaultClass
- {
-@@ -163,38 +159,12 @@
-   UP_FOLDER,
-   DOWN_FOLDER,
-   HOME_FOLDER,
--  DESKTOP_FOLDER,
--  QUICK_BOOKMARK,
--  LOCATION_TOGGLE_POPUP,
-   SHOW_HIDDEN,
--  SEARCH_SHORTCUT,
--  RECENT_SHORTCUT,
--
-   LAST_SIGNAL
- };
- 
- static guint signals[LAST_SIGNAL] = { 0 };
- 
--/* Column numbers for the shortcuts tree.  Keep these in sync with shortcuts_model_create() */
--enum {
--  SHORTCUTS_COL_PIXBUF,
--  SHORTCUTS_COL_NAME,
--  SHORTCUTS_COL_DATA,
--  SHORTCUTS_COL_TYPE,
--  SHORTCUTS_COL_REMOVABLE,
--  SHORTCUTS_COL_PIXBUF_VISIBLE,
--  SHORTCUTS_COL_HANDLE,
--  SHORTCUTS_COL_NUM_COLUMNS
--};
--
--typedef enum {
--  SHORTCUT_TYPE_PATH,
--  SHORTCUT_TYPE_VOLUME,
--  SHORTCUT_TYPE_SEPARATOR,
--  SHORTCUT_TYPE_SEARCH,
--  SHORTCUT_TYPE_RECENT
--} ShortcutType;
--
- /* Column numbers for the file list */
- enum {
-   FILE_LIST_COL_NAME,
-@@ -203,100 +173,10 @@
-   FILE_LIST_COL_NUM_COLUMNS
- };
- 
--/* Column numbers for the search model.  
-- * Keep this in sync with search_setup_model() 
-- */
--enum {
--  SEARCH_MODEL_COL_PATH,
--  SEARCH_MODEL_COL_DISPLAY_NAME,
--  SEARCH_MODEL_COL_COLLATION_KEY,
--  SEARCH_MODEL_COL_STAT,
--  SEARCH_MODEL_COL_HANDLE,
--  SEARCH_MODEL_COL_PIXBUF,
--  SEARCH_MODEL_COL_MIME_TYPE,
--  SEARCH_MODEL_COL_IS_FOLDER,
--  SEARCH_MODEL_COL_NUM_COLUMNS
--};
--
--enum {
--  RECENT_MODEL_COL_PATH,
--  RECENT_MODEL_COL_DISPLAY_NAME,
--  RECENT_MODEL_COL_INFO,
--  RECENT_MODEL_COL_IS_FOLDER,
--  RECENT_MODEL_COL_HANDLE,
--  RECENT_MODEL_COL_NUM_COLUMNS
--};
--
--/* Identifiers for target types */
--enum {
--  GTK_TREE_MODEL_ROW,
--  TEXT_URI_LIST
--};
--
--/* Target types for dragging from the shortcuts list */
--static const GtkTargetEntry shortcuts_source_targets[] = {
--  { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, GTK_TREE_MODEL_ROW }
--};
--
--static const int num_shortcuts_source_targets = G_N_ELEMENTS (shortcuts_source_targets); 
--
--/* Target types for dropping into the shortcuts list */
--static const GtkTargetEntry shortcuts_dest_targets[] = {
--  { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, GTK_TREE_MODEL_ROW },
--  { "text/uri-list", 0, TEXT_URI_LIST }
--};
--
--static const int num_shortcuts_dest_targets = G_N_ELEMENTS (shortcuts_dest_targets); 
--
--/* Target types for DnD from the file list */
--static const GtkTargetEntry file_list_source_targets[] = {
--  { "text/uri-list", 0, TEXT_URI_LIST }
--};
--
--static const int num_file_list_source_targets = G_N_ELEMENTS (file_list_source_targets); 
--
--/* Target types for dropping into the file list */
--static const GtkTargetEntry file_list_dest_targets[] = {
--  { "text/uri-list", 0, TEXT_URI_LIST }
--};
--
--static const int num_file_list_dest_targets = G_N_ELEMENTS (file_list_dest_targets); 
--
--/* Target types for dragging from the recent files list */
--static const GtkTargetEntry recent_list_source_targets[] = {
--  { "text/uri-list", 0, TEXT_URI_LIST }
--};
--
--static const int num_recent_list_source_targets = G_N_ELEMENTS (recent_list_source_targets);
--
--static gboolean
--search_is_possible (GtkFileChooserDefault *impl)
--{
--  if (impl->search_engine == NULL)
--    impl->search_engine = _gtk_search_engine_new ();
--  
--  return impl->search_engine != NULL;
--}
--
--/* Interesting places in the shortcuts bar */
--typedef enum {
--  SHORTCUTS_SEARCH,
--  SHORTCUTS_RECENT,
--  SHORTCUTS_RECENT_SEPARATOR,
--  SHORTCUTS_HOME,
--  SHORTCUTS_DESKTOP,
--  SHORTCUTS_VOLUMES,
--  SHORTCUTS_SHORTCUTS,
--  SHORTCUTS_BOOKMARKS_SEPARATOR,
--  SHORTCUTS_BOOKMARKS,
--  SHORTCUTS_CURRENT_FOLDER_SEPARATOR,
--  SHORTCUTS_CURRENT_FOLDER
--} ShortcutsIndex;
--
- /* Icon size for if we can't get it from the theme */
--#define FALLBACK_ICON_SIZE 16
-+#define FALLBACK_ICON_SIZE 24
- 
--#define PREVIEW_HBOX_SPACING 12
-+#define LIST_HBOX_SPACING DEFAULT_SPACING
- #define NUM_LINES 45
- #define NUM_CHARS 60
- 
-@@ -369,52 +248,17 @@
- static gboolean       gtk_file_chooser_default_should_respond         (GtkFileChooserEmbed *chooser_embed);
- static void           gtk_file_chooser_default_initial_focus          (GtkFileChooserEmbed *chooser_embed);
- 
--static void location_popup_handler  (GtkFileChooserDefault *impl,
--				     const gchar           *path);
--static void location_popup_on_paste_handler (GtkFileChooserDefault *impl);
--static void location_toggle_popup_handler   (GtkFileChooserDefault *impl);
--static void up_folder_handler       (GtkFileChooserDefault *impl);
--static void down_folder_handler     (GtkFileChooserDefault *impl);
--static void home_folder_handler     (GtkFileChooserDefault *impl);
--static void desktop_folder_handler  (GtkFileChooserDefault *impl);
--static void quick_bookmark_handler  (GtkFileChooserDefault *impl,
--				     gint                   bookmark_index);
--static void show_hidden_handler     (GtkFileChooserDefault *impl);
--static void search_shortcut_handler (GtkFileChooserDefault *impl);
--static void recent_shortcut_handler (GtkFileChooserDefault *impl);
--static void update_appearance       (GtkFileChooserDefault *impl);
-+static void up_folder_handler      (GtkFileChooserDefault *impl);
-+static void down_folder_handler    (GtkFileChooserDefault *impl);
-+static void home_folder_handler    (GtkFileChooserDefault *impl);
-+static void show_hidden_handler    (GtkFileChooserDefault *impl);
-+static void update_appearance      (GtkFileChooserDefault *impl);
- 
--static void set_current_filter   (GtkFileChooserDefault *impl,
--				  GtkFileFilter         *filter);
--static void check_preview_change (GtkFileChooserDefault *impl);
--
- static void filter_combo_changed       (GtkComboBox           *combo_box,
- 					GtkFileChooserDefault *impl);
--static void     shortcuts_row_activated_cb (GtkTreeView           *tree_view,
--					    GtkTreePath           *path,
--					    GtkTreeViewColumn     *column,
--					    GtkFileChooserDefault *impl);
- 
--static gboolean shortcuts_key_press_event_cb (GtkWidget             *widget,
--					      GdkEventKey           *event,
--					      GtkFileChooserDefault *impl);
--
--static gboolean shortcuts_select_func   (GtkTreeSelection      *selection,
--					 GtkTreeModel          *model,
--					 GtkTreePath           *path,
--					 gboolean               path_currently_selected,
--					 gpointer               data);
--static gboolean shortcuts_get_selected  (GtkFileChooserDefault *impl,
--					 GtkTreeIter           *iter);
--static void shortcuts_activate_iter (GtkFileChooserDefault *impl,
--				     GtkTreeIter           *iter);
--static int shortcuts_get_index (GtkFileChooserDefault *impl,
--				ShortcutsIndex         where);
--static int shortcut_find_position (GtkFileChooserDefault *impl,
--				   const GtkFilePath     *path);
--
--static void bookmarks_check_add_sensitivity (GtkFileChooserDefault *impl);
--
-+static void set_current_filter   (GtkFileChooserDefault *impl,
-+				  GtkFileFilter         *filter);
- static gboolean list_select_func   (GtkTreeSelection      *selection,
- 				    GtkTreeModel          *model,
- 				    GtkTreePath           *path,
-@@ -433,19 +277,6 @@
- 			 GtkTreeIter        *iter,
- 			 gpointer            user_data);
- 
--static void path_bar_clicked (GtkPathBar            *path_bar,
--                              GtkFilePath           *file_path,
--                              GtkFilePath           *child_path,
--                              gboolean               child_is_hidden,
--                              GtkFileChooserDefault *impl);
--
--static void add_bookmark_button_clicked_cb    (GtkButton             *button,
--					       GtkFileChooserDefault *impl);
--static void remove_bookmark_button_clicked_cb (GtkButton             *button,
--					       GtkFileChooserDefault *impl);
--static void save_folder_combo_changed_cb      (GtkComboBox           *combo,
--					       GtkFileChooserDefault *impl);
--
- static void list_icon_data_func (GtkTreeViewColumn *tree_column,
- 				 GtkCellRenderer   *cell,
- 				 GtkTreeModel      *tree_model,
-@@ -477,115 +308,8 @@
- 
- static void location_button_toggled_cb (GtkToggleButton *toggle,
- 					GtkFileChooserDefault *impl);
--static void location_switch_to_path_bar (GtkFileChooserDefault *impl);
-+static void settings_load               (GtkFileChooserDefault *impl);
- 
--static void     search_stop_searching        (GtkFileChooserDefault *impl,
--                                              gboolean               remove_query);
--static void     search_clear_model           (GtkFileChooserDefault *impl, 
--					      gboolean               remove_from_treeview);
--static gboolean search_should_respond        (GtkFileChooserDefault *impl);
--static void     search_switch_to_browse_mode (GtkFileChooserDefault *impl);
--static GSList  *search_get_selected_paths    (GtkFileChooserDefault *impl);
--static void     search_entry_activate_cb     (GtkEntry              *entry, 
--					      gpointer               data);
--static void     settings_load                (GtkFileChooserDefault *impl);
--static void     search_get_valid_child_iter  (GtkFileChooserDefault *impl,
--                                              GtkTreeIter           *child_iter,
--                                              GtkTreeIter           *iter);
--
--static void     recent_manager_update        (GtkFileChooserDefault *impl);
--static void     recent_stop_loading          (GtkFileChooserDefault *impl);
--static void     recent_clear_model           (GtkFileChooserDefault *impl,
--                                              gboolean               remove_from_treeview);
--static gboolean recent_should_respond        (GtkFileChooserDefault *impl);
--static void     recent_switch_to_browse_mode (GtkFileChooserDefault *impl);
--static GSList * recent_get_selected_paths    (GtkFileChooserDefault *impl);
--static void     recent_get_valid_child_iter  (GtkFileChooserDefault *impl,
--                                              GtkTreeIter           *child_iter,
--                                              GtkTreeIter           *iter);
--
--
--
--
--/* Drag and drop interface declarations */
--
--typedef struct {
--  GtkTreeModelFilter parent;
--
--  GtkFileChooserDefault *impl;
--} ShortcutsPaneModelFilter;
--
--typedef struct {
--  GtkTreeModelFilterClass parent_class;
--} ShortcutsPaneModelFilterClass;
--
--#define SHORTCUTS_PANE_MODEL_FILTER_TYPE (_shortcuts_pane_model_filter_get_type ())
--#define SHORTCUTS_PANE_MODEL_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHORTCUTS_PANE_MODEL_FILTER_TYPE, ShortcutsPaneModelFilter))
--
--static void shortcuts_pane_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface);
--
--G_DEFINE_TYPE_WITH_CODE (ShortcutsPaneModelFilter,
--			 _shortcuts_pane_model_filter,
--			 GTK_TYPE_TREE_MODEL_FILTER,
--			 G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
--						shortcuts_pane_model_filter_drag_source_iface_init))
--
--static GtkTreeModel *shortcuts_pane_model_filter_new (GtkFileChooserDefault *impl,
--						      GtkTreeModel          *child_model,
--						      GtkTreePath           *root);
--
--
--typedef struct {
--  GtkTreeModelSort parent;
--
--  GtkFileChooserDefault *impl;
--} RecentModelSort;
--
--typedef struct {
--  GtkTreeModelSortClass parent_class;
--} RecentModelSortClass;
--
--#define RECENT_MODEL_SORT_TYPE (_recent_model_sort_get_type ())
--#define RECENT_MODEL_SORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RECENT_MODEL_SORT_TYPE, RecentModelSort))
--
--static void recent_model_sort_drag_source_iface_init (GtkTreeDragSourceIface *iface);
--
--G_DEFINE_TYPE_WITH_CODE (RecentModelSort,
--                         _recent_model_sort,
--                         GTK_TYPE_TREE_MODEL_SORT,
--                         G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
--                                                recent_model_sort_drag_source_iface_init));
--
--static GtkTreeModel *recent_model_sort_new (GtkFileChooserDefault *impl,
--                                            GtkTreeModel          *child_model);
--
--
--typedef struct {
--  GtkTreeModelSort parent;
--
--  GtkFileChooserDefault *impl;
--} SearchModelSort;
--
--typedef struct {
--  GtkTreeModelSortClass parent_class;
--} SearchModelSortClass;
--
--#define SEARCH_MODEL_SORT_TYPE (_search_model_sort_get_type ())
--#define SEARCH_MODEL_SORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEARCH_MODEL_SORT_TYPE, SearchModelSort))
--
--static void search_model_sort_drag_source_iface_init (GtkTreeDragSourceIface *iface);
--
--G_DEFINE_TYPE_WITH_CODE (SearchModelSort,
--                         _search_model_sort,
--                         GTK_TYPE_TREE_MODEL_SORT,
--                         G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
--                                                search_model_sort_drag_source_iface_init));
--
--static GtkTreeModel *search_model_sort_new (GtkFileChooserDefault *impl,
--                                            GtkTreeModel          *child_model);
--
--
--
- G_DEFINE_TYPE_WITH_CODE (GtkFileChooserDefault, _gtk_file_chooser_default, GTK_TYPE_VBOX,
- 			 G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_CHOOSER,
- 						gtk_file_chooser_default_iface_init)
-@@ -595,13 +319,9 @@
- static void
- _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
- {
--  static const guint quick_bookmark_keyvals[10] = {
--    GDK_1, GDK_2, GDK_3, GDK_4, GDK_5, GDK_6, GDK_7, GDK_8, GDK_9, GDK_0
--  };
-   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-   GtkBindingSet *binding_set;
--  int i;
- 
-   gobject_class->finalize = gtk_file_chooser_default_finalize;
-   gobject_class->constructor = gtk_file_chooser_default_constructor;
-@@ -621,7 +341,7 @@
-     _gtk_binding_signal_new (I_("location-popup"),
- 			     G_OBJECT_CLASS_TYPE (class),
- 			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
--			     G_CALLBACK (location_popup_handler),
-+			     NULL,
- 			     NULL, NULL,
- 			     _gtk_marshal_VOID__STRING,
- 			     G_TYPE_NONE, 1, G_TYPE_STRING);
-@@ -629,18 +349,10 @@
-     _gtk_binding_signal_new ("location-popup-on-paste",
- 			     G_OBJECT_CLASS_TYPE (class),
- 			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
--			     G_CALLBACK (location_popup_on_paste_handler),
-+			     NULL,
- 			     NULL, NULL,
- 			     _gtk_marshal_VOID__VOID,
- 			     G_TYPE_NONE, 0);
--  signals[LOCATION_TOGGLE_POPUP] =
--    _gtk_binding_signal_new (I_("location-toggle-popup"),
--			     G_OBJECT_CLASS_TYPE (class),
--			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
--			     G_CALLBACK (location_toggle_popup_handler),
--			     NULL, NULL,
--			     _gtk_marshal_VOID__VOID,
--			     G_TYPE_NONE, 0);
-   signals[UP_FOLDER] =
-     _gtk_binding_signal_new (I_("up-folder"),
- 			     G_OBJECT_CLASS_TYPE (class),
-@@ -665,22 +377,6 @@
- 			     NULL, NULL,
- 			     _gtk_marshal_VOID__VOID,
- 			     G_TYPE_NONE, 0);
--  signals[DESKTOP_FOLDER] =
--    _gtk_binding_signal_new (I_("desktop-folder"),
--			     G_OBJECT_CLASS_TYPE (class),
--			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
--			     G_CALLBACK (desktop_folder_handler),
--			     NULL, NULL,
--			     _gtk_marshal_VOID__VOID,
--			     G_TYPE_NONE, 0);
--  signals[QUICK_BOOKMARK] =
--    _gtk_binding_signal_new (I_("quick-bookmark"),
--			     G_OBJECT_CLASS_TYPE (class),
--			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
--			     G_CALLBACK (quick_bookmark_handler),
--			     NULL, NULL,
--			     _gtk_marshal_VOID__INT,
--			     G_TYPE_NONE, 1, G_TYPE_INT);
-   signals[SHOW_HIDDEN] =
-     _gtk_binding_signal_new ("show-hidden",
- 			     G_OBJECT_CLASS_TYPE (class),
-@@ -689,22 +385,6 @@
- 			     NULL, NULL,
- 			     _gtk_marshal_VOID__VOID,
- 			     G_TYPE_NONE, 0);
--  signals[SEARCH_SHORTCUT] =
--    _gtk_binding_signal_new ("search-shortcut",
--                             G_OBJECT_CLASS_TYPE (class),
--                             G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
--                             G_CALLBACK (search_shortcut_handler),
--                             NULL, NULL,
--                             _gtk_marshal_VOID__VOID,
--                             G_TYPE_NONE, 0);
--  signals[RECENT_SHORTCUT] =
--    _gtk_binding_signal_new ("recent-shortcut",
--                             G_OBJECT_CLASS_TYPE (class),
--                             G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
--                             G_CALLBACK (recent_shortcut_handler),
--                             NULL, NULL,
--                             _gtk_marshal_VOID__VOID,
--                             G_TYPE_NONE, 0);
- 
-   binding_set = gtk_binding_set_by_class (class);
- 
-@@ -764,29 +444,11 @@
- 				"home-folder",
- 				0);
-   gtk_binding_entry_add_signal (binding_set,
--				GDK_d, GDK_MOD1_MASK,
--				"desktop-folder",
--				0);
--  gtk_binding_entry_add_signal (binding_set,
- 				GDK_h, GDK_CONTROL_MASK,
-                                 "show-hidden",
-                                 0);
--  gtk_binding_entry_add_signal (binding_set,
--                                GDK_s, GDK_MOD1_MASK,
--                                "search-shortcut",
--                                0);
--  gtk_binding_entry_add_signal (binding_set,
--                                GDK_r, GDK_MOD1_MASK,
--                                "recent-shortcut",
--                                0);
- 
--  for (i = 0; i < 10; i++)
--    gtk_binding_entry_add_signal (binding_set,
--				  quick_bookmark_keyvals[i], GDK_MOD1_MASK,
--				  "quick-bookmark",
--				  1, G_TYPE_INT, i);
--
-   _gtk_file_chooser_install_properties (gobject_class);
- }
- 
- static void
-@@ -797,7 +465,6 @@
-   iface->select_all = gtk_file_chooser_default_select_all;
-   iface->unselect_all = gtk_file_chooser_default_unselect_all;
-   iface->get_paths = gtk_file_chooser_default_get_paths;
--  iface->get_preview_path = gtk_file_chooser_default_get_preview_path;
-   iface->get_file_system = gtk_file_chooser_default_get_file_system;
-   iface->set_current_folder = gtk_file_chooser_default_set_current_folder;
-   iface->get_current_folder = gtk_file_chooser_default_get_current_folder;
-@@ -805,9 +472,12 @@
-   iface->add_filter = gtk_file_chooser_default_add_filter;
-   iface->remove_filter = gtk_file_chooser_default_remove_filter;
-   iface->list_filters = gtk_file_chooser_default_list_filters;
-+
-+  /* these are only stubs */
-+  iface->get_preview_path = gtk_file_chooser_default_get_preview_path;
-   iface->add_shortcut_folder = gtk_file_chooser_default_add_shortcut_folder;
-   iface->remove_shortcut_folder = gtk_file_chooser_default_remove_shortcut_folder;
--  iface->list_shortcut_folders = gtk_file_chooser_default_list_shortcut_folders;
-+
- }
- 
- static void
-@@ -827,87 +497,29 @@
-   access ("MARK: *** CREATE FILE CHOOSER", F_OK);
- #endif
-   impl->local_only = TRUE;
--  impl->preview_widget_active = TRUE;
--  impl->use_preview_label = TRUE;
-   impl->select_multiple = FALSE;
-   impl->show_hidden = FALSE;
-+  impl->show_create_folder = TRUE;
-   impl->icon_size = FALLBACK_ICON_SIZE;
-   impl->load_state = LOAD_EMPTY;
-   impl->reload_state = RELOAD_EMPTY;
-   impl->pending_select_paths = NULL;
--  impl->location_mode = LOCATION_MODE_PATH_BAR;
--  impl->operation_mode = OPERATION_MODE_BROWSE;
-+  impl->location_mode = LOCATION_MODE_FILENAME_ENTRY;
-+  impl->path_h