AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

filechooserwidget: Reduce code duplication for disconnecting settings signal

Browse Source 
Instead of getting current display before calling settings signal removal,
do it inside remove function and only if there is a signal connection to remove.
This commit is contained in:
Rafał Dzięgiel 2021-04-01 09:36:19 +02:00
parent 13c22e4e2f
commit 2e65416270
No known key found for this signature in database
GPG Key ID: E822910AA836E1B1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkfilechooserwidget.c
View File

@ -3084,14 +3084,13 @@ cancel_all_operations (GtkFileChooserWidget *impl)
/* Removes the settings signal handler. It's safe to call multiple times */
static void
remove_settings_signal (GtkFileChooserWidget *impl,
GdkDisplay *display)
remove_settings_signal (GtkFileChooserWidget *impl)
{
if (impl->settings_signal_id)
{
GtkSettings *settings;
GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (impl));
GtkSettings *settings = gtk_settings_get_for_display (display);
settings = gtk_settings_get_for_display (display);
g_signal_handler_disconnect (settings,
impl->settings_signal_id);
impl->settings_signal_id = 0;
@ -3115,7 +3114,7 @@ gtk_file_chooser_widget_dispose (GObject *object)
location_entry_disconnect (impl);
impl->external_entry = NULL;
}
remove_settings_signal (impl, gtk_widget_get_display (GTK_WIDGET (impl)));
remove_settings_signal (impl);
g_clear_pointer (&impl->box, gtk_widget_unparent);
@ -7856,7 +7855,7 @@ display_changed_cb (GtkWidget *wiget,
GParamSpec *pspec,
GtkFileChooserWidget *impl)
{
remove_settings_signal (impl, gtk_widget_get_display (GTK_WIDGET (impl)));
remove_settings_signal (impl);
check_icon_theme (impl);
}