[Xfce4-commits] <xfdesktop:jannis/port-to-gio> Remove even more functions that are no longer in use.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-gio
         to 2451f715b1d93eccac10293bb9cc5f461b28db06 (commit)
       from 8c84b23ed1b2fe55c7202de3ca0d6d745444ba59 (commit)

commit 2451f715b1d93eccac10293bb9cc5f461b28db06
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sat Oct 30 00:17:25 2010 +0200

    Remove even more functions that are no longer in use.

 src/xfdesktop-file-utils.c |   86 ++------------------------------------------
 src/xfdesktop-file-utils.h |   25 -------------
 2 files changed, 3 insertions(+), 108 deletions(-)

diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c
index 2f640a5..567f8b5 100644
--- a/src/xfdesktop-file-utils.c
+++ b/src/xfdesktop-file-utils.c
@@ -36,6 +36,9 @@
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #include <gtk/gtk.h>
 
@@ -43,8 +46,6 @@
 
 #include <exo/exo.h>
 
-#include <thunar-vfs/thunar-vfs.h>
-
 #include <dbus/dbus-glib-lowlevel.h>
 
 #ifdef HAVE_THUNARX
@@ -57,87 +58,6 @@
 #include "xfdesktop-file-utils.h"
 #include "xfdesktop-trash-proxy.h"
 
-ThunarVfsInteractiveJobResponse
-xfdesktop_file_utils_interactive_job_ask(GtkWindow *parent,
-                                         const gchar *message,
-                                         ThunarVfsInteractiveJobResponse choices)
-{
-    GtkWidget *dlg, *btn;
-    gint resp;
-    
-    dlg = xfce_message_dialog_new(parent, _("Question"),
-                                  GTK_STOCK_DIALOG_QUESTION, NULL, message,
-                                  NULL, NULL);
-    
-    if(choices & THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL) {
-        btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-        gtk_widget_show(btn);
-        gtk_dialog_add_action_widget(GTK_DIALOG(dlg), btn,
-                                     THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL);
-    }
-    
-    if(choices & THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_NO) {
-        btn = gtk_button_new_from_stock(GTK_STOCK_NO);
-        gtk_widget_show(btn);
-        gtk_dialog_add_action_widget(GTK_DIALOG(dlg), btn,
-                                     THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_NO);
-    }
-    
-    if(choices & THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES_ALL) {
-        btn = gtk_button_new_with_mnemonic(_("Yes to _all"));
-        gtk_widget_show(btn);
-        gtk_dialog_add_action_widget(GTK_DIALOG(dlg), btn,
-                                     THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES_ALL);
-    }
-    
-    if(choices & THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES) {
-        btn = gtk_button_new_from_stock(GTK_STOCK_YES);
-        gtk_widget_show(btn);
-        gtk_dialog_add_action_widget(GTK_DIALOG(dlg), btn,
-                                     THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES);
-    }
-    
-    resp = gtk_dialog_run(GTK_DIALOG(dlg));
-    
-    gtk_widget_destroy(dlg);
-    
-    return (ThunarVfsInteractiveJobResponse)resp;
-}
-
-void
-xfdesktop_file_utils_handle_fileop_error(GtkWindow *parent,
-                                         const ThunarVfsInfo *src_info,
-                                         const ThunarVfsInfo *dest_info,
-                                         XfdesktopFileUtilsFileop fileop,
-                                         GError *error)
-{
-    if(error) {
-        gchar *primary_fmt, *primary;
-        
-        switch(fileop) {
-            case XFDESKTOP_FILE_UTILS_FILEOP_MOVE:
-                primary_fmt = _("There was an error moving \"%s\" to \"%s\":");
-                break;
-            case XFDESKTOP_FILE_UTILS_FILEOP_COPY:
-                primary_fmt = _("There was an error copying \"%s\" to \"%s\":");
-                break;
-            case XFDESKTOP_FILE_UTILS_FILEOP_LINK:
-                primary_fmt = _("There was an error linking \"%s\" to \"%s\":");
-                break;
-            default:
-                return;
-        }
-        
-        primary = g_strdup_printf(primary_fmt,
-                                  src_info->display_name,
-                                  dest_info->display_name);
-        xfce_message_dialog(parent, _("File Error"), GTK_STOCK_DIALOG_ERROR,
-                            primary, error->message,
-                            GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
-        g_free(primary);
-    }
-}
-
 gboolean 
 xfdesktop_file_utils_is_desktop_file(GFileInfo *info)
 {
diff --git a/src/xfdesktop-file-utils.h b/src/xfdesktop-file-utils.h
index 4bd9e99..2b44239 100644
--- a/src/xfdesktop-file-utils.h
+++ b/src/xfdesktop-file-utils.h
@@ -22,7 +22,6 @@
 #ifndef __XFDESKTOP_FILE_UTILS_H__
 #define __XFDESKTOP_FILE_UTILS_H__
 
-#include <thunar-vfs/thunar-vfs.h>
 #include <dbus/dbus-glib.h>
 
 #ifdef HAVE_THUNARX
@@ -31,30 +30,6 @@
 
 #include "xfdesktop-file-icon.h"
 
-ThunarVfsInteractiveJobResponse xfdesktop_file_utils_interactive_job_ask(GtkWindow *parent,
-                                                                         const gchar *message,
-                                                                         ThunarVfsInteractiveJobResponse choices);
-
-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 ThunarVfsInfo *src_info,
-                                              const ThunarVfsInfo *dest_info,
-                                              XfdesktopFileUtilsFileop fileop,
-                                              GError *error);
-
-void xfdesktop_file_utils_copy_into(GtkWindow *parent,
-                                    GList *path_list,
-                                    ThunarVfsPath *dest_path);
-void xfdesktop_file_utils_move_into(GtkWindow *parent,
-                                    GList *path_list,
-                                    ThunarVfsPath *dest_path);
-
 gboolean xfdesktop_file_utils_is_desktop_file(GFileInfo *info);
 gboolean xfdesktop_file_utils_file_is_executable(GFileInfo *info);
 gchar *xfdesktop_file_utils_format_time_for_display(guint64 file_time);