aboutsummaryrefslogtreecommitdiff
path: root/src/addressbook.c
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-12-20 05:11:34 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-12-20 05:11:34 +0000
commit1d2c08d736595d00fe3976b8774566783fa40c20 (patch)
treed296455c2bed82266ab07f1ae618a8d1069ee90b /src/addressbook.c
parentab69c08b535b1098c0d399aefe19757d966754a2 (diff)
added new option: 'Set only mail address when composing from address book'.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2759 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src/addressbook.c')
-rw-r--r--src/addressbook.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/addressbook.c b/src/addressbook.c
index f1606594..94f97426 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1217,7 +1217,8 @@ gchar *addressbook_format_address(AddressObject *obj)
}
}
if( address ) {
- if( name && name[0] != '\0' ) {
+ if( !prefs_common.always_add_address_only &&
+ name && name[0] != '\0' ) {
if( name[0] != '"' && strpbrk( name, ",.[]<>" ) != NULL )
buf = g_strdup_printf( "\"%s\" <%s>", name, address );
else
@@ -1234,13 +1235,18 @@ gchar *addressbook_format_address(AddressObject *obj)
static void addressbook_to_clicked(GtkButton *button, gpointer data)
{
GList *node = _addressListSelection_;
+ gboolean new_compose = FALSE;
if (!addrbook.target_compose) {
+ new_compose = TRUE;
addrbook.target_compose = compose_new(NULL, NULL, NULL, NULL);
if (!addrbook.target_compose)
return;
}
+ if (new_compose)
+ compose_block_modified(addrbook.target_compose);
+
while( node ) {
AddressObject *obj = node->data;
Compose *compose = addrbook.target_compose;
@@ -1264,6 +1270,9 @@ static void addressbook_to_clicked(GtkButton *button, gpointer data)
}
}
}
+
+ if (new_compose)
+ compose_unblock_modified(addrbook.target_compose);
}
static void addressbook_menuitem_set_sensitive(void)