[nautilus] Swap the order of files in the dialog
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] Swap the order of files in the dialog
- Date: Mon, 26 Apr 2010 14:54:20 +0000 (UTC)
commit 5d5166d2cdc68ccee3cacd9d0c266de0f0bee3f5
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Apr 22 15:21:40 2009 +0200
Swap the order of files in the dialog
The dialog had the source and destination files wrongly ordered,
swap them.
.../nautilus-file-conflict-dialog.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.c b/libnautilus-private/nautilus-file-conflict-dialog.c
index 43fba5e..ae6eb65 100644
--- a/libnautilus-private/nautilus-file-conflict-dialog.c
+++ b/libnautilus-private/nautilus-file-conflict-dialog.c
@@ -136,7 +136,7 @@ build_dialog_appearance (NautilusFileConflictDialog *fcd)
g_free (secondary_text);
/* Set up file icons */
- pixbuf = nautilus_file_get_icon_pixbuf (src,
+ pixbuf = nautilus_file_get_icon_pixbuf (dest,
NAUTILUS_ICON_SIZE_LARGE,
TRUE,
NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS);
@@ -146,7 +146,7 @@ build_dialog_appearance (NautilusFileConflictDialog *fcd)
gtk_widget_show (image);
g_object_unref (pixbuf);
- pixbuf = nautilus_file_get_icon_pixbuf (dest,
+ pixbuf = nautilus_file_get_icon_pixbuf (src,
NAUTILUS_ICON_SIZE_LARGE,
TRUE,
NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS);
@@ -158,10 +158,10 @@ build_dialog_appearance (NautilusFileConflictDialog *fcd)
/* Set up labels */
label = gtk_label_new (NULL);
- date = nautilus_file_get_string_attribute (src,
+ date = nautilus_file_get_string_attribute (dest,
"date_modified");
- size = nautilus_file_get_string_attribute (src, "size");
- type = nautilus_file_get_string_attribute (src, "type");
+ size = nautilus_file_get_string_attribute (dest, "size");
+ type = nautilus_file_get_string_attribute (dest, "type");
label_text = g_markup_printf_escaped (_("<b>Original file</b>\n"
"<i>Size:</i> %s\n"
"<i>Type:</i> %s\n"
@@ -181,10 +181,10 @@ build_dialog_appearance (NautilusFileConflictDialog *fcd)
g_free (label_text);
label = gtk_label_new (NULL);
- date = nautilus_file_get_string_attribute (dest,
+ date = nautilus_file_get_string_attribute (src,
"date_modified");
- size = nautilus_file_get_string_attribute (dest, "size");
- type = nautilus_file_get_string_attribute (dest, "type");
+ size = nautilus_file_get_string_attribute (src, "size");
+ type = nautilus_file_get_string_attribute (src, "type");
label_text = g_markup_printf_escaped (_("<b>Replace with</b>\n"
"<i>Size:</i> %s\n"
"<i>Type:</i> %s\n"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]