From 3689698d12b93355a273e1aae1936ff9a74defd1 Mon Sep 17 00:00:00 2001 From: infirit Date: Thu, 3 Jul 2014 16:18:05 +0200 Subject: Cleanup GTK_CHECK_VERSION and unify code where possible * Use GtkAllocation for both Gtk+ versions, added in 2.18 * Bump gdk-pixbuf required to 2.22 (release 2010) * GDK_DISPLAY_XDISPLAY | Since always * gdk_display_get_default | Since 2.22 * gdk_window_get_screen | Since 2.24 * gtk_widget_get_window | Since 2.14 --- src/daemon/daemon.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/daemon') diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c index 49368f2..42c1aea 100644 --- a/src/daemon/daemon.c +++ b/src/daemon/daemon.c @@ -303,11 +303,7 @@ static void create_screens(NotifyDaemon* daemon) daemon->priv->screens[i] = g_new0(NotifyScreen, 1); - #if GTK_CHECK_VERSION(3, 0, 0) daemon->priv->screens[i]->workarea_atom = XInternAtom(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), "_NET_WORKAREA", True); - #else - daemon->priv->screens[i]->workarea_atom = XInternAtom(GDK_DISPLAY(), "_NET_WORKAREA", True); - #endif gdkwindow = gdk_screen_get_root_window(screen); gdk_window_add_filter(gdkwindow, (GdkFilterFunc) screen_xevent_filter, daemon->priv->screens[i]); @@ -1152,11 +1148,7 @@ static gboolean fullscreen_window_exists(GtkWidget* nw) WnckWorkspace* wnck_workspace; GList* l; - #if GTK_CHECK_VERSION (3, 0, 0) || ((GDK_PIXBUF_MAJOR == 2) && (GDK_PIXBUF_MINOR < 22)) wnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(gdk_window_get_screen(gtk_widget_get_window(nw)))); - #else - wnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(gdk_drawable_get_screen(GDK_DRAWABLE(GTK_WIDGET(nw)->window)))); - #endif wnck_screen_force_update (wnck_screen); -- cgit v1.2.1