Use gdk_error_trap_pop_ignore() where appropriate
gdk_error_trap_pop() has been marked with G_GNUC_WARN_UNUSED_RESULT, so use gdk_error_trap_pop_ignore() whenever the return value is ignored.
This commit is contained in:
parent
a2553f48e2
commit
fd5f30ab0d
@ -251,7 +251,7 @@ na_tray_child_new (GdkScreen *screen,
|
|||||||
gdk_error_trap_push ();
|
gdk_error_trap_push ();
|
||||||
result = XGetWindowAttributes (xdisplay, icon_window,
|
result = XGetWindowAttributes (xdisplay, icon_window,
|
||||||
&window_attributes);
|
&window_attributes);
|
||||||
gdk_error_trap_pop ();
|
gdk_error_trap_pop_ignored ();
|
||||||
|
|
||||||
if (!result) /* Window already gone */
|
if (!result) /* Window already gone */
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -437,7 +437,7 @@ na_tray_child_force_redraw (NaTrayChild *child)
|
|||||||
* since that is asynchronous.
|
* since that is asynchronous.
|
||||||
*/
|
*/
|
||||||
XSync (xdisplay, False);
|
XSync (xdisplay, False);
|
||||||
gdk_error_trap_pop ();
|
gdk_error_trap_pop_ignored ();
|
||||||
#else
|
#else
|
||||||
/* Hiding and showing is the safe way to do it, but can result in more
|
/* Hiding and showing is the safe way to do it, but can result in more
|
||||||
* flickering.
|
* flickering.
|
||||||
@ -481,7 +481,7 @@ _get_wmclass (Display *xdisplay,
|
|||||||
|
|
||||||
gdk_error_trap_push ();
|
gdk_error_trap_push ();
|
||||||
XGetClassHint (xdisplay, xwindow, &ch);
|
XGetClassHint (xdisplay, xwindow, &ch);
|
||||||
gdk_error_trap_pop ();
|
gdk_error_trap_pop_ignored ();
|
||||||
|
|
||||||
if (res_class)
|
if (res_class)
|
||||||
*res_class = NULL;
|
*res_class = NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user