From b350d13830761c4378890bb8cb1e8b661f5fe8cb Mon Sep 17 00:00:00 2001 From: hiro Date: Mon, 6 Mar 2006 09:23:31 +0000 Subject: always enable To, Cc, and Bcc button of the address book. git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1029 ee746299-78ed-0310-b773-934348b2243d --- src/compose.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/compose.c') diff --git a/src/compose.c b/src/compose.c index 775d56e0..844b8f53 100644 --- a/src/compose.c +++ b/src/compose.c @@ -682,8 +682,8 @@ static GtkTargetEntry compose_drag_types[] = }; -void compose_new(PrefsAccount *account, FolderItem *item, const gchar *mailto, - GPtrArray *attach_files) +Compose *compose_new(PrefsAccount *account, FolderItem *item, + const gchar *mailto, GPtrArray *attach_files) { Compose *compose; GtkTextView *text; @@ -691,7 +691,7 @@ void compose_new(PrefsAccount *account, FolderItem *item, const gchar *mailto, GtkTextIter iter; if (!account) account = cur_account; - g_return_if_fail(account != NULL); + g_return_val_if_fail(account != NULL, NULL); compose = compose_create(account, COMPOSE_NEW); @@ -752,6 +752,8 @@ void compose_new(PrefsAccount *account, FolderItem *item, const gchar *mailto, autosave_timeout, compose); if (prefs_common.auto_exteditor) compose_exec_ext_editor(compose); + + return compose; } void compose_reply(MsgInfo *msginfo, FolderItem *item, ComposeMode mode, @@ -6344,9 +6346,6 @@ static void compose_toggle_to_cb(gpointer data, guint action, gtk_widget_queue_resize(compose->table_vbox); compose->use_to = FALSE; } - - if (addressbook_get_target_compose() == compose) - addressbook_set_target_compose(compose); } static void compose_toggle_cc_cb(gpointer data, guint action, @@ -6366,9 +6365,6 @@ static void compose_toggle_cc_cb(gpointer data, guint action, gtk_widget_queue_resize(compose->table_vbox); compose->use_cc = FALSE; } - - if (addressbook_get_target_compose() == compose) - addressbook_set_target_compose(compose); } static void compose_toggle_bcc_cb(gpointer data, guint action, @@ -6388,9 +6384,6 @@ static void compose_toggle_bcc_cb(gpointer data, guint action, gtk_widget_queue_resize(compose->table_vbox); compose->use_bcc = FALSE; } - - if (addressbook_get_target_compose() == compose) - addressbook_set_target_compose(compose); } static void compose_toggle_replyto_cb(gpointer data, guint action, -- cgit v1.2.3