[Xfce4-commits] <xfdesktop:danielm/port-to-gio> * src/xfdesktop-file-utils.c: * src/xfdesktop-file-utils.h: - Use GdkDragAction instead XfdesktopFileUtilsFileop

[Jannis Pohlmann]

Updating branch refs/heads/danielm/port-to-gio
         to b2f48a1cd61f62301d78b826f26d989c3af5b786 (commit)
       from f79c70449f5aeeb300645878d841389d4d302ad1 (commit)

commit b2f48a1cd61f62301d78b826f26d989c3af5b786
Author: Daniel Morales <daniel at daniel.com.uy>
Date:   Tue Feb 23 22:59:22 2010 -0200

    * src/xfdesktop-file-utils.c:
    * src/xfdesktop-file-utils.h:
    	- Use GdkDragAction instead XfdesktopFileUtilsFileop

 src/xfdesktop-file-utils.c |   10 +++++-----
 src/xfdesktop-file-utils.h |   12 ++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c
index 4b5c9c0..47c41f0 100644
--- a/src/xfdesktop-file-utils.c
+++ b/src/xfdesktop-file-utils.c
@@ -56,7 +56,7 @@ void
 xfdesktop_file_utils_handle_fileop_error(GtkWindow *parent,
                                          const XfdesktopFileIcon *src_icon,
                                          const XfdesktopFileIcon *dest_icon,
-                                         XfdesktopFileUtilsFileop fileop,
+                                         GdkDragAction action,
                                          GError *error)
 {
    g_return_if_fail(XFDESKTOP_IS_FILE_ICON(src_icon)
@@ -67,14 +67,14 @@ xfdesktop_file_utils_handle_fileop_error(GtkWindow *parent,
     if(error) {
         gchar *primary_fmt, *primary;
         
-        switch(fileop) {
-            case XFDESKTOP_FILE_UTILS_FILEOP_MOVE:
+        switch(action) {
+            case GDK_ACTION_MOVE:
                 primary_fmt = _("There was an error moving \"%s\" to \"%s\":");
                 break;
-            case XFDESKTOP_FILE_UTILS_FILEOP_COPY:
+            case GDK_ACTION_COPY:
                 primary_fmt = _("There was an error copying \"%s\" to \"%s\":");
                 break;
-            case XFDESKTOP_FILE_UTILS_FILEOP_LINK:
+            case GDK_ACTION_LINK:
                 primary_fmt = _("There was an error linking \"%s\" to \"%s\":");
                 break;
             default:
diff --git a/src/xfdesktop-file-utils.h b/src/xfdesktop-file-utils.h
index af2b418..3693758 100644
--- a/src/xfdesktop-file-utils.h
+++ b/src/xfdesktop-file-utils.h
@@ -22,6 +22,9 @@
 #define __XFDESKTOP_FILE_UTILS_H__
 
 #include <gio/gio.h>
+
+#include <gdk/gdkdnd.h>
+
 #include <dbus/dbus-glib.h>
 
 #ifdef HAVE_THUNARX
@@ -30,17 +33,10 @@
 
 #include "xfdesktop-file-icon.h"
 
-typedef enum
-{
-    XFDESKTOP_FILE_UTILS_FILEOP_MOVE = 0,
-    XFDESKTOP_FILE_UTILS_FILEOP_COPY,
-    XFDESKTOP_FILE_UTILS_FILEOP_LINK,
-} XfdesktopFileUtilsFileop;
-
 void xfdesktop_file_utils_handle_fileop_error(GtkWindow *parent,
                                               const XfdesktopFileIcon *src_icon,
                                               const XfdesktopFileIcon *dest_icon,
-                                              XfdesktopFileUtilsFileop fileop,
+                                              GdkDragAction action,
                                               GError *error);
 
 GFileInfo *xfdesktop_file_utils_get_file_info(GFile *gfile,