From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 1 Mar 2008 03:03:00 +0000 (+0000)
Subject: Oops
X-Git-Tag: v0.6.0~85
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2e1546a6427909b6ed81cc7fa4ed256614ba888;p=pspp-builds.git

Oops
---

diff --git a/src/ui/gui/window-manager.c b/src/ui/gui/window-manager.c
index e70c75f7..91f44a59 100644
--- a/src/ui/gui/window-manager.c
+++ b/src/ui/gui/window-manager.c
@@ -125,8 +125,6 @@ static void
 set_window_name (struct editor_window *e,
 		 const gchar *name )
 {
-  gchar mdash[6] = { 0, 0, 0, 0, 0, 0};
-
   gchar *title ;
   g_free (e->name);
 
@@ -138,32 +136,26 @@ set_window_name (struct editor_window *e,
       return;
     }
 
-  g_unichar_to_utf8 (2014, mdash);
-
   switch (e->type )
     {
     case WINDOW_SYNTAX:
       e->name = g_strdup_printf (_("Syntax%d"), next_window_id () );
-      title = g_strdup_printf (_("%s %s PSPP Syntax Editor"), e->name, mdash);
+      title = g_strdup_printf (_("%s --- PSPP Syntax Editor"), e->name);
       break;
     case WINDOW_DATA:
       e->name = g_strdup_printf (_("Untitled%d"), next_window_id () );
-      title = g_strdup_printf (_("%s %s PSPP Data Editor"), e->name, mdash);
+      title = g_strdup_printf (_("%s --- PSPP Data Editor"), e->name);
       break;
     case WINDOW_OUTPUT:
       e->name = g_strdup_printf (_("Output%d"), next_window_id () );
-      title = g_strdup_printf (_("%s %s PSPP Output"), e->name, mdash);
+      title = g_strdup_printf (_("%s --- PSPP Output"), e->name);
       break;
     default:
       g_assert_not_reached ();
     }
 
-  gchar* x = g_locale_from_utf8  (title, -1, NULL, NULL, NULL);
-
+  gtk_window_set_title (GTK_WINDOW (e->window), title);
 
-  gtk_window_set_title (GTK_WINDOW (e->window), x);
-
-  g_free (x);
   g_free (title);
 }
 
@@ -193,12 +185,8 @@ window_set_name_from_filename (struct editor_window *e,
     }
   g_free (basename);
 
-  gchar* x = g_locale_from_utf8  (title, -1, NULL, NULL, NULL);
-
-
-  gtk_window_set_title (GTK_WINDOW (e->window), x);
+  gtk_window_set_title (GTK_WINDOW (e->window), title);
 
-  g_free (x);
   g_free (title);
   g_free (filename);
 }