aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-account-gui.c27
2 files changed, 28 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 077a0c1d79..5bab4872c3 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-24 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-account-gui.c (mail_account_gui_build_extra_conf): Set the
+ default Username label and handle the new
+ CAMEL_PROVIDER_CONF_LABEL enum allowing the provider to setup a
+ label.
+
2002-04-23 Jeffrey Stedfast <fejj@ximian.com>
* mail-accounts.c: Added back the checkmark icon for enabled
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index cbe13958db..e6e128fc26 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -400,7 +400,7 @@ source_type_changed (GtkWidget *widget, gpointer user_data)
dwidget = GTK_WIDGET (gui->source.path);
if (!strcmp (provider->protocol, "mbox")
- || !strcmp(provider->protocol, "spool")) {
+ || !strcmp (provider->protocol, "spool")) {
char *path;
if (getenv ("MAIL"))
@@ -455,9 +455,8 @@ source_type_changed (GtkWidget *widget, gpointer user_data)
gtk_widget_grab_focus (dwidget);
mail_account_gui_build_extra_conf (gui, gui && gui->account && gui->account->source ? gui->account->source->url : NULL);
-
- if (provider &&
- CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider))
+
+ if (provider && CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider))
transport_provider_set_available (gui, provider, TRUE);
}
@@ -484,7 +483,7 @@ transport_type_changed (GtkWidget *widget, gpointer user_data)
provider = gtk_object_get_data (GTK_OBJECT (widget), "provider");
gui->transport.provider = provider;
-
+
/* description */
gtk_label_set_text (gui->transport.description, provider->description);
@@ -620,7 +619,7 @@ void
mail_account_gui_build_extra_conf (MailAccountGui *gui, const char *url_string)
{
CamelURL *url;
- GtkWidget *mailcheck_frame, *main_vbox, *cur_vbox;
+ GtkWidget *mailcheck_frame, *main_vbox, *cur_vbox, *username;
CamelProviderConfEntry *entries;
GList *children, *child;
char *name;
@@ -631,6 +630,9 @@ mail_account_gui_build_extra_conf (MailAccountGui *gui, const char *url_string)
else
url = NULL;
+ username = glade_xml_get_widget (gui->xml, "source_user_label");
+ gtk_label_parse_uline (GTK_LABEL (username), _("User_name:"));
+
main_vbox = glade_xml_get_widget (gui->xml, "extra_vbox");
mailcheck_frame = glade_xml_get_widget (gui->xml, "extra_mailcheck_frame");
@@ -701,6 +703,19 @@ mail_account_gui_build_extra_conf (MailAccountGui *gui, const char *url_string)
cur_vbox = main_vbox;
break;
+ case CAMEL_PROVIDER_CONF_LABEL:
+ if (entries[i].name && entries[i].text) {
+ GtkWidget *label;
+
+ if (!strcmp (entries[i].name, "username")) {
+ gtk_label_parse_uline (GTK_LABEL (username), _(entries[i].text));
+ } else {
+ label = gtk_label_new (_(entries[i].text));
+ gtk_box_pack_start (GTK_BOX (cur_vbox), label, FALSE, FALSE, 0);
+ }
+ }
+ break;
+
case CAMEL_PROVIDER_CONF_CHECKBOX:
{
GtkWidget *checkbox;