aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-02-16 07:56:27 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-02-16 07:56:27 +0000
commit6b59767f3d7523fa394de98a1d931d27167f2988 (patch)
tree0dedd3e0295b939308f19a4be7a387fb47d0b0d8 /src
parent2b8f8a38610a395bcd9eeeb5d6e9e495d8b88306 (diff)
added 'Enable address auto-completion' setting.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2480 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src')
-rw-r--r--src/compose.c2
-rw-r--r--src/prefs_common_dialog.c11
2 files changed, 11 insertions, 2 deletions
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;