From: John Darrington Date: Sun, 4 Jan 2009 05:26:11 +0000 (+0900) Subject: Convert MessageDialog to GtkBuilder X-Git-Tag: v0.7.1~21 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f539bfdd7722c73aa796bbad8b549ae003dd922;p=pspp-builds.git Convert MessageDialog to GtkBuilder --- diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 621a44c3..ac303192 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -68,6 +68,7 @@ nodist_src_ui_gui_psppire_DATA = \ $(top_srcdir)/src/ui/gui/crosstabs.ui \ $(top_srcdir)/src/ui/gui/examine.ui \ $(top_srcdir)/src/ui/gui/frequencies.ui \ + $(top_srcdir)/src/ui/gui/message-dialog.ui \ $(top_srcdir)/src/ui/gui/oneway.ui \ $(top_srcdir)/src/ui/gui/rank.ui \ $(top_srcdir)/src/ui/gui/recode.ui @@ -76,6 +77,7 @@ EXTRA_DIST += \ $(top_srcdir)/src/ui/gui/crosstabs.glade \ $(top_srcdir)/src/ui/gui/examine.glade \ $(top_srcdir)/src/ui/gui/frequencies.glade \ + $(top_srcdir)/src/ui/gui/message-dialog.glade \ $(top_srcdir)/src/ui/gui/oneway.glade \ $(top_srcdir)/src/ui/gui/rank.glade \ $(top_srcdir)/src/ui/gui/recode.glade @@ -83,7 +85,6 @@ EXTRA_DIST += \ dist_src_ui_gui_psppire_DATA = \ $(top_srcdir)/src/ui/gui/data-editor.glade \ $(top_srcdir)/src/ui/gui/descriptives-dialog.glade \ - $(top_srcdir)/src/ui/gui/message-dialog.glade \ $(top_srcdir)/src/ui/gui/output-viewer.glade \ $(top_srcdir)/src/ui/gui/psppire.glade \ $(top_srcdir)/src/ui/gui/regression.glade \ diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c index d0f02dfa..669504e8 100644 --- a/src/ui/gui/message-dialog.c +++ b/src/ui/gui/message-dialog.c @@ -31,7 +31,6 @@ #include -#include #include #include "helper.h" @@ -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"); }