diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | acconfig.h | 4 | ||||
| -rw-r--r-- | configure.in | 13 | ||||
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-ops.c | 30 | ||||
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 6 |
7 files changed, 57 insertions, 16 deletions
@@ -1,3 +1,11 @@ +2001-01-17 Ettore Perazzoli <ettore@ximian.com> + + * acconfig.h: Add `SUB_VERSION', remove `XMAILER_VERSION'. + + * configure.in: Removed `--with-x-mailer' option; replaced with a + more generic `--with-sub-version' option. So, don't define + `X_MAILER'; instead, define `SUB_VERSION'. + 2001-01-16 Chris Toshok <toshok@helixcode.com> * configure.in: add --enable-nntp switch. default is no. diff --git a/acconfig.h b/acconfig.h index 39c6c68e20..9926571580 100644 --- a/acconfig.h +++ b/acconfig.h @@ -6,7 +6,6 @@ #undef HAVE_LIBSM #undef PACKAGE #undef VERSION -#undef XMAILER_VERSION #undef ENABLE_THREADS #undef SENDMAIL_PATH #undef SYSTEM_MAIL_DIR @@ -24,6 +23,9 @@ #undef NEED_KRB_SENDAUTH_PROTO #undef HAVE_ISBLANK +/* Sub-version identification string. */ +#undef SUB_VERSION + /* Define this if you want to build against the development gtk */ #undef HAVE_DEVGTK diff --git a/configure.in b/configure.in index 278a5ace25..e3af996363 100644 --- a/configure.in +++ b/configure.in @@ -613,14 +613,11 @@ else esac fi - -AC_ARG_WITH(x-mailer, [ --with-x-mailer=VERSION Sub-version string for X-Mailer header]) -if test "${with_x_mailer:-no}" = "no"; then - with_x_mailer="$VERSION" -else - with_x_mailer="$VERSION/$with_x_mailer" -fi -AC_DEFINE_UNQUOTED(XMAILER_VERSION, "$with_x_mailer") +dnl ****************** +dnl Sub-version number +dnl ****************** +AC_ARG_WITH(sub-version, [ --with-sub-version=VERSION Specify a sub-version string]) +AC_DEFINE_UNQUOTED(SUB_VERSION, "$sub_version") dnl ****************************** dnl Makefiles diff --git a/mail/ChangeLog b/mail/ChangeLog index 73771aa63b..5b0943376e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2001-01-17 Ettore Perazzoli <ettore@ximian.com> + + * mail-ops.c (set_x_mailer): New function. + (send_mail_send): Use it. + (do_send_queue): Use it. + 2001-01-17 Martin Norbäck <d95mback@dtek.chalmers.se> * openpgp-utils.c (pgp_get_passphrase): Changed the word entry diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 26202e3cfd..dd14c320f1 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -47,6 +47,23 @@ int mail_operation_run(const mail_operation_spec *op, void *in, int free); #define mail_tool_camel_lock_down() #define mail_tool_camel_lock_up() + +/* Utility functions. */ + +static void +set_x_mailer (CamelMimeMessage *message) +{ + const char *xmailer_version; + + if (SUB_VERSION[0] == '\0') + xmailer_version = "Evolution (" VERSION " - Preview Release)"; + else + xmailer_version = "Evolution (" VERSION "/" SUB_VERSION " - Preview Release)"; + + camel_medium_add_header(CAMEL_MEDIUM (message), "X-Mailer", xmailer_version); +} + + /* ** FETCH MAIL ********************************************************** */ typedef struct fetch_mail_input_s @@ -551,14 +568,15 @@ static char *send_mail_desc(struct _mail_msg *mm, int done) static void send_mail_send(struct _mail_msg *mm) { struct _send_mail_msg *m = (struct _send_mail_msg *)mm; - extern CamelFolder *sent_folder; + extern CamelFolder *sent_folder; /* FIXME */ CamelMessageInfo *info; CamelTransport *xport; FilterContext *context; - camel_medium_add_header(CAMEL_MEDIUM (m->message), "X-Mailer", "Evolution (" XMAILER_VERSION " - Preview Release)"); + set_x_mailer (m->message); + camel_mime_message_set_date(m->message, CAMEL_MESSAGE_DATE_CURRENT, 0); - + xport = camel_session_get_transport(session, m->uri, &mm->ex); if (camel_exception_is_set(&mm->ex)) return; @@ -696,9 +714,9 @@ do_send_queue (gpointer in_data, gpointer op_data, CamelException *ex) message = camel_folder_get_message (input->folder_queue, uids->pdata[i], ex); if (camel_exception_is_set (ex)) break; - - camel_medium_add_header (CAMEL_MEDIUM (message), "X-Mailer", "Evolution (" XMAILER_VERSION " - Preview Release)"); - + + set_x_mailer (message); + camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0); /* Get the preferred transport URI */ diff --git a/shell/ChangeLog b/shell/ChangeLog index 19b9d139ff..e6a18e7814 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,11 @@ 2001-01-17 Ettore Perazzoli <ettore@ximian.com> + * e-shell-view.c (update_for_current_uri): Display the folder name + before "Evolution" instead of after it. Also, display the + sub-version string if it was defined when configuring. + +2001-01-17 Ettore Perazzoli <ettore@ximian.com> + * e-storage-set-view.c (table_drag_drop): Don't emit the "dnd_action" signal here. Instead, do a `gtk_drag_get_data()' to retrieve information about the drop. diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 4d3926bb5e..a6aeca1815 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -1094,7 +1094,11 @@ update_for_current_uri (EShellView *shell_view) else folder_name = e_utf8_to_gtk_string ((GtkWidget *) shell_view, e_folder_get_name (folder)); - window_title = g_strdup_printf (_("Evolution - %s"), folder_name); + if (SUB_VERSION[0] == '\0') + window_title = g_strdup_printf (_("%s - Evolution %s"), folder_name, VERSION); + else + window_title = g_strdup_printf (_("%s - Evolution %s [%s]"), folder_name, VERSION, SUB_VERSION); + gtk_window_set_title (GTK_WINDOW (shell_view), window_title); g_free (window_title); g_free (folder_name); |