From b19ae39cc1d04b7acbb66b3fa48647393b6cc706 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Sun, 3 Jun 2007 13:12:56 +0000 Subject: ** Fix for bug #3355396 from Muktha svn path=/trunk/; revision=33634 --- mail/ChangeLog | 8 ++++++++ mail/em-account-editor.c | 2 +- mail/mail-config.glade | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index d61391bc8f..d0a0f022ab 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2007-06-03 Srinivasa Ragavan + + ** Fix for bug #3355396 from Muktha + + * em-account-editor.c: + (em_account_editor_folder_selector_button_new): + * mail-config.glade: + 2007-06-03 Srinivasa Ragavan * evolution-mail.schemas.in.in: Default for photo to be false. diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 29626e97b6..ecc2671dba 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -479,7 +479,7 @@ GtkWidget *em_account_editor_folder_selector_button_new (char *widget_name, char GtkWidget * em_account_editor_folder_selector_button_new (char *widget_name, char *string1, char *string2, int int1, int int2) { - return (GtkWidget *)em_folder_selection_button_new(_("Select Folder"), NULL); + return (GtkWidget *)em_folder_selection_button_new(string1 ? string1 : _("Select Folder"), NULL); } GtkWidget *em_account_editor_dropdown_new(char *widget_name, char *string1, char *string2, int int1, int int2); diff --git a/mail/mail-config.glade b/mail/mail-config.glade index d015fad9e4..0d98a88e4c 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -2789,6 +2789,7 @@ For example: "Work" or "Personal" em_account_editor_folder_selector_button_new 0 0 + Select Sent Folder Tue, 14 Dec 2004 17:07:09 GMT @@ -2807,6 +2808,7 @@ For example: "Work" or "Personal" em_account_editor_folder_selector_button_new 0 0 + Select Drafts Folder Tue, 14 Dec 2004 17:07:02 GMT -- cgit v1.2.3