From 20085e766ba79c4ecf7da1ba26dc6e09e2c7450d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 17 Dec 2005 18:29:09 +0000 Subject: Beautify #include order and syntax. Use gstdio wrappers. Construct 2005-12-17 Tor Lillqvist * message-tag-followup.c: Beautify #include order and syntax. Use gstdio wrappers. Construct pathnames of files to be read at run-time instead of using compile-time paths. svn path=/trunk/; revision=30842 --- mail/ChangeLog | 7 ++++--- mail/message-tag-followup.c | 16 +++++++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 26561df8e7..7b11b14a0a 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -21,9 +21,10 @@ * mail-signature-editor.c * mail-tools.c * mail-vfolder.c - * message-list.c: Beautify #include order and syntax. Use gstdio - wrappers. Construct pathnames of files to be read at run-time - instead of using compile-time paths. + * message-list.c + * message-tag-followup.c: Beautify #include order and syntax. Use + gstdio wrappers. Construct pathnames of files to be read at + run-time instead of using compile-time paths. * mail-tools.c (mail_tool_get_local_movemail_path): Not used, put in #if 0. diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index 9b94f14af9..b721134161 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -20,9 +20,7 @@ * */ -#ifdef HAVE_CONFIG_H #include -#endif #include #include @@ -56,10 +54,13 @@ #include #include +#include "e-util/e-icon-factory.h" +#include "e-util/e-util-private.h" + +#include "misc/e-dateedit.h" + #include "message-tag-followup.h" #include "mail-config.h" -#include -#include "misc/e-dateedit.h" static void message_tag_followup_class_init (MessageTagFollowUpClass *class); static void message_tag_followup_init (MessageTagFollowUp *followup); @@ -291,6 +292,7 @@ construct (MessageTagEditor *editor) GList *icon_list; GdkPixbuf *pixbuf; int i; + char *gladefile; gtk_window_set_title (GTK_WINDOW (editor), _("Flag to Follow Up")); @@ -305,7 +307,11 @@ construct (MessageTagEditor *editor) gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->vbox), 0); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->action_area), 12); - gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-dialogs.glade", "followup_editor", NULL); + gladefile = g_build_filename (EVOLUTION_GLADEDIR, + "mail-dialogs.glade", + NULL); + gui = glade_xml_new (gladefile, "followup_editor", NULL); + g_free (gladefile); widget = glade_xml_get_widget (gui, "toplevel"); -- cgit v1.2.3