[Emacs-diffs] Changes to emacs/src/gtkutil.c

[Dave Love]

Index: emacs/src/gtkutil.c
diff -c emacs/src/gtkutil.c:1.29 emacs/src/gtkutil.c:1.30
*** emacs/src/gtkutil.c:1.29    Sat May 24 17:58:42 2003
--- emacs/src/gtkutil.c Mon Jun  2 14:50:15 2003
***************
*** 31,36 ****
--- 31,39 ----
  #include "atimer.h"
  #include "gtkutil.h"
  #include "termhooks.h"
+ #include "keyboard.h"
+ #include "charset.h"
+ #include "coding.h"
  #include <gdk/gdkkeysyms.h>
  
  #define FRAME_TOTAL_PIXEL_HEIGHT(f) \
***************
*** 498,505 ****
    gtk_widget_set_name (wfixed, SDATA (Vx_resource_name));
  
    /* If this frame has a title or name, set it in the title bar.  */
!   if (! NILP (f->title)) title = SDATA (f->title);
!   else if (! NILP (f->name)) title = SDATA (f->name);
  
    if (title) gtk_window_set_title (GTK_WINDOW (wtop), title);
  
--- 501,508 ----
    gtk_widget_set_name (wfixed, SDATA (Vx_resource_name));
  
    /* If this frame has a title or name, set it in the title bar.  */
!   if (! NILP (f->title)) title = SDATA (ENCODE_UTF_8 (f->title));
!   else if (! NILP (f->name)) title = SDATA (ENCODE_UTF_8 (f->name));
  
    if (title) gtk_window_set_title (GTK_WINDOW (wtop), title);