[Xfce4-commits] [apps/xfce4-screensaver] 388/425: Tidy up older deprecations
noreply at xfce.org
noreply at xfce.org
Mon Oct 15 01:53:55 CEST 2018
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfce4-screensaver.
commit 8c09d597a9b5440688c96f382d4f2b5a6e43fc58
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Thu Oct 11 05:31:36 2018 -0400
Tidy up older deprecations
---
savers/floaters.c | 4 +++-
savers/gs-theme-window.c | 2 ++
savers/gste-popsquares.c | 4 ++++
savers/gste-slideshow.c | 2 ++
src/copy-theme-dialog.c | 10 ++++++++--
src/gs-fade.c | 2 +-
src/gs-grab-x11.c | 10 +++++-----
src/gs-lock-plug.c | 4 +++-
src/gs-manager.c | 4 ++--
src/gs-visual-gl.c | 4 ++--
src/gs-window-x11.c | 14 +++++++-------
11 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/savers/floaters.c b/savers/floaters.c
index 3bfe667..2b489a2 100644
--- a/savers/floaters.c
+++ b/savers/floaters.c
@@ -1110,7 +1110,7 @@ screen_saver_do_update_state (ScreenSaver *screen_saver)
*/
if (screen_saver->draw_ops_pending)
{
- gdk_flush ();
+ gdk_display_flush (gdk_display_get_default());;
screen_saver->draw_ops_pending = FALSE;
}
@@ -1220,9 +1220,11 @@ main (int argc,
(GSourceFunc) do_print_screen_saver_stats,
screen_saver);
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* GTK 3.20 */
if ((geometry == NULL)
|| !gtk_window_parse_geometry (GTK_WINDOW (window), geometry))
gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
+ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_widget_show (window);
diff --git a/savers/gs-theme-window.c b/savers/gs-theme-window.c
index af2b7a1..3d3d294 100644
--- a/savers/gs-theme-window.c
+++ b/savers/gs-theme-window.c
@@ -142,8 +142,10 @@ gs_theme_window_real_realize (GtkWidget *widget)
return;
}
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* GTK 3.18 */
gtk_style_context_set_background (gtk_widget_get_style_context (widget),
window);
+ G_GNUC_END_IGNORE_DEPRECATIONS
gdk_window_set_decorations (window, (GdkWMDecoration) 0);
gdk_window_set_events (window, gdk_window_get_events (window) | event_mask);
diff --git a/savers/gste-popsquares.c b/savers/gste-popsquares.c
index 3a66c49..90b8b2d 100644
--- a/savers/gste-popsquares.c
+++ b/savers/gste-popsquares.c
@@ -301,15 +301,19 @@ set_colors (GtkWidget *widget,
gtk_style_context_save (style);
gtk_style_context_set_state (style, GTK_STATE_FLAG_SELECTED);
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* GTK 3.16 */
gtk_style_context_get_background_color (style,
gtk_style_context_get_state (style),
bg);
+ G_GNUC_END_IGNORE_DEPRECATIONS
if (bg->alpha == 0.0)
{
gtk_style_context_add_class (style, GTK_STYLE_CLASS_VIEW);
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* GTK 3.16 */
gtk_style_context_get_background_color (style,
gtk_style_context_get_state (style),
bg);
+ G_GNUC_END_IGNORE_DEPRECATIONS
}
gtk_style_context_restore (style);
diff --git a/savers/gste-slideshow.c b/savers/gste-slideshow.c
index 49e742f..1caf75b 100644
--- a/savers/gste-slideshow.c
+++ b/savers/gste-slideshow.c
@@ -900,7 +900,9 @@ gste_slideshow_real_configure (GtkWidget *widget,
cairo_surface_destroy (show->priv->surf);
}
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* GTK 3.22 */
cr = gdk_cairo_create (gtk_widget_get_window (widget));
+ G_GNUC_END_IGNORE_DEPRECATIONS
show->priv->surf = cairo_surface_create_similar (cairo_get_target (cr),
CAIRO_CONTENT_COLOR,
show->priv->window_width,
diff --git a/src/copy-theme-dialog.c b/src/copy-theme-dialog.c
index 2df8ce2..de63354 100644
--- a/src/copy-theme-dialog.c
+++ b/src/copy-theme-dialog.c
@@ -504,19 +504,25 @@ static void
eel_gtk_label_make_bold (GtkLabel *label)
{
PangoFontDescription *font_desc;
+ PangoAttrList *attrlist;
+ PangoAttribute *attr;
font_desc = pango_font_description_new ();
+ attrlist = pango_attr_list_new();
pango_font_description_set_weight (font_desc,
PANGO_WEIGHT_BOLD);
+ attr = pango_attr_font_desc_new(font_desc);
+ pango_font_description_free (font_desc);
+ pango_attr_list_insert (attrlist, attr);
/* This will only affect the weight of the font, the rest is
* from the current state of the widget, which comes from the
* theme or user prefs, since the font desc only has the
* weight flag turned on.
*/
- gtk_widget_override_font (GTK_WIDGET (label), font_desc);
- pango_font_description_free (font_desc);
+ gtk_label_set_attributes (label, attrlist);
+ pango_attr_list_unref (attrlist);
}
/* from caja */
diff --git a/src/gs-fade.c b/src/gs-fade.c
index eff27e3..0ac7202 100644
--- a/src/gs-fade.c
+++ b/src/gs-fade.c
@@ -243,7 +243,7 @@ xf86_whack_gamma (int screen,
# endif /* !HAVE_XF86VMODE_GAMMA_RAMP */
}
- gdk_flush ();
+ gdk_display_flush (gdk_display_get_default());;
return status;
}
diff --git a/src/gs-grab-x11.c b/src/gs-grab-x11.c
index 18066a4..c1efbb7 100644
--- a/src/gs-grab-x11.c
+++ b/src/gs-grab-x11.c
@@ -117,7 +117,7 @@ xorg_lock_smasher_set_active (GSGrab *grab,
gs_debug ("Disabling the x.org grab smasher");
}
- gdk_error_trap_push ();
+ gdk_x11_display_error_trap_push (gdk_display_get_default());;
status = XF86MiscSetGrabKeysState (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), active);
@@ -260,7 +260,7 @@ gs_grab_release (GSGrab *grab, gboolean flush)
xorg_lock_smasher_set_active (grab, TRUE);
gdk_display_sync (gdk_display_get_default ());
- gdk_flush ();
+ gdk_display_flush (gdk_display_get_default());;
}
}
@@ -345,13 +345,13 @@ gs_grab_nuke_focus (GdkDisplay *display)
gs_debug ("Nuking focus");
- gdk_error_trap_push ();
+ gdk_x11_display_error_trap_push (gdk_display_get_default());;
XGetInputFocus (GDK_DISPLAY_XDISPLAY (display), &focus, &rev);
XSetInputFocus (GDK_DISPLAY_XDISPLAY (display), None,
RevertToNone, CurrentTime);
- gdk_error_trap_pop_ignored ();
+ gdk_x11_display_error_trap_pop_ignored (gdk_display_get_default());;
}
gboolean
@@ -461,7 +461,7 @@ gs_grab_move_to_window (GSGrab *grab,
{
result = gs_grab_move (grab, window, display,
no_pointer_grab, hide_cursor);
- gdk_flush ();
+ gdk_display_flush (gdk_display_get_default());;
}
}
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index ffed50a..f8c04ad 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -429,7 +429,7 @@ is_capslock_on (void)
res = FALSE;
- keymap = gdk_keymap_get_default ();
+ keymap = gdk_keymap_get_for_display (gdk_display_get_default());;
if (keymap != NULL) {
res = gdk_keymap_get_caps_lock_state (keymap);
}
@@ -1976,7 +1976,9 @@ load_theme (GSLockPlug *plug)
g_free (filename);
if (g_file_test (css, G_FILE_TEST_IS_REGULAR))
{
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* GTK 3.24 */
GtkCssProvider *style_provider = gtk_css_provider_get_default ();
+ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_css_provider_load_from_path (style_provider, css, NULL);
}
g_free (css);
diff --git a/src/gs-manager.c b/src/gs-manager.c
index e4e2082..1a3e441 100644
--- a/src/gs-manager.c
+++ b/src/gs-manager.c
@@ -1174,7 +1174,7 @@ manager_maybe_grab_window (GSManager *manager,
gdk_device_get_position (device, NULL, &x, &y);
monitor = gdk_display_get_monitor_at_point (display, x, y);
- gdk_flush ();
+ gdk_display_flush (gdk_display_get_default());;
grabbed = FALSE;
if (gs_window_get_display (window) == display &&
gs_window_get_monitor (window) == monitor)
@@ -1646,7 +1646,7 @@ on_screen_monitors_changed (GdkScreen *screen,
gs_manager_request_unlock (manager);
}
- gdk_flush ();
+ gdk_display_flush (gdk_display_get_default());;
gdk_x11_ungrab_server ();
}
}
diff --git a/src/gs-visual-gl.c b/src/gs-visual-gl.c
index 80bf8bb..dc9c176 100644
--- a/src/gs-visual-gl.c
+++ b/src/gs-visual-gl.c
@@ -79,7 +79,7 @@ gs_visual_gl_get_best_for_display (GdkDisplay *display)
screen = gdk_display_get_default_screen (display);
screen_num = GDK_SCREEN_XNUMBER (screen);
- gdk_error_trap_push ();
+ gdk_x11_display_error_trap_push (gdk_display_get_default());;
visual = NULL;
for (i = 0; i < G_N_ELEMENTS (attrs); i++)
@@ -105,7 +105,7 @@ gs_visual_gl_get_best_for_display (GdkDisplay *display)
}
}
- gdk_error_trap_pop_ignored ();
+ gdk_x11_display_error_trap_pop_ignored (gdk_display_get_default());;
#else
visual = NULL;
#endif /* HAVE_LIBGL */
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index 9a7cdc1..1de4ecf 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -235,13 +235,13 @@ widget_clear_all_children (GtkWidget *widget)
gs_debug ("Clearing all child windows");
- gdk_error_trap_push ();
+ gdk_x11_display_error_trap_push (gdk_display_get_default());;
w = gtk_widget_get_window (widget);
clear_children (GDK_WINDOW_XID (w));
- gdk_error_trap_pop_ignored ();
+ gdk_x11_display_error_trap_pop_ignored (gdk_display_get_default());;
}
void
@@ -285,7 +285,7 @@ gs_window_clear (GSWindow *window)
widget_clear_all_children (window->priv->drawing_area);
}
- gdk_flush ();
+ gdk_display_flush (gdk_display_get_default());;
}
static cairo_region_t *
@@ -765,7 +765,7 @@ select_popup_events (void)
XWindowAttributes attr;
unsigned long events;
- gdk_error_trap_push ();
+ gdk_x11_display_error_trap_push (gdk_display_get_default());;
memset (&attr, 0, sizeof (attr));
XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_ROOT_WINDOW (), &attr);
@@ -773,7 +773,7 @@ select_popup_events (void)
events = SubstructureNotifyMask | attr.your_event_mask;
XSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_ROOT_WINDOW (), events);
- gdk_error_trap_pop_ignored ();
+ gdk_x11_display_error_trap_pop_ignored (gdk_display_get_default());;
}
static void
@@ -783,14 +783,14 @@ window_select_shape_events (GSWindow *window)
unsigned long events;
int shape_error_base;
- gdk_error_trap_push ();
+ gdk_x11_display_error_trap_push (gdk_display_get_default());;
if (XShapeQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &window->priv->shape_event_base, &shape_error_base)) {
events = ShapeNotifyMask;
XShapeSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window))), events);
}
- gdk_error_trap_pop_ignored ();
+ gdk_x11_display_error_trap_pop_ignored (gdk_display_get_default());;
#endif
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list