diff options
Diffstat (limited to 'applets/notification_area')
| -rw-r--r-- | applets/notification_area/fixedtip.c | 4 | ||||
| -rw-r--r-- | applets/notification_area/na-tray-child.c | 4 | ||||
| -rw-r--r-- | applets/notification_area/na-tray-manager.c | 11 | ||||
| -rw-r--r-- | applets/notification_area/testtray.c | 6 |
4 files changed, 3 insertions, 22 deletions
diff --git a/applets/notification_area/fixedtip.c b/applets/notification_area/fixedtip.c index 7bd61409..ded3dbb6 100644 --- a/applets/notification_area/fixedtip.c +++ b/applets/notification_area/fixedtip.c @@ -179,12 +179,8 @@ na_fixed_tip_position (NaFixedTip *fixedtip) #endif gdk_window_get_origin (parent_window, &root_x, &root_y); -#if GTK_CHECK_VERSION(3, 0, 0) parent_width = gdk_window_get_width(parent_window); parent_height = gdk_window_get_height(parent_window); -#else - gdk_drawable_get_size(GDK_DRAWABLE(parent_window), &parent_width, &parent_height); -#endif screen_width = gdk_screen_get_width (screen); screen_height = gdk_screen_get_height (screen); 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 */ diff --git a/applets/notification_area/testtray.c b/applets/notification_area/testtray.c index 9feed828..f19663cd 100644 --- a/applets/notification_area/testtray.c +++ b/applets/notification_area/testtray.c @@ -162,15 +162,9 @@ create_tray_on_screen (GdkScreen *screen, label = gtk_label_new_with_mnemonic ("_Orientation:"); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION (3, 0, 0) combo = gtk_combo_box_text_new (); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Horizontal"); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Vertical"); -#else - combo = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "Horizontal"); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "Vertical"); -#endif g_signal_connect (combo, "changed", G_CALLBACK (orientation_changed_cb), data); gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0); |