diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libsylph/prefs_common.c | 4 | ||||
| -rw-r--r-- | libsylph/prefs_common.h | 9 | ||||
| -rw-r--r-- | src/compose.c | 2 | ||||
| -rw-r--r-- | src/prefs_common_dialog.c | 11 |
5 files changed, 26 insertions, 7 deletions
@@ -1,5 +1,12 @@ 2010-02-16 + * libsylph/prefs_common.[ch] + src/compose.c + src/prefs_common_dialog.c: added 'Enable address auto-completion' + setting. + +2010-02-16 + * src/plugin.h: bumped SYL_PLUGIN_INTERFACE_VERSION. 2010-02-16 diff --git a/libsylph/prefs_common.c b/libsylph/prefs_common.c index 27109213..e6358b42 100644 --- a/libsylph/prefs_common.c +++ b/libsylph/prefs_common.c @@ -1,6 +1,6 @@ /* * LibSylph -- E-Mail client library - * Copyright (C) 1999-2009 Hiroyuki Yamamoto + * Copyright (C) 1999-2010 Hiroyuki Yamamoto * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -435,6 +435,8 @@ static PrefParam param[] = { {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click, P_BOOL}, + {"enable_address_completion", "TRUE", + &prefs_common.enable_address_completion, P_BOOL}, {"confirm_on_exit", "FALSE", &prefs_common.confirm_on_exit, P_BOOL}, {"clean_trash_on_exit", "FALSE", &prefs_common.clean_on_exit, P_BOOL}, diff --git a/libsylph/prefs_common.h b/libsylph/prefs_common.h index a87613ef..9f247910 100644 --- a/libsylph/prefs_common.h +++ b/libsylph/prefs_common.h @@ -1,6 +1,6 @@ /* * LibSylph -- E-Mail client library - * Copyright (C) 1999-2009 Hiroyuki Yamamoto + * Copyright (C) 1999-2010 Hiroyuki Yamamoto * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -310,9 +310,10 @@ struct _PrefsCommon gboolean online_mode; /* Append new members here */ - gboolean folder_col_visible[4]; /* Display */ - gboolean reply_address_only; /* Compose */ - gboolean recipients_autoreg; /* Send */ + gboolean folder_col_visible[4]; /* Display */ + gboolean reply_address_only; /* Compose */ + gboolean recipients_autoreg; /* Send */ + gboolean enable_address_completion; /* Compose */ }; extern PrefsCommon prefs_common; diff --git a/src/compose.c b/src/compose.c index f6a3b9c9..df695b6d 100644 --- a/src/compose.c +++ b/src/compose.c @@ -5018,7 +5018,7 @@ static void compose_add_entry_field(GtkWidget *table, GtkWidget **hbox, if (GTK_TABLE(table)->nrows > (*count) + 1) gtk_table_set_row_spacing(GTK_TABLE(table), *count, 4); - if (is_addr_entry) + if (is_addr_entry && prefs_common.enable_address_completion) address_completion_register_entry(GTK_ENTRY(*entry)); (*count)++; diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c index 38ae3d40..59972ccb 100644 --- a/src/prefs_common_dialog.c +++ b/src/prefs_common_dialog.c @@ -218,6 +218,8 @@ static struct Other { GtkWidget *checkbtn_close_recv_dialog; GtkWidget *checkbtn_addaddrbyclick; + GtkWidget *checkbtn_enable_addr_compl; + GtkWidget *checkbtn_confonexit; GtkWidget *checkbtn_cleanonexit; GtkWidget *checkbtn_askonclean; @@ -532,6 +534,8 @@ static PrefsUIData ui_data[] = { {"add_address_by_click", &other.checkbtn_addaddrbyclick, prefs_set_data_from_toggle, prefs_set_toggle}, + {"enable_address_completion", &other.checkbtn_enable_addr_compl, + prefs_set_data_from_toggle, prefs_set_toggle}, {"confirm_on_exit", &other.checkbtn_confonexit, prefs_set_data_from_toggle, prefs_set_toggle}, @@ -2473,6 +2477,7 @@ static GtkWidget *prefs_other_create(void) GtkWidget *frame_addr; GtkWidget *vbox_addr; GtkWidget *checkbtn_addaddrbyclick; + GtkWidget *checkbtn_enable_addr_compl; GtkWidget *frame_exit; GtkWidget *vbox_exit; @@ -2527,6 +2532,9 @@ static GtkWidget *prefs_other_create(void) PACK_CHECK_BUTTON (vbox_addr, checkbtn_addaddrbyclick, _("Add address to destination when double-clicked")); + PACK_CHECK_BUTTON + (vbox_addr, checkbtn_enable_addr_compl, + _("Enable address auto-completion")); PACK_FRAME (vbox1, frame_exit, _("On exit")); @@ -2555,7 +2563,8 @@ static GtkWidget *prefs_other_create(void) other.checkbtn_no_recv_err_panel = checkbtn_no_recv_err_panel; other.checkbtn_close_recv_dialog = checkbtn_close_recv_dialog; - other.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick; + other.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick; + other.checkbtn_enable_addr_compl = checkbtn_enable_addr_compl; other.checkbtn_confonexit = checkbtn_confonexit; other.checkbtn_cleanonexit = checkbtn_cleanonexit; |