Convert psppire.glade to psppire.ui

[pspp-builds.git] / src / ui / gui / message-dialog.c

diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c
index 281ef527d55f357ab3897743c884a58a16e76cfd..866f8c6d91f1065762ba0a636291c255bd05c67a 100644 (file)
--- a/src/ui/gui/message-dialog.c
+++ b/src/ui/gui/message-dialog.c
@@ -31,7 +31,6 @@
 
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <glib.h>
 
 #include "helper.h"
@@ -49,7 +48,7 @@ static GQueue *late_queue;
 
 static int error_cnt, warning_cnt, note_cnt;
 
-static GladeXML *message_xml;
+static GtkBuilder *message_xml;
 static GtkWidget *message_dialog;
 
 void
@@ -60,7 +59,7 @@ message_dialog_init (struct source_stream *ss)
   late_queue = g_queue_new ();
   error_cnt = warning_cnt = note_cnt = 0;
   msg_init (ss, enqueue_msg);
-  message_xml = XML_NEW ("message-dialog.glade");
+  message_xml = builder_new ("message-dialog.ui");
   message_dialog = get_widget_assert (message_xml, "message-dialog");
 }
 
@@ -260,6 +259,7 @@ popup_messages (gpointer unused UNUSED)
     goto use_fallback;
   gtk_text_view_set_buffer (text_view, text_buffer);
 
+  gtk_widget_grab_focus (get_widget_assert (message_xml, "close-button"));
   gtk_dialog_run ( GTK_DIALOG (message_dialog));
   gtk_widget_hide (message_dialog);