gnome-media r3819 - in trunk: . grecord/src

[fujiwarat svn gnome org]

Author: fujiwarat
Date: Mon Mar 24 15:21:02 2008
New Revision: 3819
URL: http://svn.gnome.org/viewvc/gnome-media?rev=3819&view=rev

Log:
2008-03-24  Takao Fujiwara  <takao fujiwara sun com>

	reviewed by: Marc-Andre Lureau

	* grecord/src/gnome-recorder.c: (gsr_open_window):
	* grecord/src/gsr-window.c: (fill_in_information):
	  Use g_filename_from/to_utf8() so that grecord doen't crash.
	  (Closes: #524099)



Modified:
   trunk/ChangeLog
   trunk/grecord/src/gnome-recorder.c
   trunk/grecord/src/gsr-window.c

Modified: trunk/grecord/src/gnome-recorder.c
==============================================================================
--- trunk/grecord/src/gnome-recorder.c	(original)
+++ trunk/grecord/src/gnome-recorder.c	Mon Mar 24 15:21:02 2008
@@ -131,6 +131,7 @@
 gsr_open_window (const char *filename)
 {
 	GtkWidget *window;
+	char *utf8_name;
 	char *name;
 
 	if (filename == NULL) {
@@ -139,10 +140,12 @@
 		 * recorded samples will be saved to disk with this
 		 * name as default value. */
 		if (gsr_sample_count == 1) {
-			name = g_strdup (_("Untitled"));
+			utf8_name = g_strdup (_("Untitled"));
 		} else {
-			name = g_strdup_printf (_("Untitled-%d"), gsr_sample_count);
+			utf8_name = g_strdup_printf (_("Untitled-%d"), gsr_sample_count);
 		}
+		name = g_filename_from_utf8 (utf8_name, -1, NULL, NULL, NULL);
+		g_free (utf8_name);
 		++gsr_sample_count;
 	} else {
 		name = g_strdup (filename);

Modified: trunk/grecord/src/gsr-window.c
==============================================================================
--- trunk/grecord/src/gsr-window.c	(original)
+++ trunk/grecord/src/gsr-window.c	Mon Mar 24 15:21:02 2008
@@ -977,9 +977,11 @@
 	if (window->priv->dirty) {
 		gtk_label_set_text (GTK_LABEL (fp->dirname), "");
 	} else {
-		text = g_path_get_dirname (window->priv->filename);
+		name = g_path_get_dirname (window->priv->filename);
+		text = g_filename_to_utf8 (name, -1, NULL, NULL, NULL);
 		gtk_label_set_text (GTK_LABEL (fp->dirname), text);
 		g_free (text);
+		g_free (name);
 	}
 
 	/* filename */