View | Details | Raw Unified | Return to bug 115643
Collapse All | Expand All

(-)file_not_specified_in_diff (-5 / +7 lines)
Line  Link Here
0
-- libgnomeui/gnome-file-entry.c
0
++ libgnomeui/gnome-file-entry.c
Lines 445-465 Link Here
445
	GtkWidget *fw;
445
	GtkWidget *fw;
446
	GnomeFileEntry *fentry;
446
	GnomeFileEntry *fentry;
447
	GtkWidget *entry;
447
	GtkWidget *entry;
448
	const gchar *locale_filename;
448
	const gchar *locale_filename, *locale_filename_copy=NULL;
449
	gchar *utf8_filename;
449
	gchar *utf8_filename;
450
450
451
	fw = GTK_WIDGET (data);
451
	fw = GTK_WIDGET (data);
452
	fentry = GNOME_FILE_ENTRY (g_object_get_data (G_OBJECT (fw), "gnome_file_entry"));
452
	fentry = GNOME_FILE_ENTRY (g_object_get_data (G_OBJECT (fw), "gnome_file_entry"));
453
	entry = gnome_file_entry_gtk_entry (fentry);
453
	entry = gnome_file_entry_gtk_entry (fentry);
454
454
455
	if (GTK_IS_FILE_CHOOSER (fentry->fsw))
455
	if (GTK_IS_FILE_CHOOSER (fentry->fsw)) {
456
		locale_filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (fw));
456
		locale_filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (fw));
457
	else
457
		locale_filename_copy = locale_filename;
458
	} else {
458
		locale_filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fw));
459
		locale_filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fw));
460
	}
459
461
460
	utf8_filename = g_filename_to_utf8 (locale_filename, -1, NULL,
462
	utf8_filename = g_filename_to_utf8 (locale_filename, -1, NULL,
461
					    NULL, NULL);
463
					    NULL, NULL);
462
	g_free (locale_filename);
464
	g_free (locale_filename_copy);
463
	gtk_entry_set_text (GTK_ENTRY (entry), utf8_filename);
465
	gtk_entry_set_text (GTK_ENTRY (entry), utf8_filename);
464
	g_free (utf8_filename);
466
	g_free (utf8_filename);
465
	/* Is this evil? */
467
	/* Is this evil? */

Return to bug 115643