[gnome-shell] na-tray-child: Silence some deprecation warnings
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] na-tray-child: Silence some deprecation warnings
- Date: Tue, 26 Feb 2019 00:48:20 +0000 (UTC)
commit 823fd855cf6e9f3c93d61527112fd64f2ca08249
Author: Robert Mader <robert mader posteo de>
Date: Mon Feb 25 16:03:14 2019 +0100
na-tray-child: Silence some deprecation warnings
Use `gdk_x11_display_error_trap_...` instead of `gdk_error_trap_...`
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/417
src/tray/na-tray-child.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/src/tray/na-tray-child.c b/src/tray/na-tray-child.c
index e363fd1e2..6664757d7 100644
--- a/src/tray/na-tray-child.c
+++ b/src/tray/na-tray-child.c
@@ -242,6 +242,7 @@ na_tray_child_new (GdkScreen *screen,
Window icon_window)
{
XWindowAttributes window_attributes;
+ GdkDisplay *display;
Display *xdisplay;
NaTrayChild *child;
GdkVisual *visual;
@@ -253,15 +254,16 @@ na_tray_child_new (GdkScreen *screen,
g_return_val_if_fail (icon_window != None, NULL);
xdisplay = GDK_SCREEN_XDISPLAY (screen);
+ display = gdk_x11_lookup_xdisplay (xdisplay);
/* We need to determine the visual of the window we are embedding and create
* the socket in the same visual.
*/
- gdk_error_trap_push ();
+ gdk_x11_display_error_trap_push (display);
result = XGetWindowAttributes (xdisplay, icon_window,
&window_attributes);
- gdk_error_trap_pop_ignored ();
+ gdk_x11_display_error_trap_pop_ignored (display);
if (!result) /* Window already gone */
return NULL;
@@ -308,7 +310,7 @@ na_tray_child_get_title (NaTrayChild *child)
utf8_string = gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING");
atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_NAME");
- gdk_error_trap_push ();
+ gdk_x11_display_error_trap_push (display);
result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
child->icon_window,
@@ -318,7 +320,7 @@ na_tray_child_get_title (NaTrayChild *child)
&type, &format, &nitems,
&bytes_after, (guchar **)&val);
- if (gdk_error_trap_pop () || result != Success)
+ if (gdk_x11_display_error_trap_pop (display) || result != Success)
return NULL;
if (type != utf8_string ||
@@ -377,7 +379,8 @@ na_tray_child_force_redraw (NaTrayChild *child)
* icon is expecting the server to clear-to-background before
* the redraw. It should be ok for GtkStatusIcon or EggTrayIcon.
*/
- Display *xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget));
+ GdkDisplay *display = gtk_widget_get_display (widget);
+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
XEvent xev;
GdkWindow *plug_window;
GtkAllocation allocation;
@@ -393,12 +396,12 @@ na_tray_child_force_redraw (NaTrayChild *child)
xev.xexpose.height = allocation.height;
xev.xexpose.count = 0;
- gdk_error_trap_push ();
+ gdk_x11_display_error_trap_push (display);
XSendEvent (xdisplay,
xev.xexpose.window,
False, ExposureMask,
&xev);
- gdk_error_trap_pop_ignored ();
+ gdk_x11_display_error_trap_pop_ignored (display);
#else
/* Hiding and showing is the safe way to do it, but can result in more
* flickering.
@@ -435,14 +438,16 @@ _get_wmclass (Display *xdisplay,
char **res_class,
char **res_name)
{
+ GdkDisplay *display;
XClassHint ch;
ch.res_name = NULL;
ch.res_class = NULL;
- gdk_error_trap_push ();
+ display = gdk_x11_lookup_xdisplay (xdisplay);
+ gdk_x11_display_error_trap_push (display);
XGetClassHint (xdisplay, xwindow, &ch);
- gdk_error_trap_pop_ignored ();
+ gdk_x11_display_error_trap_pop_ignored (display);
if (res_class)
*res_class = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]