summaryrefslogtreecommitdiff
path: root/stickynotes/util.c
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-06-02 22:42:37 +0200
committerinfirit <[email protected]>2014-06-02 22:42:37 +0200
commit9bf73874d45075aad80303e9c0ee96cdc9f3c450 (patch)
tree1be1670be2ea9e872cd4c444652ff697b2753726 /stickynotes/util.c
parent53a1fe800f9f0c90dc298ba228b29852147794bb (diff)
downloadmate-applets-9bf73874d45075aad80303e9c0ee96cdc9f3c450.tar.bz2
mate-applets-9bf73874d45075aad80303e9c0ee96cdc9f3c450.tar.xz
Cleanup GTK_CHECK_VERSION and unify where possible
gdk_x11_window_foreign_new_for_display | since 2.24 gdk_window_get_width | since 2.24 gdk_window_get_height | since 2.24 gdk_x11_display_get_xdisplay | since 2.2 gdk_window_get_display | since 2.24 gdk_x11_window_foreign_new_for_display | since 2.24 GDK_WINDOW_XID | since always GDK_SCREEN_XDISPLAY | since always
Diffstat (limited to 'stickynotes/util.c')
-rw-r--r--stickynotes/util.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/stickynotes/util.c b/stickynotes/util.c
index 6748c7fc..9f395093 100644
--- a/stickynotes/util.c
+++ b/stickynotes/util.c
@@ -28,10 +28,6 @@
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#define GDK_WINDOW_XWINDOW GDK_WINDOW_XID
-#endif
-
/* Returns the current date in a customizable form, the default
* looks like this: "Nov 30, '78" */
gchar * get_current_date(const gchar *format)
@@ -92,9 +88,9 @@ xstuff_get_current_workspace (GtkWindow *window)
int retval;
Display *gdk_display;
- root_window = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (
+ root_window = GDK_WINDOW_XID (gdk_screen_get_root_window (
gtk_widget_get_screen (GTK_WIDGET (window))));
- root_window = GDK_WINDOW_XWINDOW (gtk_widget_get_window (GTK_WIDGET (window)));
+ root_window = GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window)));
gdk_display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
gdk_error_trap_push ();
@@ -129,7 +125,7 @@ xstuff_change_workspace (GtkWindow *window,
Screen *screen;
gdk_display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
- xwindow = GDK_WINDOW_XWINDOW (GDK_WINDOW (gtk_widget_get_window (GTK_WIDGET (window))));
+ xwindow = GDK_WINDOW_XID (GDK_WINDOW (gtk_widget_get_window (GTK_WIDGET (window))));
screen = GDK_SCREEN_XSCREEN (gtk_widget_get_screen (GTK_WIDGET (window)));
xev.xclient.type = ClientMessage;