(struct buffer): Change overlays_before and overlays_after

[gnu-emacs] / src / gtkutil.c

diff --git a/src/gtkutil.c b/src/gtkutil.c
index f2690635f533ae64a239fe53b15037e398cde58a..4d31233cbd029bf946413a3614f06bbb2b17e74d 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -31,6 +31,9 @@ Boston, MA 02111-1307, USA.  */
 #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,8 +501,8 @@ xg_create_frame_widgets (f)
   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 (! 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);
 
@@ -1246,6 +1249,12 @@ make_menu_item (utf8_label, utf8_key, item, group)
   GtkWidget *w;
   GtkWidget *wtoadd = 0;
 
+  /* It has been observed that some menu items have a NULL name field.
+     This will lead to this function being called with a NULL utf8_label.
+     GTK crashes on that so we set a blank label.  Why there is a NULL
+     name remains to be investigated.  */
+  if (! utf8_label) utf8_label = " ";
+
   if (utf8_key)
     wtoadd = make_widget_for_menu_item (utf8_label, utf8_key);
 
@@ -2809,6 +2818,7 @@ xg_tool_bar_callback (w, client_data)
   FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
   Lisp_Object key, frame;
   struct input_event event;
+  EVENT_INIT (event);
 
   if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items))
     return;