[gtk+: 195/195] Merge branch 'merge-places-sidebar'

[Federico Mena Quintero <federico src gnome org>]

commit 3b3eb4bdbc90ee6df387ba8d8fe061f5956ca442
Merge: e3a22b3 a6f9ef0
Author: Federico Mena Quintero <federico gnome org>
Date:   Mon Apr 15 19:29:37 2013 -0500

    Merge branch 'merge-places-sidebar'
    
    This is the new GtkPlacesSidebar widget, which is the sidebar used in
    GtkFileChooser to display a list of places/folders that the user may
    want to use.  File managers are encouraged to use this widget for
    their own global list of folders.

 docs/reference/gtk/gtk-docs.sgml             |    1 +
 docs/reference/gtk/gtk3-sections.txt         |   26 +
 gtk/Makefile.am                              |    6 +
 gtk/glade/gtk-private-widgets.xml            |    2 +
 gtk/gtk-default.css                          |    7 +
 gtk/gtk.h                                    |    1 +
 gtk/gtkbookmarksmanager.c                    |  596 +++
 gtk/gtkbookmarksmanager.h                    |   91 +
 gtk/gtkfilechooser.c                         |    5 +-
 gtk/gtkfilechooserbutton.c                   |   35 +-
 gtk/gtkfilechooserdefault.c                  | 5790 ++++++++------------------
 gtk/gtkfilechooserdefault.ui                 |  158 +-
 gtk/gtkfilechooserdialog.c                   |    8 +
 gtk/gtkfilechooserprivate.h                  |   55 +-
 gtk/gtkfilechooserwidget.c                   |   17 +-
 gtk/gtkfilesystem.c                          |  433 --
 gtk/gtkfilesystem.h                          |   20 -
 gtk/gtkgladecatalog.c                        |    2 -
 gtk/gtkmarshalers.list                       |    8 +
 gtk/gtkplacessidebar.c                       | 4335 +++++++++++++++++++
 gtk/gtkplacessidebar.h                       |  100 +
 gtk/gtktrashmonitor.c                        |  267 ++
 gtk/gtktrashmonitor.h                        |   48 +
 gtk/org.gtk.Settings.FileChooser.gschema.xml |    8 +
 gtk/tests/filechooser.c                      |    1 -
 po/POTFILES.in                               |    1 +
 26 files changed, 7168 insertions(+), 4853 deletions(-)
---