summaryrefslogtreecommitdiff
path: root/applets/notification_area
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-05-16 16:28:11 +0200
committerinfirit <[email protected]>2014-05-16 16:28:11 +0200
commit41ff2a970ebee68fc7ca335f10ae24a6210d1fd5 (patch)
tree1fece64eda0067255bbf37dc03835bb177bccfff /applets/notification_area
parent472ccc0025494452e705ac28dc82fe5abd431de8 (diff)
downloadmate-panel-41ff2a970ebee68fc7ca335f10ae24a6210d1fd5.tar.bz2
mate-panel-41ff2a970ebee68fc7ca335f10ae24a6210d1fd5.tar.xz
Use GDK_WINDOW_XID for gtk+2 and gtk+3
It was introduced in gdk2 already so clean up the code.
Diffstat (limited to 'applets/notification_area')
-rw-r--r--applets/notification_area/na-tray-child.c4
-rw-r--r--applets/notification_area/na-tray-manager.c11
2 files changed, 3 insertions, 12 deletions
diff --git a/applets/notification_area/na-tray-child.c b/applets/notification_area/na-tray-child.c
index 84fddf64..9ff5c739 100644
--- a/applets/notification_area/na-tray-child.c
+++ b/applets/notification_area/na-tray-child.c
@@ -492,11 +492,7 @@ na_tray_child_force_redraw (NaTrayChild *child)
gtk_widget_get_allocation (widget, &allocation);
xev.xexpose.type = Expose;
-#if GTK_CHECK_VERSION (3, 0, 0)
xev.xexpose.window = GDK_WINDOW_XID (plug_window);
-#else
- xev.xexpose.window = GDK_WINDOW_XWINDOW (plug_window);
-#endif
xev.xexpose.x = 0;
xev.xexpose.y = 0;
xev.xexpose.width = allocation.width;
diff --git a/applets/notification_area/na-tray-manager.c b/applets/notification_area/na-tray-manager.c
index 1a2acc7f..1483bcd0 100644
--- a/applets/notification_area/na-tray-manager.c
+++ b/applets/notification_area/na-tray-manager.c
@@ -27,11 +27,6 @@
#include "na-tray-manager.h"
#include <gtk/gtk.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#define GDK_WINDOW_XWINDOW GDK_WINDOW_XID
-#else
-#include <gdkconfig.h>
-#endif
#include <glib/gi18n.h>
#if defined (GDK_WINDOWING_X11)
#include <gdk/gdkx.h>
@@ -646,7 +641,7 @@ na_tray_manager_set_orientation_property (NaTrayManager *manager)
SYSTEM_TRAY_ORIENTATION_VERT;
XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
- GDK_WINDOW_XWINDOW (window),
+ GDK_WINDOW_XID (window),
orientation_atom,
XA_CARDINAL, 32,
PropModeReplace,
@@ -706,7 +701,7 @@ na_tray_manager_set_visual_property (NaTrayManager *manager)
data[0] = XVisualIDFromVisual (xvisual);
XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
- GDK_WINDOW_XWINDOW (window),
+ GDK_WINDOW_XID (window),
visual_atom,
XA_VISUALID, 32,
PropModeReplace,
@@ -784,7 +779,7 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
xev.data.l[0] = timestamp;
xev.data.l[1] = gdk_x11_atom_to_xatom_for_display (display,
manager->selection_atom);
- xev.data.l[2] = GDK_WINDOW_XWINDOW (window);
+ xev.data.l[2] = GDK_WINDOW_XID (window);
xev.data.l[3] = 0; /* manager specific data */
xev.data.l[4] = 0; /* manager specific data */