diff options
author | Benjamin Otte <otte@redhat.com> | 2017-10-31 08:23:07 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2017-10-31 08:25:37 +0100 |
commit | ccd52a410e2f1af3286d61b8e47dd4e2e36643ab (patch) | |
tree | 7cf0fa961c65e6aa61bcbf2f42b6cd1894843721 | |
parent | 648d0403952cd4f50cf43c56d91ec281c8d3a75c (diff) | |
download | gtk+-ccd52a410e2f1af3286d61b8e47dd4e2e36643ab.tar.gz |
settings: Remove gtk_settings_get_for_screen()
All users of it are gone now.
-rw-r--r-- | docs/reference/gtk/gtk4-sections.txt | 1 | ||||
-rw-r--r-- | gtk/gtkimcontextsimple.c | 4 | ||||
-rw-r--r-- | gtk/gtksettings.c | 18 | ||||
-rw-r--r-- | gtk/gtksettings.h | 2 |
4 files changed, 2 insertions, 23 deletions
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 3aab14de89..82b90c74c0 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -2642,7 +2642,6 @@ GtkSettings GtkSettingsValue gtk_settings_get_default gtk_settings_get_for_display -gtk_settings_get_for_screen gtk_rc_property_parse_color gtk_rc_property_parse_enum gtk_rc_property_parse_flags diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index 06bdfb4160..ce3accb617 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -1017,10 +1017,10 @@ check_emoji (GtkIMContextSimple *context_simple, static void beep_window (GdkWindow *window) { - GdkScreen *screen = gdk_window_get_screen (window); + GdkDisplay *display = gdk_window_get_display (window); gboolean beep; - g_object_get (gtk_settings_get_for_screen (screen), + g_object_get (gtk_settings_get_for_display (display), "gtk-error-bell", &beep, NULL); diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 319c783767..958560d033 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -1268,24 +1268,6 @@ gtk_settings_get_for_display (GdkDisplay *display) } /** - * gtk_settings_get_for_screen: - * @screen: a #GdkScreen. - * - * Gets the #GtkSettings object for @screen, creating it if necessary. - * - * Returns: (transfer none): a #GtkSettings object. - * - * Since: 2.2 - */ -GtkSettings * -gtk_settings_get_for_screen (GdkScreen *screen) -{ - g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); - - return gtk_settings_get_for_display (gdk_screen_get_display (screen)); -} - -/** * gtk_settings_get_default: * * Gets the #GtkSettings object for the default display, creating diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h index 1bd958bf82..b7b5f89a25 100644 --- a/gtk/gtksettings.h +++ b/gtk/gtksettings.h @@ -89,8 +89,6 @@ GDK_AVAILABLE_IN_ALL GType gtk_settings_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL GtkSettings* gtk_settings_get_default (void); -GDK_AVAILABLE_IN_ALL -GtkSettings* gtk_settings_get_for_screen (GdkScreen *screen); GDK_AVAILABLE_IN_3_94 GtkSettings* gtk_settings_get_for_display (GdkDisplay *display); |