From 9b0e9dc0aeffd627ce2bdea049cc7c47bb7418f0 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Fri, 22 May 2009 17:00:53 +0530 Subject: Johnny's composer changes for Anjal. --- composer/e-composer-name-header.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'composer/e-composer-name-header.c') diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c index 5aab95d776..472208edd3 100644 --- a/composer/e-composer-name-header.c +++ b/composer/e-composer-name-header.c @@ -117,10 +117,12 @@ composer_name_header_constructor (GType type, entry = E_NAME_SELECTOR_ENTRY ( e_name_selector_peek_section_list ( priv->name_selector, label)); + e_name_selector_entry_set_contact_editor_func ( entry, e_contact_editor_new); e_name_selector_entry_set_contact_list_editor_func ( entry, e_contact_list_editor_new); + g_signal_connect ( entry, "changed", G_CALLBACK (composer_name_header_entry_changed_cb), object); @@ -261,6 +263,32 @@ e_composer_name_header_new (const gchar *label, "button", TRUE, "name-selector", name_selector, NULL); } +EComposerHeader * +e_composer_name_header_new_with_label (const gchar *label, + ENameSelector *name_selector) +{ + return g_object_new ( + E_TYPE_COMPOSER_NAME_HEADER, "label", label, + "button", FALSE, "name-selector", name_selector, + "addaction", FALSE, "visible", TRUE, + NULL); +} + +EComposerHeader * +e_composer_name_header_new_with_action (const gchar *label, + const gchar *action_label, + ENameSelector *name_selector) +{ + g_return_val_if_fail (E_IS_NAME_SELECTOR (name_selector), NULL); + + return g_object_new ( + E_TYPE_COMPOSER_NAME_HEADER, "label", label, + "button", FALSE, "name-selector", name_selector, + "addaction_text", action_label, + "addaction", action_label != NULL, + NULL); +} + ENameSelector * e_composer_name_header_get_name_selector (EComposerNameHeader *header) { -- cgit From 75a36a295adb64a012521c01724d6b2951986653 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 22:55:38 -0400 Subject: Fix composer header regression caused by Anjal merge. --- composer/e-composer-name-header.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'composer/e-composer-name-header.c') diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c index 472208edd3..ed4e60c6f9 100644 --- a/composer/e-composer-name-header.c +++ b/composer/e-composer-name-header.c @@ -265,28 +265,26 @@ e_composer_name_header_new (const gchar *label, EComposerHeader * e_composer_name_header_new_with_label (const gchar *label, - ENameSelector *name_selector) + ENameSelector *name_selector) { return g_object_new ( E_TYPE_COMPOSER_NAME_HEADER, "label", label, - "button", FALSE, "name-selector", name_selector, - "addaction", FALSE, "visible", TRUE, - NULL); + "button", TRUE, "name-selector", name_selector, + "addaction", FALSE, "visible", TRUE, NULL); } EComposerHeader * e_composer_name_header_new_with_action (const gchar *label, - const gchar *action_label, - ENameSelector *name_selector) + const gchar *action_label, + ENameSelector *name_selector) { g_return_val_if_fail (E_IS_NAME_SELECTOR (name_selector), NULL); return g_object_new ( E_TYPE_COMPOSER_NAME_HEADER, "label", label, - "button", FALSE, "name-selector", name_selector, + "button", TRUE, "name-selector", name_selector, "addaction_text", action_label, - "addaction", action_label != NULL, - NULL); + "addaction", action_label != NULL, NULL); } ENameSelector * -- cgit From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- composer/e-composer-name-header.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'composer/e-composer-name-header.c') diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c index ed4e60c6f9..bfc9441fb7 100644 --- a/composer/e-composer-name-header.c +++ b/composer/e-composer-name-header.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -282,7 +282,7 @@ e_composer_name_header_new_with_action (const gchar *label, return g_object_new ( E_TYPE_COMPOSER_NAME_HEADER, "label", label, - "button", TRUE, "name-selector", name_selector, + "button", TRUE, "name-selector", name_selector, "addaction_text", action_label, "addaction", action_label != NULL, NULL); } -- cgit