From b4d9b7e00b350376b25f3de6b709f9cd07ea81ca Mon Sep 17 00:00:00 2001 From: Not Zed Date: Fri, 18 Jun 2004 04:43:59 +0000 Subject: use mail dialogs.glade. 2004-06-18 Not Zed * em-vfolder-rule.c (get_widget): use mail dialogs.glade. * mail-dialogs.glade: move the vfolder-source window here from mail-config.glade. * Makefile.am (glade_DATA): fix the glade list. * mail-license.glade, subscribe-dialog.glade, mail-security.glade, * mail-search.glade: Merged into mail-dialogs.glade. Should be easier to manage. * message-tag-followup.c (construct): use mail dialogs glade file. * mail-account-gui.c (display_license): use mail dialogs glade file. * em-subscribe-editor.c (em_subscribe_editor_new): use new glade file. * em-format-html-display.c (em_format_html_display_search): use merged glade file. (efhd_xpkcs7mime_validity_clicked): same. * mail-dialogs.glade: merge various glade files into here. svn path=/trunk/; revision=26409 --- mail/em-format-html-display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/em-format-html-display.c') diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index ae704152b8..ee02347d08 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -503,7 +503,7 @@ em_format_html_display_search(EMFormatHTMLDisplay *efhd) return; } - xml = glade_xml_new (EVOLUTION_GLADEDIR "/mail-search.glade", "search_message_dialog", NULL); + xml = glade_xml_new (EVOLUTION_GLADEDIR "/mail-dialogs.glade", "search_message_dialog", NULL); if (xml == NULL) { g_warning("Cannot open search dialog glade file"); /* ?? */ @@ -792,7 +792,7 @@ efhd_xpkcs7mime_validity_clicked(GtkWidget *button, EMFormatHTMLPObject *pobject /* FIXME: window raise? */ return; - xml = glade_xml_new(EVOLUTION_GLADEDIR "/mail-security.glade", "message_security_dialog", NULL); + xml = glade_xml_new(EVOLUTION_GLADEDIR "/mail-dialogs.glade", "message_security_dialog", NULL); po->widget = glade_xml_get_widget(xml, "message_security_dialog"); vbox = glade_xml_get_widget(xml, "signature_vbox"); -- cgit v1.2.3