aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-06-03 21:12:56 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-06-03 21:12:56 +0800
commitb19ae39cc1d04b7acbb66b3fa48647393b6cc706 (patch)
tree2e3154e6d4fdb64116c99881a5c7a942472dde16
parentf1e22c9d91b1be0333c09162616aab5648a2ba49 (diff)
downloadgsoc2013-evolution-b19ae39cc1d04b7acbb66b3fa48647393b6cc706.tar
gsoc2013-evolution-b19ae39cc1d04b7acbb66b3fa48647393b6cc706.tar.gz
gsoc2013-evolution-b19ae39cc1d04b7acbb66b3fa48647393b6cc706.tar.bz2
gsoc2013-evolution-b19ae39cc1d04b7acbb66b3fa48647393b6cc706.tar.lz
gsoc2013-evolution-b19ae39cc1d04b7acbb66b3fa48647393b6cc706.tar.xz
gsoc2013-evolution-b19ae39cc1d04b7acbb66b3fa48647393b6cc706.tar.zst
gsoc2013-evolution-b19ae39cc1d04b7acbb66b3fa48647393b6cc706.zip
** Fix for bug #3355396 from Muktha
svn path=/trunk/; revision=33634
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/em-account-editor.c2
-rw-r--r--mail/mail-config.glade2
3 files changed, 11 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d61391bc8f..d0a0f022ab 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
+ ** 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 <sragavan@novell.com>
+
* evolution-mail.schemas.in.in: Default for photo to be false.
2007-05-12 Gilles Dartiguelongue <dartigug@esiee.fr>
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: &quot;Work&quot; or &quot;Personal&quot;</property>
<property name="creation_function">em_account_editor_folder_selector_button_new</property>
<property name="int1">0</property>
<property name="int2">0</property>
+ <property name="string1" translatable="yes">Select Sent Folder</property>
<property name="last_modification_time">Tue, 14 Dec 2004 17:07:09 GMT</property>
</widget>
<packing>
@@ -2807,6 +2808,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
<property name="creation_function">em_account_editor_folder_selector_button_new</property>
<property name="int1">0</property>
<property name="int2">0</property>
+ <property name="string1" translatable="yes">Select Drafts Folder</property>
<property name="last_modification_time">Tue, 14 Dec 2004 17:07:02 GMT</property>
</widget>
<packing>