[evolution-patches] [Shell] Can't import the file when glib filename encoding isn't utf8.



Hi,

Here's the bug information.
http://bugzilla.gnome.org/show_bug.cgi?id=323853.

As gnome_file_entry_get_full_path() has supported non-utf8 glib filename
encoding (just fixed in #321144, for more, please see
http://bugzilla.gnome.org/show_bug.cgi?id=321144), use
gnome_file_entry_get_full_path() instead of
gtk_entry_get_text().

Attached the patch, please review.

Thanks,
-Simon
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1550
diff -u -p -r1.1550 ChangeLog
--- ChangeLog	23 Dec 2005 04:54:22 -0000	1.1550
+++ ChangeLog	27 Dec 2005 12:29:10 -0000
@@ -1,3 +1,11 @@
+2005-12-27  Simon Zheng  <simon zheng sun com>
+
+	* Fix bug #323853
+
+	* e-shell-importer.c: (filename_changed): In order to support 
+	non-utf8 encoding filename, use gnome_file_entry_get_full_path() 
+	instead of gtk_entry_get_text().
+
 2005-09-24  Andre Klapper  <a9016009 gmx de>:
 	
 	Reviewed and committed by Harish <kharish novell com>
Index: e-shell-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-importer.c,v
retrieving revision 1.85
diff -u -p -r1.85 e-shell-importer.c
--- e-shell-importer.c	18 Dec 2005 04:33:14 -0000	1.85
+++ e-shell-importer.c	27 Dec 2005 12:29:10 -0000
@@ -186,7 +186,7 @@ filename_changed (GtkEntry *entry,
 
 	page = data->filepage;
 
-	filename = gtk_entry_get_text (entry);
+	filename = gnome_file_entry_get_full_path ((GnomeFileEntry *) page->filename, TRUE);
 
 	fileok = filename && filename[0] && g_file_test(filename, G_FILE_TEST_IS_REGULAR);
 	if (fileok) {
@@ -224,6 +224,7 @@ filename_changed (GtkEntry *entry,
 			gtk_option_menu_set_history((GtkOptionMenu *)page->filetype, firstitem);
 		}
 		fileok = first != NULL;
+		g_free (filename);
 	} else {
 		GSList *item;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]