Updating branch refs/heads/bluesabre/gtk3 to 90831afd60954c0e3aa80b09062347d449a7665c (commit) from 5e90e6d3dc8547b8cd33527b495d2da052ec7bfc (commit)
commit 90831afd60954c0e3aa80b09062347d449a7665c Author: Sean Davis <smd.seanda...@gmail.com> Date: Sat Aug 24 08:02:10 2013 -0400 Remove GTK2 compatability code src/common/parole-common.c | 8 ------ src/common/parole-screensaver.c | 8 ------ src/gst/parole-gst.c | 30 --------------------- src/parole-button.c | 14 ---------- src/parole-conf-dialog.c | 4 --- src/parole-medialist.c | 12 --------- src/parole-player.c | 56 --------------------------------------- 7 files changed, 132 deletions(-) diff --git a/src/common/parole-common.c b/src/common/parole-common.c index d730218..91a65fe 100644 --- a/src/common/parole-common.c +++ b/src/common/parole-common.c @@ -85,11 +85,7 @@ void parole_window_busy_cursor (GdkWindow *window) cursor = gdk_cursor_new (GDK_WATCH); gdk_window_set_cursor (window, cursor); -#if GTK_CHECK_VERSION(3, 0, 0) g_object_unref (cursor); -#else - gdk_cursor_unref (cursor); -#endif gdk_flush (); } @@ -103,10 +99,6 @@ void parole_window_invisible_cursor (GdkWindow *window) gdk_window_set_cursor (window, cursor); if (cursor) { -#if GTK_CHECK_VERSION(3, 0, 0) g_object_unref (cursor); -#else - gdk_cursor_unref (cursor); -#endif } } diff --git a/src/common/parole-screensaver.c b/src/common/parole-screensaver.c index d902477..a754cbb 100644 --- a/src/common/parole-screensaver.c +++ b/src/common/parole-screensaver.c @@ -80,11 +80,7 @@ void parole_screen_saver_inhibit (ParoleScreenSaver *saver, GtkWindow *window) g_return_if_fail (PAROLE_IS_SCREENSAVER (saver)); -#if GTK_CHECK_VERSION(3, 0, 0) cmd = g_strdup_printf("xdg-screensaver suspend %i", (int)GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window)))); -#else - cmd = g_strdup_printf("xdg-screensaver suspend %lu", GDK_DRAWABLE_XID (gtk_widget_get_window (GTK_WIDGET (window)))); -#endif returncode = system(cmd); TRACE("\'xdg-screensaver suspend\' returned %i", returncode); @@ -99,11 +95,7 @@ void parole_screen_saver_uninhibit (ParoleScreenSaver *saver, GtkWindow *window) g_return_if_fail (PAROLE_IS_SCREENSAVER (saver)); -#if GTK_CHECK_VERSION(3, 0, 0) cmd = g_strdup_printf("xdg-screensaver resume %i", (int)GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window)))); -#else - cmd = g_strdup_printf("xdg-screensaver resume %lu", GDK_DRAWABLE_XID (gtk_widget_get_window (GTK_WIDGET (window)))); -#endif returncode = system(cmd); TRACE("\'xdg-screensaver resume\' returned %i", returncode); diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c index 60f8183..347bcd3 100644 --- a/src/gst/parole-gst.c +++ b/src/gst/parole-gst.c @@ -247,11 +247,7 @@ parole_gst_realize (GtkWidget *widget) ParoleGst *gst; GtkAllocation *allocation = g_new0 (GtkAllocation, 1); GdkWindowAttr attr; -#if GTK_CHECK_VERSION(3, 0, 0) GdkRGBA color; -#else - GdkColor color; -#endif gint mask; gtk_widget_set_realized (widget, TRUE); @@ -264,10 +260,6 @@ parole_gst_realize (GtkWidget *widget) attr.width = allocation->width; attr.height = allocation->height; attr.visual = gtk_widget_get_visual (widget); -#if GTK_CHECK_VERSION(3, 0, 0) -#else - attr.colormap = gtk_widget_get_colormap (widget); -#endif attr.wclass = GDK_INPUT_OUTPUT; attr.window_type = GDK_WINDOW_CHILD; attr.event_mask = gtk_widget_get_events (widget) | @@ -277,38 +269,20 @@ parole_gst_realize (GtkWidget *widget) GDK_POINTER_MOTION_MASK | GDK_KEY_PRESS_MASK; -#if GTK_CHECK_VERSION(3, 0, 0) mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; -#else - mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; -#endif gtk_widget_set_window(widget, gdk_window_new (gtk_widget_get_parent_window (widget), &attr, mask) ); gdk_window_set_user_data (gtk_widget_get_window(widget), widget); -#if GTK_CHECK_VERSION(3, 0, 0) gdk_rgba_parse (&color, "black"); gdk_window_set_background_rgba (gtk_widget_get_window(widget), &color); -#else - gdk_color_parse ("black", &color); - gdk_colormap_alloc_color (gtk_widget_get_colormap (widget), &color, - TRUE, TRUE); - - gdk_window_set_background (gtk_widget_get_window(widget), &color); - - gtk_widget_set_style(widget, gtk_style_attach (gtk_widget_get_style(widget), gtk_widget_get_window(widget))); -#endif g_signal_connect (gtk_widget_get_toplevel (widget), "configure_event", G_CALLBACK (parole_gst_configure_event_cb), gst); -#if GTK_CHECK_VERSION(3, 0, 0) g_signal_connect (gtk_widget_get_parent(gtk_widget_get_parent (widget)), "draw", -#else - g_signal_connect (gtk_widget_get_parent(gtk_widget_get_parent (widget)), "expose-event", -#endif G_CALLBACK (parole_gst_parent_expose_event), gst); g_free(allocation); @@ -1636,11 +1610,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data) gtk_widget_get_realized (GTK_WIDGET (gst))) { gst_install_plugins_context_set_xid (ctx, -#if GTK_CHECK_VERSION(3, 0, 0) gdk_x11_window_get_xid (gtk_widget_get_window(GTK_WIDGET (gst)))); -#else - gdk_x11_drawable_get_xid (gtk_widget_get_window(GTK_WIDGET (gst)))); -#endif } #endif /* GDK_WINDOWING_X11 */ diff --git a/src/parole-button.c b/src/parole-button.c index ad8c578..1c593ca 100644 --- a/src/parole-button.c +++ b/src/parole-button.c @@ -157,15 +157,9 @@ parole_button_grab_keystring (ParoleButton *button, guint keycode) gdk_error_trap_push (); -#if GTK_CHECK_VERSION(3, 0, 0) ret = XGrabKey (GDK_DISPLAY_XDISPLAY(display), keycode, modmask, gdk_x11_window_get_xid (button->priv->window), True, GrabModeAsync, GrabModeAsync); -#else - ret = XGrabKey (GDK_DISPLAY_XDISPLAY(display), keycode, modmask, - gdk_x11_drawable_get_xid (button->priv->window), True, - GrabModeAsync, GrabModeAsync); -#endif if ( ret == BadAccess ) { @@ -175,11 +169,7 @@ parole_button_grab_keystring (ParoleButton *button, guint keycode) } ret = XGrabKey (GDK_DISPLAY_XDISPLAY(display), keycode, LockMask | modmask, -#if GTK_CHECK_VERSION(3, 0, 0) gdk_x11_window_get_xid (button->priv->window), True, -#else - gdk_x11_drawable_get_xid (button->priv->window), True, -#endif GrabModeAsync, GrabModeAsync); if (ret == BadAccess) @@ -190,11 +180,7 @@ parole_button_grab_keystring (ParoleButton *button, guint keycode) } gdk_flush (); -#if GTK_CHECK_VERSION(3, 0, 0) gdk_error_trap_pop_ignored (); -#else - gdk_error_trap_pop (); -#endif return TRUE; } diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c index 12c2800..8ffbec4 100644 --- a/src/parole-conf-dialog.c +++ b/src/parole-conf-dialog.c @@ -335,7 +335,6 @@ parole_conf_dialog_init (ParoleConfDialog *self) static void parole_conf_dialog_add_vis_plugins (gpointer key, gpointer value, GtkWidget *combox) { -#if GTK_CHECK_VERSION(3, 0, 0) GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combox))); GtkTreeIter iter; @@ -343,9 +342,6 @@ parole_conf_dialog_add_vis_plugins (gpointer key, gpointer value, GtkWidget *com gtk_list_store_set( store, &iter, 0, (const gchar *) key, -1 ); g_object_unref (store); -#else - gtk_combo_box_append_text (GTK_COMBO_BOX (combox), (const gchar *) key); -#endif } /* Set the combobox to the default visualisation plugin */ diff --git a/src/parole-medialist.c b/src/parole-medialist.c index 774c724..acf6762 100644 --- a/src/parole-medialist.c +++ b/src/parole-medialist.c @@ -529,27 +529,15 @@ gboolean parole_media_list_key_press (GtkWidget *widget, GdkEventKey *ev, Parole GtkWidget *vbox_player; switch ( ev->keyval ) { -#if GTK_CHECK_VERSION(3, 0, 0) case GDK_KEY_Delete: -#else - case GDK_Delete: -#endif parole_media_list_remove_clicked_cb (NULL, list); return TRUE; break; -#if GTK_CHECK_VERSION(3, 0, 0) case GDK_KEY_Right: case GDK_KEY_Left: case GDK_KEY_Page_Down: case GDK_KEY_Page_Up: case GDK_KEY_Escape: -#else - case GDK_Right: - case GDK_Left: - case GDK_Page_Down: - case GDK_Page_Up: - case GDK_Escape: -#endif vbox_player = GTK_WIDGET(gtk_container_get_children( GTK_CONTAINER(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(widget))))))) )[0].data); gtk_widget_grab_focus(vbox_player); return TRUE; diff --git a/src/parole-player.c b/src/parole-player.c index 6e35cfb..cdc5645 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -2140,11 +2140,8 @@ static gboolean parole_player_hide_fs_window (gpointer data) GtkAllocation *allocation = g_new0 (GtkAllocation, 1); GdkWindow *gdkwindow; gint x, y, w, h; - -#if GTK_CHECK_VERSION (3, 0, 0) GdkDevice *dev; GdkDeviceManager *devmgr; -#endif player = PAROLE_PLAYER (data); @@ -2156,14 +2153,10 @@ static gboolean parole_player_hide_fs_window (gpointer data) h = allocation->height; g_free(allocation); -#if GTK_CHECK_VERSION (3, 0, 0) devmgr = gdk_display_get_device_manager(gtk_widget_get_display(GTK_WIDGET(player->priv->fs_window))); dev = gdk_device_manager_get_client_pointer(devmgr); gdk_window_get_device_position( gtk_widget_get_window(GTK_WIDGET(player->priv->fs_window)), dev, &x, &y, NULL); -#else - gtk_widget_get_pointer (player->priv->fs_window, &x, &y); -#endif if ((x >= 0) && (x <= w) && (y >= 0) && (y <= h)) return TRUE; @@ -2535,33 +2528,18 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player) switch (ev->keyval) { -#if GTK_CHECK_VERSION(3, 0, 0) case GDK_KEY_f: case GDK_KEY_F: -#else - case GDK_f: - case GDK_F: -#endif if ( player->priv->embedded != TRUE ) parole_player_full_screen_menu_item_activate (player); ret_val = TRUE; break; -#if GTK_CHECK_VERSION(3, 0, 0) case GDK_KEY_space: case GDK_KEY_p: case GDK_KEY_P: -#else - case GDK_space: - case GDK_p: - case GDK_P: -#endif parole_player_play_pause_clicked (NULL, player); ret_val = TRUE; break; -#if GTK_CHECK_VERSION(3, 0, 0) case GDK_KEY_Right: -#else - case GDK_Right: -#endif /* Media seekable ?*/ if ( gtk_widget_get_sensitive (player->priv->range) ) { @@ -2570,11 +2548,7 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player) } ret_val = TRUE; break; -#if GTK_CHECK_VERSION(3, 0, 0) case GDK_KEY_Left: -#else - case GDK_Left: -#endif if ( gtk_widget_get_sensitive (player->priv->range) ) { if (ev->state & GDK_CONTROL_MASK) parole_player_seekb_cb (NULL, player, seek_medium); @@ -2582,39 +2556,22 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player) } ret_val = TRUE; break; -#if GTK_CHECK_VERSION(3, 0, 0) case GDK_KEY_Page_Down: -#else - case GDK_Page_Down: -#endif if ( gtk_widget_get_sensitive (player->priv->range) ) parole_player_seekb_cb (NULL, player, seek_long); ret_val = TRUE; break; -#if GTK_CHECK_VERSION(3, 0, 0) case GDK_KEY_Page_Up: -#else - case GDK_Page_Up: -#endif if ( gtk_widget_get_sensitive (player->priv->range) ) parole_player_seekf_cb (NULL, player, seek_long); ret_val = TRUE; break; -#if GTK_CHECK_VERSION(3, 0, 0) case GDK_KEY_s: case GDK_KEY_S: -#else - case GDK_s: - case GDK_S: -#endif parole_player_stop_clicked (NULL, player); ret_val = TRUE; break; -#if GTK_CHECK_VERSION(3, 0, 0) case GDK_KEY_Escape: -#else - case GDK_Escape: -#endif parole_player_full_screen (player, FALSE); break; #ifdef HAVE_XF86_KEYSYM @@ -2628,13 +2585,8 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player) * Pass these to the media list and tell it to * grab the focus */ -#if GTK_CHECK_VERSION(3, 0, 0) case GDK_KEY_Up: case GDK_KEY_Down: -#else - case GDK_Up: - case GDK_Down: -#endif if (!player->priv->full_screen && gtk_widget_get_visible(player->priv->playlist_nt)) parole_media_list_grab_focus (player->priv->list); break; @@ -2656,11 +2608,7 @@ parole_player_key_press (GtkWidget *widget, GdkEventKey *ev, ParolePlayer *playe switch (ev->keyval) { -#if GTK_CHECK_VERSION(3, 0, 0) case GDK_KEY_F11: -#else - case GDK_F11: -#endif if ( player->priv->embedded != TRUE ) parole_player_full_screen_menu_item_activate (player); return TRUE; #ifdef HAVE_XF86_KEYSYM @@ -2920,11 +2868,7 @@ parole_player_set_wm_opacity_hint (GtkWidget *widget) gdkwindow = gtk_widget_get_window (widget); -#if GTK_CHECK_VERSION(3, 0, 0) XChangeProperty (xdisplay, gdk_x11_window_get_xid (gdkwindow), -#else - XChangeProperty (xdisplay, gdk_x11_drawable_get_xid (gdkwindow), -#endif atom, XA_CARDINAL, 32, PropModeAppend, (guchar *) &mode, _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits