summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-07-09 01:48:33 -0400
committerMatthias Clasen <mclasen@redhat.com>2020-07-09 01:48:33 -0400
commite31bacf7be3dcc5295c89f8e929b53636976ebaa (patch)
treeabb75fd028001254c86dbca91172c445565d2037
parent911ae649311c0a8c955793d14a35324f85eaa4a4 (diff)
downloadgtk+-e31bacf7be3dcc5295c89f8e929b53636976ebaa.tar.gz
filechooser: Drop the ::current-folder-changed signal
This signal does not work on native file choosers, and it exposes internals of the widget that should not be public. And it is just not very interesting.
-rw-r--r--gtk/gtkfilechooser.c24
-rw-r--r--gtk/gtkfilechooserbutton.c3
-rw-r--r--gtk/gtkfilechoosernative.c1
-rw-r--r--gtk/gtkfilechooserutils.c11
-rw-r--r--gtk/gtkfilechooserwidget.c2
-rw-r--r--tests/testfilechooser.c21
-rw-r--r--tests/testfilechooserbutton.c23
7 files changed, 0 insertions, 85 deletions
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index c201c9bc97..9248b0ecca 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -82,30 +82,6 @@ gtk_file_chooser_default_init (GtkFileChooserInterface *iface)
GType iface_type = G_TYPE_FROM_INTERFACE (iface);
/**
- * GtkFileChooser::current-folder-changed:
- * @chooser: the object which received the signal.
- *
- * This signal is emitted when the current folder in a #GtkFileChooser
- * changes. This can happen due to the user performing some action that
- * changes folders, such as selecting a bookmark or visiting a folder on the
- * file list. It can also happen as a result of calling a function to
- * explicitly change the current folder in a file chooser.
- *
- * Normally you do not need to connect to this signal, unless you need to keep
- * track of which folder a file chooser is showing.
- *
- * See also: gtk_file_chooser_set_current_folder(),
- * gtk_file_chooser_get_current_folder(),
- */
- g_signal_new (I_("current-folder-changed"),
- iface_type,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkFileChooserIface, current_folder_changed),
- NULL, NULL,
- NULL,
- G_TYPE_NONE, 0);
-
- /**
* GtkFileChooser::selection-changed:
* @chooser: the object which received the signal.
*
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index c8d24fdb33..cf63e745b6 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -645,8 +645,6 @@ gtk_file_chooser_button_set_current_folder (GtkFileChooser *chooser,
update_combo_box (button);
- g_signal_emit_by_name (button, "current-folder-changed");
-
if (button->active)
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (button->chooser), file, NULL);
@@ -2519,7 +2517,6 @@ common_response_cb (GtkFileChooserButton *button,
{
save_inactive_state (button);
- g_signal_emit_by_name (button, "current-folder-changed");
g_signal_emit_by_name (button, "selection-changed");
}
else
diff --git a/gtk/gtkfilechoosernative.c b/gtk/gtkfilechoosernative.c
index 203206956f..6dfd296002 100644
--- a/gtk/gtkfilechoosernative.c
+++ b/gtk/gtkfilechoosernative.c
@@ -160,7 +160,6 @@
*
* There is no support for the signals that are emitted when the user
* navigates in the dialog, including:
- * * #GtkFileChooser::current-folder-changed
* * #GtkFileChooser::selection-changed
*
* If you need any of the above you will have to use #GtkFileChooserDialog directly.
diff --git a/gtk/gtkfilechooserutils.c b/gtk/gtkfilechooserutils.c
index 48c55514d8..b68fe534ff 100644
--- a/gtk/gtkfilechooserutils.c
+++ b/gtk/gtkfilechooserutils.c
@@ -56,8 +56,6 @@ static GListModel * delegate_get_shortcut_folders (GtkFileChooser *choose
static void delegate_notify (GObject *object,
GParamSpec *pspec,
gpointer data);
-static void delegate_current_folder_changed (GtkFileChooser *chooser,
- gpointer data);
static void delegate_selection_changed (GtkFileChooser *chooser,
gpointer data);
@@ -166,8 +164,6 @@ _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
g_object_set_data (G_OBJECT (receiver), I_("gtk-file-chooser-delegate"), delegate);
g_signal_connect (delegate, "notify",
G_CALLBACK (delegate_notify), receiver);
- g_signal_connect (delegate, "current-folder-changed",
- G_CALLBACK (delegate_current_folder_changed), receiver);
g_signal_connect (delegate, "selection-changed",
G_CALLBACK (delegate_selection_changed), receiver);
}
@@ -318,13 +314,6 @@ delegate_selection_changed (GtkFileChooser *chooser,
g_signal_emit_by_name (data, "selection-changed");
}
-static void
-delegate_current_folder_changed (GtkFileChooser *chooser,
- gpointer data)
-{
- g_signal_emit_by_name (data, "current-folder-changed");
-}
-
GSettings *
_gtk_file_chooser_get_settings_for_widget (GtkWidget *widget)
{
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 02aeb643d7..01443dcba7 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -5084,8 +5084,6 @@ update_current_folder_get_info_cb (GCancellable *cancellable,
g_object_notify (G_OBJECT (impl), "subtitle");
- g_signal_emit_by_name (impl, "current-folder-changed", 0);
-
g_signal_emit_by_name (impl, "selection-changed", 0);
out:
diff --git a/tests/testfilechooser.c b/tests/testfilechooser.c
index d5eef8aeda..6e8359a92a 100644
--- a/tests/testfilechooser.c
+++ b/tests/testfilechooser.c
@@ -42,25 +42,6 @@ static GtkWidget *preview_image;
static GtkFileChooserAction action;
static void
-print_current_folder (GtkFileChooser *chooser)
-{
- GFile *cwd;
-
- cwd = gtk_file_chooser_get_current_folder (chooser);
- if (cwd != NULL)
- {
- char *uri = g_file_get_uri (cwd);
- g_print ("Current folder changed :\n %s\n", uri ? uri : "(null)");
- g_free (uri);
- g_object_unref (cwd);
- }
- else
- {
- g_print ("Current folder changed :\n none\n");
- }
-}
-
-static void
print_selected (GtkFileChooser *chooser)
{
GListModel *files = gtk_file_chooser_get_files (chooser);
@@ -345,8 +326,6 @@ main (int argc, char **argv)
g_signal_connect (dialog, "selection-changed",
G_CALLBACK (print_selected), NULL);
- g_signal_connect (dialog, "current-folder-changed",
- G_CALLBACK (print_current_folder), NULL);
g_signal_connect (dialog, "response",
G_CALLBACK (response_cb), &done);
diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c
index d0bc7f75d7..01844b112c 100644
--- a/tests/testfilechooserbutton.c
+++ b/tests/testfilechooserbutton.c
@@ -148,27 +148,6 @@ tests_button_clicked_cb (GtkButton *real_button,
}
static void
-chooser_current_folder_changed_cb (GtkFileChooser *chooser,
- gpointer user_data)
-{
- GFile *folder, *filename;
- char *folder_uri, *filename_uri;
-
- folder = gtk_file_chooser_get_current_folder (chooser);
- filename = gtk_file_chooser_get_file (chooser);
-
- folder_uri = g_file_get_uri (folder);
- filename_uri = g_file_get_uri (filename);
- g_message ("%s::current-folder-changed\n\tFolder: `%s'\n\tFilename: `%s'\nDone.\n",
- G_OBJECT_TYPE_NAME (chooser), folder_uri, filename_uri);
- g_free (folder_uri);
- g_free (filename_uri);
-
- g_object_unref (folder);
- g_object_unref (filename);
-}
-
-static void
chooser_selection_changed_cb (GtkFileChooser *chooser,
gpointer user_data)
{
@@ -214,8 +193,6 @@ add_new_filechooser_button (const gchar *mnemonic,
g_object_unref (path);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser);
- g_signal_connect (chooser, "current-folder-changed",
- G_CALLBACK (chooser_current_folder_changed_cb), NULL);
g_signal_connect (chooser, "selection-changed", G_CALLBACK (chooser_selection_changed_cb), NULL);
gtk_box_append (GTK_BOX (hbox), chooser);