[gtk+] Revert "gtkplacessidebar: add open flags to other locations"
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "gtkplacessidebar: add open flags to other locations"
- Date: Sat, 5 Mar 2016 01:16:06 +0000 (UTC)
commit fec0c4c201cc26f6b43c64e5e8e844f8a553527b
Author: Carlos Soriano <csoriano gnome org>
Date: Mon Feb 29 22:12:03 2016 +0100
Revert "gtkplacessidebar: add open flags to other locations"
This reverts commit 63a204e1c5b6c since it broke the API.
We will add a new signal instead in an upcomming patch.
https://bugzilla.gnome.org/show_bug.cgi?id=754743
README.in | 5 -----
gtk/gtkfilechooserwidget.c | 1 -
gtk/gtkplacessidebar.c | 15 ++++-----------
3 files changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/README.in b/README.in
index 1b2116d..4164926 100644
--- a/README.in
+++ b/README.in
@@ -110,11 +110,6 @@ Release notes for 3.20
However, all previously existing objects still derive from GtkWidget,
so no existing code should break.
-* The GtkPlacesSidebar added a GtkPlacesOpenFlags parameter to the
- other-locations signal in order to allow opening new windows or
- tabs as done with other locations. This breaks the API for those
- using the other-locations signal.
-
* The way in which GtkLevelBar determines the offset to apply was
a bit inconsistent in the past; this has been fixed. Applications
that are using custom offsets should double-check that their
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 1552c6e..74d224e 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -2832,7 +2832,6 @@ location_mode_set (GtkFileChooserWidget *impl,
/* Callback used when the places sidebar asks us to show other locations */
static void
places_sidebar_show_other_locations_cb (GtkPlacesSidebar *sidebar,
- GtkPlacesOpenFlags open_flags,
GtkFileChooserWidget *impl)
{
GtkFileChooserWidgetPrivate *priv = impl->priv;
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 4b330e8..91f958f 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -341,11 +341,9 @@ emit_show_enter_location (GtkPlacesSidebar *sidebar)
}
static void
-emit_show_other_locations (GtkPlacesSidebar *sidebar,
- GtkPlacesOpenFlags open_flags)
+emit_show_other_locations (GtkPlacesSidebar *sidebar)
{
- g_signal_emit (sidebar, places_sidebar_signals[SHOW_OTHER_LOCATIONS], 0,
- open_flags);
+ g_signal_emit (sidebar, places_sidebar_signals[SHOW_OTHER_LOCATIONS], 0);
}
static void
@@ -2324,7 +2322,7 @@ open_row (GtkSidebarRow *row,
NULL);
if (place_type == PLACES_OTHER_LOCATIONS)
- emit_show_other_locations (sidebar, open_flags);
+ emit_show_other_locations (sidebar);
else if (uri != NULL)
open_uri (sidebar, uri, open_flags);
else if (place_type == PLACES_CONNECT_TO_SERVER)
@@ -4328,16 +4326,12 @@ gtk_places_sidebar_class_init (GtkPlacesSidebarClass *class)
/**
* GtkPlacesSidebar::show-other-locations:
* @sidebar: the object which received the signal.
- * @open_flags: a single value from #GtkPlacesOpenFlags specifying how it should be opened.
*
* The places sidebar emits this signal when it needs the calling
* application to present a way to show other locations e.g. drives
* and network access points.
* For example, the application may bring up a page showing persistent
* volumes and discovered network addresses.
- * Since 3.20 the signal added the @open_flags parameter in order to be able
- * to specify whether the user choose to open the other locations in a different
- * tab or window. In this way it behaves like the open-location signal.
*
* Since: 3.18
*/
@@ -4348,8 +4342,7 @@ gtk_places_sidebar_class_init (GtkPlacesSidebarClass *class)
G_STRUCT_OFFSET (GtkPlacesSidebarClass, show_other_locations),
NULL, NULL,
_gtk_marshal_VOID__VOID,
- G_TYPE_NONE, 1,
- GTK_TYPE_PLACES_OPEN_FLAGS);
+ G_TYPE_NONE, 0);
/**
* GtkPlacesSidebar::mount:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]