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

[Federico Mena Quintero <federico src gnome org>]

commit d9b9ba5da0a89f205bf4ed97df67f0c1c5d2c748
Merge: 8ca13c4 0c1423d
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Apr 23 13:58:09 2013 -0400

    Merge branch 'places-sidebar'

 gtk/glade/gtk-private-widgets.xml |    2 --
 gtk/gtkplacessidebar.c            |   12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --cc gtk/glade/gtk-private-widgets.xml
index 4707a6b,1a65e25..8ce3dfa
--- a/gtk/glade/gtk-private-widgets.xml
+++ b/gtk/glade/gtk-private-widgets.xml
@@@ -29,7 -30,7 +28,6 @@@
      <glade-widget-class-ref name="GtkColorPlane"/>
      <glade-widget-class-ref name="GtkColorScale"/>
      <glade-widget-class-ref name="GtkScaleButtonScale"/>
 -    <glade-widget-class-ref name="ShortcutsPaneModelFilter"/>
      <glade-widget-class-ref name="GtkPrinterOptionWidget"/>
-     <glade-widget-class-ref name="GtkPlacesSidebar"/>
    </glade-widget-group>
  </glade-catalog>