[Pspp-cvs] pspp/src/ui/gui window-manager.c

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   08/03/01 03:03:00

Modified files:
        src/ui/gui     : window-manager.c 

Log message:
        Oops

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/window-manager.c?cvsroot=pspp&r1=1.13&r2=1.14

Patches:
Index: window-manager.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/window-manager.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- window-manager.c    1 Mar 2008 02:08:30 -0000       1.13
+++ window-manager.c    1 Mar 2008 03:03:00 -0000       1.14
@@ -125,8 +125,6 @@
 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 @@
       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 @@
     }
   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);
 }