Trim trailing white spaces.

[geeqie.git] / src / ui_fileops.c

diff --git a/src/ui_fileops.c b/src/ui_fileops.c
index 33c6560..f7ee88b 100644 (file)
--- a/src/ui_fileops.c
+++ b/src/ui_fileops.c
@@ -1,7 +1,7 @@
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2010 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -49,25 +49,6 @@ void print_term(const gchar *text_utf8)
        g_free(text_l);
 }
 
-static void encoding_dialog(const gchar *path);
-
-static gboolean encoding_dialog_idle(gpointer data)
-{
-       gchar *path = data;
-
-       encoding_dialog(path);
-       g_free(path);
-
-       return FALSE;
-}
-
-static gint encoding_dialog_delay(gpointer data)
-{
-       g_idle_add(encoding_dialog_idle, data);
-
-       return 0;
-}
-
 static void encoding_dialog(const gchar *path)
 {
        static gboolean warned_user = FALSE;
@@ -76,14 +57,6 @@ static void encoding_dialog(const gchar *path)
        const gchar *lc;
        const gchar *bf;
 
-       /* check that gtk is initialized (loop is level > 0) */
-       if (gtk_main_level() == 0)
-               {
-               /* gtk not initialized */
-               gtk_init_add(encoding_dialog_delay, g_strdup(path));
-               return;
-               }
-
        if (warned_user) return;
        warned_user = TRUE;
 
@@ -574,7 +547,7 @@ gboolean copy_file(const gchar *s, const gchar *t)
 
        if (rename(randname, tl) < 0) {
                unlink(randname);
-               goto end;       
+               goto end;
        }
 
        ret = copy_file_attributes(s, t, TRUE, TRUE);