[Xfce4-commits] [xfce/xfwm4] 03/05: Build: Fix warnings with newer gtk+
noreply at xfce.org
noreply at xfce.org
Sat Mar 31 15:26:39 CEST 2018
This is an automated email from the git hooks/post-receive script.
o l i v i e r 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 xfce/xfwm4.
commit ea1a7115c1e2634d77c5b647cd51b7b0b8b027cb
Author: Olivier Fourdan <fourdan at xfce.org>
Date: Sat Mar 31 11:54:04 2018 +0200
Build: Fix warnings with newer gtk+
---
helper-dialog/helper-dialog.c | 8 ++++++++
src/client.c | 4 ++++
src/cycle.c | 5 ++++-
src/event_filter.c | 15 +++++++++++++--
src/events.c | 12 ++++++++++++
src/icons.c | 16 ++++++++++++++++
src/menu.c | 4 ++++
src/misc.c | 14 ++++++++++++--
src/moveresize.c | 8 ++++++++
src/screen.c | 9 +++++++++
src/settings.c | 4 ++++
src/startup_notification.c | 10 ++++++++++
12 files changed, 104 insertions(+), 5 deletions(-)
diff --git a/helper-dialog/helper-dialog.c b/helper-dialog/helper-dialog.c
index 04a9c75..f4e254a 100644
--- a/helper-dialog/helper-dialog.c
+++ b/helper-dialog/helper-dialog.c
@@ -40,11 +40,19 @@ on_realize (GtkWidget *dialog,
Window xid;
xid = (Window) GPOINTER_TO_INT (data);
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_x11_display_error_trap_push (gtk_widget_get_display (dialog));
+#else
gdk_error_trap_push ();
+#endif
XSetTransientForHint (gdk_x11_get_default_xdisplay (),
GDK_WINDOW_XID (gtk_widget_get_window (dialog)),
xid);
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_x11_display_error_trap_pop_ignored (gtk_widget_get_display (dialog));
+#else
gdk_error_trap_pop_ignored ();
+#endif
}
int
diff --git a/src/client.c b/src/client.c
index e66e07a..6a7c2b3 100644
--- a/src/client.c
+++ b/src/client.c
@@ -3893,7 +3893,11 @@ clientButtonPress (Client *c, Window w, XfwmEventButton *event)
if (!g1)
{
TRACE ("grab failed in clientButtonPress");
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_display_beep (display_info->gdisplay);
+#else
gdk_beep ();
+#endif
return;
}
diff --git a/src/cycle.c b/src/cycle.c
index c7e8d4f..b249fdc 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -498,8 +498,11 @@ clientCycle (Client * c, XfwmEventKey *event)
if (!myScreenGrabKeyboard (screen_info, KeyPressMask | KeyReleaseMask, event->time))
{
TRACE ("grab failed in clientCycle");
-
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_display_beep (display_info->gdisplay);
+#else
gdk_beep ();
+#endif
myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
g_list_free (client_list);
diff --git a/src/event_filter.c b/src/event_filter.c
index 88502fd..5c2d78d 100644
--- a/src/event_filter.c
+++ b/src/event_filter.c
@@ -225,15 +225,21 @@ eventFilterAddWin (GdkScreen *gscr, XfwmDevices *devices, long event_mask)
Window xroot;
GdkWindow *event_win;
guint error;
+ GdkDisplay *gdisplay;
g_return_val_if_fail (gscr, NULL);
g_return_val_if_fail (GDK_IS_SCREEN (gscr), NULL);
event_win = gdk_screen_get_root_window (gscr);
xroot = gdk_x11_window_get_xid (event_win);
- dpy = gdk_x11_display_get_xdisplay (gdk_window_get_display (event_win));
+ gdisplay = gdk_window_get_display (event_win);
+ dpy = gdk_x11_display_get_xdisplay (gdisplay);
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_x11_display_error_trap_push (gdisplay);
+#else
gdk_error_trap_push ();
+#endif
gdk_x11_grab_server ();
XGetWindowAttributes (dpy, xroot, &attribs);
@@ -243,9 +249,14 @@ eventFilterAddWin (GdkScreen *gscr, XfwmDevices *devices, long event_mask)
#endif
gdk_x11_ungrab_server ();
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_display_flush (gdisplay);
+ error = gdk_x11_display_error_trap_pop (gdisplay);
+#else
gdk_flush ();
-
error = gdk_error_trap_pop ();
+#endif
+
if (error)
{
TRACE ("eventFilterAddWin error code: %i", error);
diff --git a/src/events.c b/src/events.c
index f536fee..70f3e58 100644
--- a/src/events.c
+++ b/src/events.c
@@ -237,7 +237,11 @@ typeOfClick (ScreenInfo *screen_info, Window w, XfwmEventButton *event, gboolean
if (!g)
{
TRACE ("grab failed in typeOfClick");
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_display_beep (display_info->gdisplay);
+#else
gdk_beep ();
+#endif
myScreenUngrabPointer (screen_info, event->time);
return XFWM_BUTTON_UNDEFINED;
}
@@ -2438,7 +2442,11 @@ menu_callback (Menu * menu, MenuOp op, Window xid, gpointer menu_data, gpointer
}
else
{
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_display_beep (gdk_display_get_default ());
+#else
gdk_beep ();
+#endif
}
menu_free (menu);
}
@@ -2655,7 +2663,11 @@ show_window_menu (Client *c, gint px, gint py, guint button, guint32 timestamp)
if (!menu_popup (menu, x, y, button, timestamp))
{
TRACE ("Cannot open menu");
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_display_beep (display_info->gdisplay);
+#else
gdk_beep ();
+#endif
c->button_status[MENU_BUTTON] = BUTTON_STATE_NORMAL;
frameQueueDraw (c, FALSE);
xfwmWindowDelete (&menu_event_window);
diff --git a/src/icons.c b/src/icons.c
index 0599a71..6503bc2 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -430,7 +430,11 @@ try_pixmap_and_mask (ScreenInfo *screen_info, Pixmap src_pixmap, Pixmap src_mask
return NULL;
}
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_x11_display_error_trap_push (screen_info->display_info->gdisplay);
+#else
gdk_error_trap_push ();
+#endif
get_pixmap_geometry (myScreenGetXDisplay(screen_info), src_pixmap, &w, &h, &depth);
unscaled = get_pixbuf_from_pixmap (screen_info, src_pixmap, w, h, depth);
icon = NULL;
@@ -441,7 +445,11 @@ try_pixmap_and_mask (ScreenInfo *screen_info, Pixmap src_pixmap, Pixmap src_mask
get_pixmap_geometry (myScreenGetXDisplay(screen_info), src_mask, &w, &h, &depth);
mask = get_pixbuf_from_pixmap (screen_info, src_mask, w, h, depth);
}
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_x11_display_error_trap_pop_ignored (screen_info->display_info->gdisplay);
+#else
gdk_error_trap_pop_ignored ();
+#endif
if (mask)
{
@@ -521,9 +529,17 @@ getAppIcon (ScreenInfo *screen_info, Window window, guint width, guint height)
return scaled_from_pixdata (pixdata, w, h, width, height);
}
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_x11_display_error_trap_push (screen_info->display_info->gdisplay);
+#else
gdk_error_trap_push ();
+#endif
hints = XGetWMHints (myScreenGetXDisplay(screen_info), window);
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_x11_display_error_trap_pop_ignored (screen_info->display_info->gdisplay);
+#else
gdk_error_trap_pop_ignored ();
+#endif
if (hints)
{
diff --git a/src/menu.c b/src/menu.c
index 63a9979..07f7fc5 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -548,7 +548,11 @@ menu_popup (Menu *menu, gint root_x, gint root_y, guint button, guint32 timestam
if (g_object_get_data (G_OBJECT (menu->menu), "gtk-menu-transfer-window") == NULL)
{
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_display_beep (gdk_display_get_default ());
+#else
gdk_beep ();
+#endif
g_message (_("%s: GtkMenu failed to grab the pointer\n"), g_get_prgname ());
gtk_menu_popdown (GTK_MENU (menu->menu));
menu_open = NULL;
diff --git a/src/misc.c b/src/misc.c
index 6040040..d28f9a6 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -144,6 +144,7 @@ checkWindowOnRoot(ScreenInfo *screen_info, Window w)
Window *wins;
Status test;
unsigned int count;
+ gint ret;
g_return_val_if_fail (screen_info != NULL, FALSE);
g_return_val_if_fail (w != None, FALSE);
@@ -151,13 +152,22 @@ checkWindowOnRoot(ScreenInfo *screen_info, Window w)
display_info = screen_info->display_info;
wins = NULL;
- gdk_error_trap_push ();
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_x11_display_error_trap_push (display_info->gdisplay);
+#else
+ gdk_error_trap_push ();
+#endif
test = XQueryTree(display_info->dpy, w, &dummy_root, &parent, &wins, &count);
if (wins)
{
XFree (wins);
}
- return (!gdk_error_trap_pop () && (test != 0) && (dummy_root == parent));
+#if GTK_CHECK_VERSION(3, 22, 0)
+ ret = gdk_x11_display_error_trap_pop (display_info->gdisplay);
+#else
+ ret = gdk_error_trap_pop ();
+#endif
+ return ((ret == 0) && (test != 0) && (dummy_root == parent));
}
void
diff --git a/src/moveresize.c b/src/moveresize.c
index ec84c54..21e1899 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -1206,7 +1206,11 @@ clientMove (Client * c, XfwmEventButton *event)
{
TRACE ("grab failed in clientMove");
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_display_beep (display_info->gdisplay);
+#else
gdk_beep ();
+#endif
myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
@@ -1763,7 +1767,11 @@ clientResize (Client * c, int handle, XfwmEventButton *event)
{
TRACE ("grab failed in clientResize");
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_display_beep (display_info->gdisplay);
+#else
gdk_beep ();
+#endif
myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
diff --git a/src/screen.c b/src/screen.c
index 7edb83e..6ae010c 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -107,11 +107,20 @@ myScreenSetWMAtom (ScreenInfo *screen_info, gboolean replace_wm)
return FALSE;
}
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_x11_display_error_trap_push (display_info->gdisplay);
+#else
gdk_error_trap_push ();
+#endif
attrs.event_mask = StructureNotifyMask;
XChangeWindowAttributes (display_info->dpy, current_wm, CWEventMask, &attrs);
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_display_flush (display_info->gdisplay);
+ if (gdk_x11_display_error_trap_pop (display_info->gdisplay))
+#else
gdk_flush ();
if (gdk_error_trap_pop ())
+#endif
{
current_wm = None;
}
diff --git a/src/settings.c b/src/settings.c
index 9c473e9..ee63cd6 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -1025,7 +1025,11 @@ initSettings (ScreenInfo *screen_info)
g_signal_connect (screen_info->xfwm4_channel, "property-changed",
G_CALLBACK (cb_xfwm4_channel_property_changed), screen_info);
+#if GTK_CHECK_VERSION(3, 22, 0)
+ keymap = gdk_keymap_get_for_display (display_info->gdisplay);
+#else
keymap = gdk_keymap_get_default ();
+#endif
g_signal_connect (keymap, "keys-changed",
G_CALLBACK (cb_keys_changed), screen_info);
diff --git a/src/startup_notification.c b/src/startup_notification.c
index c33ee4b..b0f56ab 100644
--- a/src/startup_notification.c
+++ b/src/startup_notification.c
@@ -61,13 +61,23 @@ static gboolean sn_startup_sequence_timeout (void *data);
static void
sn_error_trap_push (SnDisplay * d, Display * dpy)
{
+#if GTK_CHECK_VERSION(3, 22, 0)
+ DisplayInfo *display_info = myDisplayGetDefault ();
+ gdk_x11_display_error_trap_push (display_info->gdisplay);
+#else
gdk_error_trap_push ();
+#endif
}
static void
sn_error_trap_pop (SnDisplay * d, Display * dpy)
{
+#if GTK_CHECK_VERSION(3, 22, 0)
+ DisplayInfo *display_info = myDisplayGetDefault ();
+ gdk_x11_display_error_trap_pop_ignored (display_info->gdisplay);
+#else
gdk_error_trap_pop_ignored ();
+#endif
}
static void
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list