[Xfce4-commits] r29898 - in thunar/branches/migration-to-gio: . thunar

[Jannis Pohlmann]

Author: jannis
Date: 2009-04-23 20:39:59 +0000 (Thu, 23 Apr 2009)
New Revision: 29898

Modified:
   thunar/branches/migration-to-gio/ChangeLog
   thunar/branches/migration-to-gio/thunar/thunar-dialogs.c
Log:
	* thunar/thunar-dialogs.c: Use more fine-grained labels for files,
	  directories and links in thunar_dialogs_show_job_ask_replace().

Modified: thunar/branches/migration-to-gio/ChangeLog
===================================================================
--- thunar/branches/migration-to-gio/ChangeLog	2009-04-23 20:31:23 UTC (rev 29897)
+++ thunar/branches/migration-to-gio/ChangeLog	2009-04-23 20:39:59 UTC (rev 29898)
@@ -1,5 +1,10 @@
 2009-04-23	Jannis Pohlmann <jannis at xfce.org>
 
+	* thunar/thunar-dialogs.c: Use more fine-grained labels for files,
+	  directories and links in thunar_dialogs_show_job_ask_replace().
+
+2009-04-23	Jannis Pohlmann <jannis at xfce.org>
+
 	* thunar/thunar-application.c, thunar/thunar-job.{c,h},
 	  thunar/thunar-io-jobs.c, thunar/thunar-transfer-job.c,
 	  thunar/thunar-standard-view.c, thunar/thunar-tree-view.c: Implement 

Modified: thunar/branches/migration-to-gio/thunar/thunar-dialogs.c
===================================================================
--- thunar/branches/migration-to-gio/thunar/thunar-dialogs.c	2009-04-23 20:31:23 UTC (rev 29897)
+++ thunar/branches/migration-to-gio/thunar/thunar-dialogs.c	2009-04-23 20:39:59 UTC (rev 29898)
@@ -608,11 +608,17 @@
       text = g_strdup_printf (_("This folder already contains a symbolic link \"%s\"."), 
                               thunar_file_get_display_name (dst_file));
     }
+  else if (thunar_file_is_directory (dst_file))
+    {
+      text = g_strdup_printf (_("This folder already contains a folder \"%s\"."),
+                              thunar_file_get_display_name (dst_file));
+    }
   else
-    {
+    { 
       text = g_strdup_printf (_("This folder already contains a file \"%s\"."), 
                               thunar_file_get_display_name (dst_file));
     }
+
   label = gtk_label_new (text);
   gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
   gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_big ());
@@ -622,6 +628,8 @@
 
   if (thunar_file_is_symlink (dst_file))
     text = g_strdup_printf (Q_("ReplaceDialogPart1|Do you want to replace the link"));
+  else if (thunar_file_is_directory (dst_file))
+    text = g_strdup_printf (Q_("ReplaceDialogPart1|Do you want to replace the existing folder"));
   else
     text = g_strdup_printf (Q_("ReplaceDialogPart1|Do you want to replace the existing file"));
 
@@ -649,7 +657,13 @@
   g_free (date_string);
   g_free (text);
 
-  text = g_strdup_printf (Q_("ReplaceDialogPart2|with the following file?"));
+  if (thunar_file_is_symlink (src_file))
+    text = g_strdup_printf (Q_("ReplaceDialogPart2|with the following link?"));
+  else if (thunar_file_is_directory (src_file))
+    text = g_strdup_printf (Q_("ReplaceDialogPart2|with the following folder?"));
+  else
+    text = g_strdup_printf (Q_("ReplaceDialogPart2|with the following file?"));
+
   label = gtk_label_new (text);
   gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
   gtk_table_attach (GTK_TABLE (table), label, 1, 3, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);