diff options
28 files changed, 220 insertions, 205 deletions
diff --git a/applets/clock/clock-face.c b/applets/clock/clock-face.c index 25c0b182..558201ab 100644 --- a/applets/clock/clock-face.c +++ b/applets/clock/clock-face.c @@ -15,10 +15,9 @@ #include <math.h> #include <time.h> -#include <librsvg/rsvg.h> - #include "clock-face.h" #include "clock-location.h" +#include "clock-utils.h" static GHashTable *pixbuf_cache = NULL; @@ -506,18 +505,13 @@ clock_face_load_face (ClockFace *this, gint width, gint height) name = g_strconcat (ICONDIR, "/clock-face-", size_string[priv->size], "-", daytime_string[priv->timeofday], ".svg", NULL); - priv->face_pixbuf = rsvg_pixbuf_from_file_at_size (name, - width, height, - NULL); + priv->face_pixbuf = clock_utils_pixbuf_from_svg_file_at_size (name, width, height); g_free (name); if (!priv->face_pixbuf) { name = g_strconcat (ICONDIR, "/clock-face-", size_string[priv->size], ".svg", NULL); - priv->face_pixbuf = rsvg_pixbuf_from_file_at_size (name, - width, - height, - NULL); + priv->face_pixbuf = clock_utils_pixbuf_from_svg_file_at_size (name, width, height); g_free (name); } diff --git a/applets/clock/clock-utils.c b/applets/clock/clock-utils.c index d0dfe2de..4ba93fef 100644 --- a/applets/clock/clock-utils.c +++ b/applets/clock/clock-utils.c @@ -34,6 +34,9 @@ #include <gtk/gtk.h> +#include <librsvg/rsvg.h> +#include <librsvg/rsvg-cairo.h> + #include "clock.h" #include "clock-utils.h" @@ -125,3 +128,204 @@ clock_utils_display_help (GtkWidget *widget, gtk_widget_show (dialog); } } + +#if !GTK_CHECK_VERSION (3, 0, 0) +/* code copied from GTK3 gdkpixbuf-drawable.c */ +static cairo_format_t +gdk_cairo_format_for_content (cairo_content_t content) +{ + switch (content) + { + case CAIRO_CONTENT_COLOR: + return CAIRO_FORMAT_RGB24; + case CAIRO_CONTENT_ALPHA: + return CAIRO_FORMAT_A8; + case CAIRO_CONTENT_COLOR_ALPHA: + default: + return CAIRO_FORMAT_ARGB32; + } +} + +static cairo_surface_t * +gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface, + cairo_content_t content, + int src_x, + int src_y, + int width, + int height) +{ + cairo_surface_t *copy; + cairo_t *cr; + + copy = cairo_image_surface_create (gdk_cairo_format_for_content (content), + width, + height); + + cr = cairo_create (copy); + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); + cairo_set_source_surface (cr, surface, -src_x, -src_y); + cairo_paint (cr); + cairo_destroy (cr); + + return copy; +} + +static void +convert_alpha (guchar *dest_data, + int dest_stride, + guchar *src_data, + int src_stride, + int src_x, + int src_y, + int width, + int height) +{ + int x, y; + + src_data += src_stride * src_y + src_x * 4; + + for (y = 0; y < height; y++) { + guint32 *src = (guint32 *) src_data; + + for (x = 0; x < width; x++) { + guint alpha = src[x] >> 24; + + if (alpha == 0) + { + dest_data[x * 4 + 0] = 0; + dest_data[x * 4 + 1] = 0; + dest_data[x * 4 + 2] = 0; + } + else + { + dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha; + dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >> 8) * 255 + alpha / 2) / alpha; + dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >> 0) * 255 + alpha / 2) / alpha; + } + dest_data[x * 4 + 3] = alpha; + } + + src_data += src_stride; + dest_data += dest_stride; + } +} + +static void +convert_no_alpha (guchar *dest_data, + int dest_stride, + guchar *src_data, + int src_stride, + int src_x, + int src_y, + int width, + int height) +{ + int x, y; + + src_data += src_stride * src_y + src_x * 4; + + for (y = 0; y < height; y++) { + guint32 *src = (guint32 *) src_data; + + for (x = 0; x < width; x++) { + dest_data[x * 3 + 0] = src[x] >> 16; + dest_data[x * 3 + 1] = src[x] >> 8; + dest_data[x * 3 + 2] = src[x]; + } + + src_data += src_stride; + dest_data += dest_stride; + } +} + +GdkPixbuf * +gdk_pixbuf_get_from_surface (cairo_surface_t *surface, + gint src_x, + gint src_y, + gint width, + gint height) +{ + cairo_content_t content; + GdkPixbuf *dest; + + /* General sanity checks */ + g_return_val_if_fail (surface != NULL, NULL); + g_return_val_if_fail (width > 0 && height > 0, NULL); + + content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR; + dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, + !!(content & CAIRO_CONTENT_ALPHA), + 8, + width, height); + + if (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_IMAGE && + cairo_image_surface_get_format (surface) == gdk_cairo_format_for_content (content)) + surface = cairo_surface_reference (surface); + else + { + surface = gdk_cairo_surface_coerce_to_image (surface, content, + src_x, src_y, + width, height); + src_x = 0; + src_y = 0; + } + cairo_surface_flush (surface); + if (cairo_surface_status (surface) || dest == NULL) + { + cairo_surface_destroy (surface); + return NULL; + } + + if (gdk_pixbuf_get_has_alpha (dest)) + convert_alpha (gdk_pixbuf_get_pixels (dest), + gdk_pixbuf_get_rowstride (dest), + cairo_image_surface_get_data (surface), + cairo_image_surface_get_stride (surface), + src_x, src_y, + width, height); + else + convert_no_alpha (gdk_pixbuf_get_pixels (dest), + gdk_pixbuf_get_rowstride (dest), + cairo_image_surface_get_data (surface), + cairo_image_surface_get_stride (surface), + src_x, src_y, + width, height); + + cairo_surface_destroy (surface); + return dest; +} +#endif + +GdkPixbuf * +clock_utils_pixbuf_from_svg_file_at_size (const char *name, int width, int height) +{ + RsvgHandle *handle = NULL; + RsvgDimensionData svg_dimensions; + GdkPixbuf *pixbuf = NULL; + cairo_surface_t *surface = NULL; + cairo_matrix_t matrix; + cairo_t *cr = NULL; + + handle = rsvg_handle_new_from_file (name, NULL); + if (!handle) + return NULL; + + rsvg_handle_get_dimensions (handle, &svg_dimensions); + + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); + cr = cairo_create (surface); + cairo_matrix_init_scale (&matrix, + ((double) width / svg_dimensions.width), + ((double) height / svg_dimensions.height)); + cairo_transform (cr, &matrix); + rsvg_handle_render_cairo (handle, cr); + cairo_destroy (cr); + + pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, width, height); + cairo_surface_destroy (surface); + + rsvg_handle_close (handle, NULL); + + return pixbuf; +} + diff --git a/applets/clock/clock-utils.h b/applets/clock/clock-utils.h index da54094f..647f7222 100644 --- a/applets/clock/clock-utils.h +++ b/applets/clock/clock-utils.h @@ -50,6 +50,8 @@ void clock_utils_display_help (GtkWidget *widget, const char *doc_id, const char *link_id); +GdkPixbuf * clock_utils_pixbuf_from_svg_file_at_size (const char *name, int width, int height); + #ifdef __cplusplus } #endif diff --git a/applets/clock/clock.c b/applets/clock/clock.c index 4592698e..efaba2fd 100644 --- a/applets/clock/clock.c +++ b/applets/clock/clock.c @@ -186,7 +186,9 @@ struct _ClockData { /* Used to count the number of clock instances. It's there to know when we * should free resources that are shared. */ +/* FIXME unused variable, remove? static int clock_numbers = 0; +*/ static void update_clock (ClockData * cd); static void update_tooltip (ClockData * cd); @@ -2907,7 +2909,6 @@ temperature_combo_changed (GtkComboBox *combo, ClockData *cd) { int value; int old_value; - const gchar *str; value = gtk_combo_box_get_active (combo) + 2; old_value = cd->temperature_unit; @@ -2923,7 +2924,6 @@ speed_combo_changed (GtkComboBox *combo, ClockData *cd) { int value; int old_value; - const gchar *str; value = gtk_combo_box_get_active (combo) + 2; old_value = cd->speed_unit; @@ -2960,9 +2960,7 @@ fill_prefs_window (ClockData *cd) GtkCellRenderer *renderer; GtkTreeViewColumn *col; GtkListStore *store; -#if GTK_CHECK_VERSION (3, 0, 0) GtkTreeIter iter; -#endif int i; /* Set the 12 hour / 24 hour widget */ @@ -3025,14 +3023,9 @@ fill_prefs_window (ClockData *cd) gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (widget), renderer, "text", 0, NULL); for (i = 0; temperatures[i] != -1; i++) -#if GTK_CHECK_VERSION (3, 0, 0) gtk_list_store_insert_with_values (store, &iter, -1, 0, mateweather_prefs_get_temp_display_name (temperatures[i]), -1); -#else - gtk_combo_box_append_text (GTK_COMBO_BOX (widget), - mateweather_prefs_get_temp_display_name (temperatures[i])); -#endif if (cd->temperature_unit > 0) gtk_combo_box_set_active (GTK_COMBO_BOX (widget), @@ -3049,14 +3042,9 @@ fill_prefs_window (ClockData *cd) gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (widget), renderer, "text", 0, NULL); for (i = 0; speeds[i] != -1; i++) -#if GTK_CHECK_VERSION (3, 0, 0) gtk_list_store_insert_with_values (store, &iter, -1, 0, mateweather_prefs_get_speed_display_name (speeds[i]), -1); -#else - gtk_combo_box_append_text (GTK_COMBO_BOX (widget), - mateweather_prefs_get_speed_display_name (speeds[i])); -#endif if (cd->speed_unit > 0) gtk_combo_box_set_active (GTK_COMBO_BOX (widget), diff --git a/applets/clock/test-system-timezone.c b/applets/clock/test-system-timezone.c index 8e3e26af..79084618 100644 --- a/applets/clock/test-system-timezone.c +++ b/applets/clock/test-system-timezone.c @@ -93,10 +93,6 @@ main (int argc, retval = 0; -#if !GLIB_CHECK_VERSION (2, 36, 0) - g_type_init (); -#endif - context = g_option_context_new (""); g_option_context_add_main_entries (context, options, NULL); diff --git a/applets/fish/fish.c b/applets/fish/fish.c index c4a91d88..f9a69435 100644 --- a/applets/fish/fish.c +++ b/applets/fish/fish.c @@ -850,10 +850,6 @@ static void display_fortune_dialog(FishApplet* fish) gtk_window_set_icon_name (GTK_WINDOW (fish->fortune_dialog), FISH_ICON); -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_dialog_set_has_separator ( - GTK_DIALOG (fish->fortune_dialog), FALSE); -#endif gtk_dialog_set_default_response ( GTK_DIALOG (fish->fortune_dialog), GTK_RESPONSE_CLOSE); 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); diff --git a/configure.ac b/configure.ac index 708290e7..b7de598a 100644 --- a/configure.ac +++ b/configure.ac @@ -59,7 +59,7 @@ AC_CHECK_FUNCS(_NSGetEnviron) LIBMATE_DESKTOP_REQUIRED=1.9.0 GDK_PIXBUF_REQUIRED=2.7.1 PANGO_REQUIRED=1.15.4 -GLIB_REQUIRED=2.26 +GLIB_REQUIRED=2.36 LIBMATE_MENU_REQUIRED=1.1.0 CAIRO_REQUIRED=1.0.0 DBUS_GLIB_REQUIRED=0.80 diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c index c3b8e422..ef61f846 100644 --- a/libmate-panel-applet/mate-panel-applet.c +++ b/libmate-panel-applet/mate-panel-applet.c @@ -561,11 +561,7 @@ mate_panel_applet_request_focus (MatePanelApplet *applet, display = gdk_screen_get_display (screen); xdisplay = GDK_DISPLAY_XDISPLAY (display); -#if GTK_CHECK_VERSION (3, 0, 0) xroot = GDK_WINDOW_XID (root); -#else - xroot = GDK_WINDOW_XWINDOW (root); -#endif mate_panel_applet_init_atoms (xdisplay); @@ -948,15 +944,9 @@ mate_panel_applet_button_event (GtkWidget *widget, } xevent.xbutton.display = GDK_WINDOW_XDISPLAY (window); -#if GTK_CHECK_VERSION (3, 0, 0) xevent.xbutton.window = GDK_WINDOW_XID (socket_window); xevent.xbutton.root = GDK_WINDOW_XID (gdk_screen_get_root_window (gdk_window_get_screen (window))); -#else - xevent.xbutton.window = GDK_WINDOW_XWINDOW (socket_window); - xevent.xbutton.root = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window - (gdk_drawable_get_screen (window))); -#endif /* * FIXME: the following might cause * big problems for non-GTK apps @@ -972,11 +962,7 @@ mate_panel_applet_button_event (GtkWidget *widget, gdk_error_trap_push (); XSendEvent (GDK_WINDOW_XDISPLAY (window), -#if GTK_CHECK_VERSION (3, 0, 0) GDK_WINDOW_XID (socket_window), -#else - GDK_WINDOW_XWINDOW (socket_window), -#endif False, NoEventMask, &xevent); gdk_flush (); @@ -1475,12 +1461,10 @@ mate_panel_applet_get_pixmap (MatePanelApplet *applet, } #endif -#if GTK_CHECK_VERSION(3, 0, 0) width = gdk_window_get_width(window); height = gdk_window_get_height(window); +#if GTK_CHECK_VERSION(3, 0, 0) surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height); -#else - gdk_drawable_get_size(GDK_DRAWABLE(window), &width, &height); #endif #if GTK_CHECK_VERSION (3, 0, 0) diff --git a/mate-panel/libegg/eggdesktopfile.c b/mate-panel/libegg/eggdesktopfile.c index fbd4f30e..384fd475 100644 --- a/mate-panel/libegg/eggdesktopfile.c +++ b/mate-panel/libegg/eggdesktopfile.c @@ -909,7 +909,6 @@ parse_link (EggDesktopFile *desktop_file, return TRUE; } -#if GTK_CHECK_VERSION (2, 12, 0) static char * start_startup_notification (GdkDisplay *display, EggDesktopFile *desktop_file, @@ -1020,7 +1019,6 @@ set_startup_notification_timeout (GdkDisplay *display, g_timeout_add_seconds (EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH, startup_notification_timeout, sn_data); } -#endif /* GTK 2.12 */ static GPtrArray * array_putenv (GPtrArray *env, char *variable) @@ -1207,7 +1205,6 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, } g_free (command); -#if GTK_CHECK_VERSION (2, 12, 0) startup_id = start_startup_notification (display, desktop_file, argv[0], screen_num, workspace, launch_time); @@ -1218,9 +1215,6 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, env = array_putenv (env, startup_id_env); g_free (startup_id_env); } -#else - startup_id = NULL; -#endif /* GTK 2.12 */ if (env != NULL) g_ptr_array_add (env, NULL); @@ -1238,7 +1232,6 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, if (startup_id) { -#if GTK_CHECK_VERSION (2, 12, 0) if (current_success) { set_startup_notification_timeout (display, startup_id); @@ -1249,7 +1242,6 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, g_free (startup_id); } else -#endif /* GTK 2.12 */ g_free (startup_id); } else if (ret_startup_id) diff --git a/mate-panel/libegg/eggsmclient-xsmp.c b/mate-panel/libegg/eggsmclient-xsmp.c index b5f90cee..3e2a6949 100644 --- a/mate-panel/libegg/eggsmclient-xsmp.c +++ b/mate-panel/libegg/eggsmclient-xsmp.c @@ -37,9 +37,7 @@ #include <gtk/gtk.h> #include <gdk/gdk.h> -#if GTK_CHECK_VERSION (3, 0, 0) #include <gdk/gdkx.h> -#endif #define EGG_TYPE_SM_CLIENT_XSMP (egg_sm_client_xsmp_get_type ()) #define EGG_SM_CLIENT_XSMP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMP)) @@ -371,11 +369,7 @@ sm_client_xsmp_startup (EggSMClient *client, free (ret_client_id); gdk_threads_enter (); -#if GTK_CHECK_VERSION (3, 0, 0) gdk_x11_set_sm_client_id (xsmp->client_id); -#else - gdk_set_sm_client_id (xsmp->client_id); -#endif gdk_threads_leave (); g_debug ("Got client ID \"%s\"", xsmp->client_id); diff --git a/mate-panel/libpanel-util/panel-launch.c b/mate-panel/libpanel-util/panel-launch.c index 28824269..ce5d97c7 100644 --- a/mate-panel/libpanel-util/panel-launch.c +++ b/mate-panel/libpanel-util/panel-launch.c @@ -240,9 +240,7 @@ panel_launch_desktop_file_with_fallback (const char *desktop_file, GError *local_error; gboolean retval; GPid pid; -#if GTK_CHECK_VERSION (3, 0, 0) char *display; -#endif g_return_val_if_fail (desktop_file != NULL, FALSE); g_return_val_if_fail (fallback_exec != NULL, FALSE); @@ -259,7 +257,6 @@ panel_launch_desktop_file_with_fallback (const char *desktop_file, local_error = NULL; } -#if GTK_CHECK_VERSION (3, 0, 0) display = gdk_screen_make_display_name (screen); retval = g_spawn_async (NULL, /* working directory */ argv, @@ -267,14 +264,9 @@ panel_launch_desktop_file_with_fallback (const char *desktop_file, G_SPAWN_SEARCH_PATH, set_environment, &display, - NULL, + &pid, &local_error); g_free (display); -#else - retval = gdk_spawn_on_screen (screen, NULL, argv, NULL, - G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, &pid, &local_error); -#endif if (local_error == NULL && retval == TRUE) { g_child_watch_add (pid, dummy_child_watch, NULL); diff --git a/mate-panel/menu.c b/mate-panel/menu.c index 55ec955c..e709ec29 100644 --- a/mate-panel/menu.c +++ b/mate-panel/menu.c @@ -1152,11 +1152,7 @@ image_menuitem_size_request (GtkWidget *menuitem, req_height += (gtk_container_get_border_width (GTK_CONTAINER (menuitem)) + (gtk_widget_get_style (menuitem))->ythickness) * 2; -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_set_size_request (menuitem, -1, req_height); -#else - requisition->height = MAX (requisition->height, req_height); -#endif } static char * diff --git a/mate-panel/panel-action-protocol.c b/mate-panel/panel-action-protocol.c index 3a4efa72..ca5b7b5b 100644 --- a/mate-panel/panel-action-protocol.c +++ b/mate-panel/panel-action-protocol.c @@ -149,20 +149,9 @@ void panel_action_protocol_init (void) { GdkDisplay *display; -#if !GTK_CHECK_VERSION (3, 0, 0) - GdkAtom gdk_atom_mate_panel_action; - GdkAtom gdk_atom_gnome_panel_action; -#endif display = gdk_display_get_default (); -#if !GTK_CHECK_VERSION (3, 0, 0) - gdk_atom_mate_panel_action = - gdk_atom_intern_static_string ("_MATE_PANEL_ACTION"); - gdk_atom_gnome_panel_action = - gdk_atom_intern_static_string ("_GNOME_PANEL_ACTION"); -#endif - atom_mate_panel_action = XInternAtom (GDK_DISPLAY_XDISPLAY (display), "_MATE_PANEL_ACTION", @@ -192,15 +181,6 @@ panel_action_protocol_init (void) "_MATE_PANEL_ACTION_KILL_DIALOG", FALSE); -#if GTK_CHECK_VERSION (3, 0, 0) /* We'll filter event sent on non-root windows later */ gdk_window_add_filter (NULL, panel_action_protocol_filter, NULL); -#else - gdk_display_add_client_message_filter ( - display, gdk_atom_mate_panel_action, - panel_action_protocol_filter, NULL); - gdk_display_add_client_message_filter ( - display, gdk_atom_gnome_panel_action, - panel_action_protocol_filter, NULL); -#endif } diff --git a/mate-panel/panel-addto.c b/mate-panel/panel-addto.c index 6535ba3b..5a06df8c 100644 --- a/mate-panel/panel-addto.c +++ b/mate-panel/panel-addto.c @@ -1262,10 +1262,7 @@ panel_addto_dialog_new (PanelWidget *panel_widget) GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE); -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_dialog_set_has_separator (GTK_DIALOG (dialog->addto_dialog), - FALSE); -#endif + gtk_dialog_set_default_response (GTK_DIALOG (dialog->addto_dialog), PANEL_ADDTO_RESPONSE_ADD); diff --git a/mate-panel/panel-background-monitor.c b/mate-panel/panel-background-monitor.c index a7e67e05..ce9737cf 100644 --- a/mate-panel/panel-background-monitor.c +++ b/mate-panel/panel-background-monitor.c @@ -166,11 +166,7 @@ panel_background_monitor_connect_to_screen (PanelBackgroundMonitor *monitor, G_CALLBACK (panel_background_monitor_changed), monitor); monitor->gdkwindow = gdk_screen_get_root_window (screen); -#if GTK_CHECK_VERSION (3, 0, 0) - monitor->xwindow = gdk_x11_window_get_xid (monitor->gdkwindow); -#else - monitor->xwindow = gdk_x11_drawable_get_xid (monitor->gdkwindow); -#endif + monitor->xwindow = GDK_WINDOW_XID (monitor->gdkwindow); gdk_window_add_filter ( monitor->gdkwindow, panel_background_monitor_xevent_filter, monitor); diff --git a/mate-panel/panel-background.c b/mate-panel/panel-background.c index f85fb939..bd5370c0 100644 --- a/mate-panel/panel-background.c +++ b/mate-panel/panel-background.c @@ -1296,8 +1296,7 @@ panel_background_make_string (PanelBackground *background, retval = g_strdup_printf ("pixmap:%d,%d,%d", (guint32)cairo_xlib_surface_get_drawable (surface), x, y); #else - pixmap_xid = gdk_x11_drawable_get_xid ( - GDK_DRAWABLE (background->pixmap)); + pixmap_xid = GDK_WINDOW_XID (GDK_DRAWABLE (background->pixmap)); retval = g_strdup_printf ("pixmap:%d,%d,%d", pixmap_xid, x, y); #endif diff --git a/mate-panel/panel-ditem-editor.c b/mate-panel/panel-ditem-editor.c index 2f25ca30..7a4a9e64 100644 --- a/mate-panel/panel-ditem-editor.c +++ b/mate-panel/panel-ditem-editor.c @@ -622,10 +622,6 @@ panel_ditem_editor_make_ui (PanelDItemEditor *dialog) dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); gtk_box_set_spacing (GTK_BOX (dialog_vbox), 2); -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); -#endif - priv->table = gtk_table_new (4, 3, FALSE); gtk_container_set_border_width (GTK_CONTAINER (priv->table), 5); gtk_table_set_row_spacings (GTK_TABLE (priv->table), 6); diff --git a/mate-panel/panel-force-quit.c b/mate-panel/panel-force-quit.c index 34fd8ee2..b4498aeb 100644 --- a/mate-panel/panel-force-quit.c +++ b/mate-panel/panel-force-quit.c @@ -255,11 +255,7 @@ handle_button_press_event (GtkWidget *popup, window = find_managed_window (event->display, event->subwindow); if (window != None) { -#if GTK_CHECK_VERSION (3, 0, 0) if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (event->display), window)) -#else - if (!gdk_xid_table_lookup_for_display (gdk_x11_lookup_xdisplay (event->display), window)) -#endif kill_window_question ((gpointer) window); } } diff --git a/mate-panel/panel-menu-button.c b/mate-panel/panel-menu-button.c index 4b2c8402..e7325645 100644 --- a/mate-panel/panel-menu-button.c +++ b/mate-panel/panel-menu-button.c @@ -1059,11 +1059,7 @@ panel_menu_button_accessible_get_n_children (AtkObject *obj) { g_return_val_if_fail (PANEL_IS_MENU_BUTTON_ACCESSIBLE (obj), 0); -#if GTK_CHECK_VERSION (2, 21, 0) return gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)) ? 1 : 0; -#else - return GTK_ACCESSIBLE (obj)->widget ? 1 : 0; -#endif } static AtkObject * @@ -1078,11 +1074,7 @@ panel_menu_button_accessible_ref_child (AtkObject *obj, if (index != 0) return NULL; -#if GTK_CHECK_VERSION (2, 21, 0) if (!(button = PANEL_MENU_BUTTON (gtk_accessible_get_widget (GTK_ACCESSIBLE (obj))))) -#else - if (!(button = PANEL_MENU_BUTTON (GTK_ACCESSIBLE (obj)->widget))) -#endif return NULL; if (!(menu = panel_menu_button_create_menu (button))) diff --git a/mate-panel/panel-multiscreen.c b/mate-panel/panel-multiscreen.c index 27c29135..e475fd7b 100644 --- a/mate-panel/panel-multiscreen.c +++ b/mate-panel/panel-multiscreen.c @@ -133,11 +133,7 @@ panel_multiscreen_get_randr_monitors_for_screen (GdkScreen *screen, */ xdisplay = GDK_SCREEN_XDISPLAY (screen); -#if GTK_CHECK_VERSION (3, 0, 0) xroot = GDK_WINDOW_XID (gdk_screen_get_root_window (screen)); -#else - xroot = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)); -#endif #if (RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)) if (have_randr_1_3) { diff --git a/mate-panel/panel-session.c b/mate-panel/panel-session.c index 5f43f3f4..917d9ff5 100644 --- a/mate-panel/panel-session.c +++ b/mate-panel/panel-session.c @@ -80,9 +80,5 @@ panel_session_init (void) /* We don't want the WM to try and save/restore our * window position */ -#if GTK_CHECK_VERSION (3, 0, 0) gdk_x11_set_sm_client_id (NULL); -#else - gdk_set_sm_client_id (NULL); -#endif } diff --git a/mate-panel/panel-util.c b/mate-panel/panel-util.c index dd6ad79b..4406b755 100644 --- a/mate-panel/panel-util.c +++ b/mate-panel/panel-util.c @@ -457,11 +457,7 @@ void panel_lock_screen(GdkScreen* screen) static char* panel_launcher_get_personal_path(void) { - #if GLIB_CHECK_VERSION(2, 6, 0) return g_build_filename(g_get_user_config_dir(), "mate", "panel2.d", "default", "launchers", NULL); - #else // glib version < 2.6.0 - return g_build_filename(g_get_home_dir(), ".config", "mate", "panel2.d", "default", "launchers", NULL); - #endif } gboolean diff --git a/mate-panel/panel-xutils.c b/mate-panel/panel-xutils.c index ccf68116..34e851fd 100644 --- a/mate-panel/panel-xutils.c +++ b/mate-panel/panel-xutils.c @@ -51,11 +51,7 @@ panel_xutils_set_window_type (GdkWindow *gdk_window, g_return_if_fail (GDK_IS_WINDOW (gdk_window)); display = GDK_WINDOW_XDISPLAY (gdk_window); -#if GTK_CHECK_VERSION (3, 0, 0) window = GDK_WINDOW_XID (gdk_window); -#else - window = GDK_WINDOW_XWINDOW (gdk_window); -#endif if (net_wm_window_type == None) net_wm_window_type = XInternAtom (display, @@ -122,11 +118,7 @@ panel_xutils_set_strut (GdkWindow *gdk_window, g_return_if_fail (GDK_IS_WINDOW (gdk_window)); display = GDK_WINDOW_XDISPLAY (gdk_window); -#if GTK_CHECK_VERSION (3, 0, 0) window = GDK_WINDOW_XID (gdk_window); -#else - window = GDK_WINDOW_XWINDOW (gdk_window); -#endif if (net_wm_strut == None) net_wm_strut = XInternAtom (display, "_NET_WM_STRUT", False); @@ -181,11 +173,7 @@ panel_warp_pointer (GdkWindow *gdk_window, g_return_if_fail (GDK_IS_WINDOW (gdk_window)); display = GDK_WINDOW_XDISPLAY (gdk_window); -#if GTK_CHECK_VERSION (3, 0, 0) window = GDK_WINDOW_XID (gdk_window); -#else - window = GDK_WINDOW_XWINDOW (gdk_window); -#endif gdk_error_trap_push (); XWarpPointer (display, None, window, 0, 0, 0, 0, x, y); diff --git a/mate-panel/xstuff.c b/mate-panel/xstuff.c index d31f6d97..9af5d919 100644 --- a/mate-panel/xstuff.c +++ b/mate-panel/xstuff.c @@ -163,11 +163,7 @@ xstuff_is_compliant_wm (void) int size; xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); -#if GTK_CHECK_VERSION (3, 0, 0) root_window = GDK_WINDOW_XID (gdk_get_default_root_window ()); -#else - root_window = GDK_WINDOW_XWINDOW (gdk_get_default_root_window ()); -#endif /* FIXME this is totally broken; should be using * gdk_net_wm_supports() on particular hints when we rely @@ -215,11 +211,7 @@ xstuff_set_pos_size (GdkWindow *window, int x, int y, int w, int h) gdk_error_trap_push (); XSetWMNormalHints (GDK_WINDOW_XDISPLAY (window), -#if GTK_CHECK_VERSION (3, 0, 0) GDK_WINDOW_XID (window), -#else - GDK_WINDOW_XWINDOW (window), -#endif &size_hints); gdk_window_move_resize (window, x, y, w, h); @@ -251,11 +243,7 @@ xstuff_set_wmspec_dock_hints (GdkWindow *window, } XChangeProperty (GDK_WINDOW_XDISPLAY (window), -#if GTK_CHECK_VERSION (3, 0, 0) GDK_WINDOW_XID (window), -#else - GDK_WINDOW_XWINDOW (window), -#endif panel_atom_get ("_NET_WM_WINDOW_TYPE"), XA_ATOM, 32, PropModeReplace, (unsigned char *) atoms, @@ -277,11 +265,7 @@ xstuff_set_wmspec_strut (GdkWindow *window, vals [3] = bottom; XChangeProperty (GDK_WINDOW_XDISPLAY (window), -#if GTK_CHECK_VERSION (3, 0, 0) GDK_WINDOW_XID (window), -#else - GDK_WINDOW_XWINDOW (window), -#endif panel_atom_get ("_NET_WM_STRUT"), XA_CARDINAL, 32, PropModeReplace, (unsigned char *) vals, 4); @@ -291,11 +275,7 @@ void xstuff_delete_property (GdkWindow *window, const char *name) { Display *xdisplay = GDK_WINDOW_XDISPLAY (window); -#if GTK_CHECK_VERSION (3, 0, 0) Window xwindow = GDK_WINDOW_XID (window); -#else - Window xwindow = GDK_WINDOW_XWINDOW (window); -#endif XDeleteProperty (xdisplay, xwindow, panel_atom_get (name)); @@ -518,11 +498,7 @@ draw_zoom_animation (GdkScreen *gscreen, int depth; dpy = gdk_x11_display_get_xdisplay (gdk_screen_get_display (gscreen)); -#if GTK_CHECK_VERSION (3, 0, 0) root_win = GDK_WINDOW_XID (gdk_screen_get_root_window (gscreen)); -#else - root_win = gdk_x11_drawable_get_xid (gdk_screen_get_root_window (gscreen)); -#endif screen = gdk_screen_get_number (gscreen); #if GTK_CHECK_VERSION (3, 0, 0) depth = DefaultDepth(dpy,screen); @@ -690,11 +666,7 @@ xstuff_get_current_workspace (GdkScreen *screen) int result; int retval; -#if GTK_CHECK_VERSION (3, 0, 0) root_window = GDK_WINDOW_XID (gdk_screen_get_root_window (screen)); -#else - root_window = gdk_x11_drawable_get_xid (gdk_screen_get_root_window (screen)); -#endif gdk_error_trap_push (); result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen)), @@ -739,20 +711,12 @@ xstuff_grab_key_on_all_screens (int keycode, if (grab) XGrabKey (gdk_x11_display_get_xdisplay (display), keycode, modifiers, -#if GTK_CHECK_VERSION (3, 0, 0) GDK_WINDOW_XID (root), -#else - gdk_x11_drawable_get_xid (root), -#endif True, GrabModeAsync, GrabModeAsync); else XUngrabKey (gdk_x11_display_get_xdisplay (display), keycode, modifiers, -#if GTK_CHECK_VERSION (3, 0, 0) GDK_WINDOW_XID (root)); -#else - gdk_x11_drawable_get_xid (root)); -#endif } } |