Updating branch refs/heads/master
to 0e4f1538b2b899947d9f27e6bc93aa42f192cd72 (commit)
from e6bd7954ab1e9e4fe3a102399a40730bdd61370b (commit)
commit 0e4f1538b2b899947d9f27e6bc93aa42f192cd72
Author: Eric Koegel <eric.koe...@gmail.com>
Date: Mon Sep 16 09:45:38 2013 +0300
More Pre-GTK3 stuff
Switch to using GDK_KEY_, gseal a drag action, and add GTK_LIBS for
the xfdesktop-settings app.
settings/Makefile.am | 3 ++-
src/xfdesktop-file-icon-manager.c | 26 +++++++++++++-------------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/settings/Makefile.am b/settings/Makefile.am
index 640dd6a..b8f68cf 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -29,7 +29,8 @@ xfdesktop_settings_LDADD =
\
$(LIBEXO_LIBS)
\
$(GTHREAD_LIBS)
\
$(LIBWNCK_LIBS)
\
- $(LIBX11_LIBS)
+ $(LIBX11_LIBS)
\
+ $(GTK_LIBS)
if HAVE_CYGWIN
xfdesktop_settings_LDADD += \
diff --git a/src/xfdesktop-file-icon-manager.c
b/src/xfdesktop-file-icon-manager.c
index 46342d5..0ae54c2 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -2176,15 +2176,15 @@ xfdesktop_file_icon_manager_key_press(GtkWidget *widget,
gboolean force_delete = FALSE;
switch(evt->keyval) {
- case GDK_Delete:
- case GDK_KP_Delete:
+ case GDK_KEY_Delete:
+ case GDK_KEY_KP_Delete:
if(evt->state & GDK_SHIFT_MASK)
force_delete = TRUE;
xfdesktop_file_icon_manager_delete_selected(fmanager,
force_delete);
break;
- case GDK_c:
- case GDK_C:
+ case GDK_KEY_c:
+ case GDK_KEY_C:
if(!(evt->state & GDK_CONTROL_MASK)
|| (evt->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK)))
{
@@ -2198,8 +2198,8 @@ xfdesktop_file_icon_manager_key_press(GtkWidget *widget,
}
break;
- case GDK_x:
- case GDK_X:
+ case GDK_KEY_x:
+ case GDK_KEY_X:
if(!(evt->state & GDK_CONTROL_MASK)
|| (evt->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK)))
{
@@ -2213,8 +2213,8 @@ xfdesktop_file_icon_manager_key_press(GtkWidget *widget,
}
return TRUE;
- case GDK_v:
- case GDK_V:
+ case GDK_KEY_v:
+ case GDK_KEY_V:
if(!(evt->state & GDK_CONTROL_MASK)
|| (evt->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK)))
{
@@ -2225,19 +2225,19 @@ xfdesktop_file_icon_manager_key_press(GtkWidget *widget,
}
return TRUE;
- case GDK_r:
- case GDK_R:
+ case GDK_KEY_r:
+ case GDK_KEY_R:
if(!(evt->state & GDK_CONTROL_MASK)
|| (evt->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK)))
{
return FALSE;
}
/* fall through */
- case GDK_F5:
+ case GDK_KEY_F5:
xfdesktop_file_icon_manager_refresh_icons(fmanager);
return TRUE;
- case GDK_F2:
+ case GDK_KEY_F2:
selected =
xfdesktop_icon_view_get_selected_items(fmanager->priv->icon_view);
if(g_list_length(selected) == 1) {
XfdesktopFileIcon *icon = XFDESKTOP_FILE_ICON(selected->data);
@@ -3345,7 +3345,7 @@
xfdesktop_file_icon_manager_propose_drop_action(XfdesktopIconViewManager *manage
const gchar *src_name, *dest_name;
if(info == TARGET_TEXT_URI_LIST && action == GDK_ACTION_COPY
- && (context->actions & GDK_ACTION_MOVE) != 0) {
+ && (gdk_drag_context_get_actions(context) & GDK_ACTION_MOVE) != 0)
{
if(drop_icon) {
file_icon = XFDESKTOP_FILE_ICON(drop_icon);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
