[nautilus/gnome-3-20] window: update sidebar other-location signal

[Carlos Soriano Sánchez <csoriano src gnome org>]

commit ff0506fc841db7aebd6f68916622d4257ca6a76a
Author: Carlos Soriano <csoriano gnome org>
Date:   Mon Mar 7 13:49:57 2016 +0100

    window: update sidebar other-location signal
    
    We reverted the change of the signal in gtk+ and added a new one
    to avoid breaking API.
    Use the new signal.

 src/nautilus-window.c               |    6 +++---
 src/resources/ui/nautilus-window.ui |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index f988bad..ff06825 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1037,8 +1037,8 @@ places_sidebar_show_error_message_cb (GtkPlacesSidebar *sidebar,
 }
 
 static void
-places_sidebar_show_other_locations (NautilusWindow   *window,
-                                     GtkPlacesOpenFlags open_flags)
+places_sidebar_show_other_locations_with_flags (NautilusWindow     *window,
+                                                GtkPlacesOpenFlags  open_flags)
 {
         GFile *location;
 
@@ -2596,7 +2596,7 @@ nautilus_window_class_init (NautilusWindowClass *class)
        gtk_widget_class_bind_template_child_private (wclass, NautilusWindow, notification_operation_open);
        gtk_widget_class_bind_template_child_private (wclass, NautilusWindow, notification_operation_close);
 
-        gtk_widget_class_bind_template_callback (wclass, places_sidebar_show_other_locations);
+        gtk_widget_class_bind_template_callback (wclass, places_sidebar_show_other_locations_with_flags);
 
        properties[PROP_DISABLE_CHROME] =
                g_param_spec_boolean ("disable-chrome",
diff --git a/src/resources/ui/nautilus-window.ui b/src/resources/ui/nautilus-window.ui
index b23e3a5..64bd8ea 100644
--- a/src/resources/ui/nautilus-window.ui
+++ b/src/resources/ui/nautilus-window.ui
@@ -34,7 +34,7 @@
                     <property name="visible">True</property>
                     <property name="populate-all">True</property>
                     <property name="show-other-locations">True</property>
-                    <signal name="show-other-locations" handler="places_sidebar_show_other_locations" 
object="NautilusWindow" swapped="yes" />
+                    <signal name="show-other-locations-with-flags" 
handler="places_sidebar_show_other_locations_with_flags" object="NautilusWindow" swapped="yes" />
                   </object>
                   <packing>
                     <property name="pack_type">start</property>