aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-account-editor.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/em-account-editor.c')
-rw-r--r--mail/em-account-editor.c208
1 files changed, 106 insertions, 102 deletions
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index a9ba161122..e5f0f98001 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -10,7 +10,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 <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -189,7 +189,7 @@ typedef struct _EMAccountEditorPrivate {
} EMAccountEditorPrivate;
static void emae_refresh_authtype(EMAccountEditor *emae, EMAccountEditorService *service);
-static void em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, char *id);
+static void em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, const gchar *id);
static void emae_account_folder_changed(EMFolderSelectionButton *folder, EMAccountEditor *emae);
static GtkVBoxClass *emae_parent;
@@ -269,7 +269,7 @@ em_account_editor_get_type(void)
*
* Return value:
**/
-EMAccountEditor *em_account_editor_new(EAccount *account, em_account_editor_t type, char *id)
+EMAccountEditor *em_account_editor_new(EAccount *account, em_account_editor_t type, const gchar *id)
{
EMAccountEditor *emae = g_object_new(em_account_editor_get_type(), NULL);
@@ -301,8 +301,8 @@ EMAccountEditor *em_account_editor_new_for_pages(EAccount *account, em_account_e
/* ********************************************************************** */
static struct {
- char *label;
- char *value;
+ const gchar *label;
+ const gchar *value;
} ssl_options[] = {
/* Translators: This string is a "Use secure connection" option for
the Mailer. It will not use an encrypted connection. */
@@ -790,7 +790,7 @@ emae_setup_receipt_policy (EMAccountEditor *emae, GladeXML *xml)
EAccountReceiptPolicy current = emae->account->receipt_policy;
static struct {
EAccountReceiptPolicy policy;
- char *label;
+ const gchar *label;
} receipt_policies[] = {
{ E_ACCOUNT_RECEIPT_NEVER, N_("Never") },
{ E_ACCOUNT_RECEIPT_ALWAYS, N_("Always") },
@@ -1092,34 +1092,34 @@ static struct _provider_host_info emae_transport_host_info[] = {
i.e. the receiving (source) service, and the sending (transport) service.
It is used throughout the following code to drive each page */
static struct _service_info {
- int account_uri_key;
- int save_passwd_key;
+ gint account_uri_key;
+ gint save_passwd_key;
- char *frame;
- char *type_dropdown;
+ const gchar *frame;
+ const gchar *type_dropdown;
- char *container;
- char *description;
- char *hostname;
- char *hostlabel;
- char *username;
- char *userlabel;
- char *path;
- char *pathlabel;
- char *pathentry;
+ const gchar *container;
+ const gchar *description;
+ const gchar *hostname;
+ const gchar *hostlabel;
+ const gchar *username;
+ const gchar *userlabel;
+ const gchar *path;
+ const gchar *pathlabel;
+ const gchar *pathentry;
- char *security_frame;
- char *ssl_hbox;
- char *use_ssl;
- char *ssl_disabled;
+ const gchar *security_frame;
+ const gchar *ssl_hbox;
+ const gchar *use_ssl;
+ const gchar *ssl_disabled;
- char *needs_auth;
- char *auth_frame;
+ const gchar *needs_auth;
+ const gchar *auth_frame;
- char *authtype;
- char *authtype_check;
+ const gchar *authtype;
+ const gchar *authtype_check;
- char *remember_password;
+ const gchar *remember_password;
struct _provider_host_info *host_info;
} emae_service_info[CAMEL_NUM_PROVIDER_TYPES] = {
@@ -1422,7 +1422,8 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service)
int active = 0, i;
struct _service_info *info = &emae_service_info[service->type];
const char *uri = e_account_get_string(account, info->account_uri_key);
- char *current = NULL, *tmp;
+ char *current = NULL;
+ const gchar *tmp;
CamelURL *url;
dropdown = service->providers;
@@ -1441,7 +1442,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service)
} else {
current = g_strdup("imap");
}
-
+
store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
i = 0;
@@ -1467,7 +1468,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service)
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter, 0, provider->name, 1, provider, -1);
-
+
/* find the displayed and set default */
if (i == 0 || (current && strcmp(provider->protocol, current) == 0)) {
service->provider = provider;
@@ -1499,10 +1500,10 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service)
if (!uri || (url = camel_url_new(uri, NULL)) == NULL) {
return;
}
-
- tmp = (char *)camel_url_get_param(url, "use_ssl");
+
+ tmp = camel_url_get_param(url, "use_ssl");
if (tmp == NULL)
- tmp = "never";
+ tmp = "never";
for (i=0;i<num_ssl_options;i++) {
if (!strcmp(ssl_options[i].value, tmp)) {
gtk_combo_box_set_active(service->use_ssl, i);
@@ -1776,8 +1777,8 @@ emae_setup_service(EMAccountEditor *emae, EMAccountEditorService *service, Glade
/* do not re-order these, the order is used by various code to look up emae->priv->identity_entries[] */
static struct {
- char *name;
- int item;
+ const gchar *name;
+ gint item;
} emae_identity_entries[] = {
{ "management_name", E_ACCOUNT_NAME },
{ "identity_full_name", E_ACCOUNT_ID_NAME },
@@ -2389,7 +2390,7 @@ emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct
gtk_box_pack_start((GtkBox*)((GnomeDruidPageStandard *)page)->vbox, w, TRUE, TRUE, 0);
w = page;
g_object_unref(druidxml);
- gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page);
+ gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page);
} else {
gtk_notebook_append_page((GtkNotebook *)parent, w, gtk_label_new(_("Sending Email")));
}
@@ -2540,34 +2541,34 @@ emae_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str
/* plugin meta-data for "org.gnome.evolution.mail.config.accountEditor" */
static EMConfigItem emae_editor_items[] = {
- { E_CONFIG_BOOK, "", },
- { E_CONFIG_PAGE, "00.identity", "vboxIdentityBorder", emae_identity_page },
- { E_CONFIG_SECTION, "00.identity/00.name", "account_vbox", emae_widget_glade },
- { E_CONFIG_SECTION_TABLE, "00.identity/10.required", "identity_required_table", emae_widget_glade },
- { E_CONFIG_SECTION_TABLE, "00.identity/20.info", "identity_optional_table", emae_widget_glade },
-
- { E_CONFIG_PAGE, "10.receive", "vboxSourceBorder", emae_receive_page },
- { E_CONFIG_SECTION_TABLE, "10.receive/00.type", "source_type_table", emae_widget_glade },
- { E_CONFIG_SECTION_TABLE, "10.receive/10.config", "table4", emae_widget_glade },
- { E_CONFIG_SECTION, "10.receive/20.security", "vbox181", emae_widget_glade },
- { E_CONFIG_SECTION, "10.receive/30.auth", "vbox179", emae_widget_glade },
-
- /* Most sections for this is auto-generated fromt the camel config */
- { E_CONFIG_PAGE, "20.receive_options", N_("Receiving Options"), },
- { E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Messages"), },
- { E_CONFIG_ITEM_TABLE, "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, },
-
- { E_CONFIG_PAGE, "30.send", "vboxTransportBorder", emae_send_page },
- { E_CONFIG_SECTION_TABLE, "30.send/00.type", "transport_type_table", emae_widget_glade },
- { E_CONFIG_SECTION, "30.send/10.config", "vbox12", emae_widget_glade },
- { E_CONFIG_SECTION, "30.send/20.security", "vbox183", emae_widget_glade },
- { E_CONFIG_SECTION, "30.send/30.auth", "vbox61", emae_widget_glade },
-
- { E_CONFIG_PAGE, "40.defaults", "vboxFoldersBorder", emae_defaults_page },
- { E_CONFIG_SECTION, "40.defaults/00.folders", "vbox184", emae_widget_glade },
- { E_CONFIG_SECTION_TABLE, "40.defaults/10.composing", "table8", emae_widget_glade },
-
- { E_CONFIG_PAGE, "50.security", "vboxSecurityBorder", emae_security_page },
+ { E_CONFIG_BOOK, (gchar *) "" },
+ { E_CONFIG_PAGE, (gchar *) "00.identity", (gchar *) "vboxIdentityBorder", emae_identity_page },
+ { E_CONFIG_SECTION, (gchar *) "00.identity/00.name", (gchar *) "account_vbox", emae_widget_glade },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity_required_table", emae_widget_glade },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity_optional_table", emae_widget_glade },
+
+ { E_CONFIG_PAGE, (gchar *) "10.receive", (gchar *) "vboxSourceBorder", emae_receive_page },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source_type_table", emae_widget_glade },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "table4", emae_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "10.receive/20.security", (gchar *) "vbox181", emae_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "10.receive/30.auth", (gchar *) "vbox179", emae_widget_glade },
+
+ /* Most sections for this is auto-generated from the camel config */
+ { E_CONFIG_PAGE, (gchar *) "20.receive_options", (gchar *) N_("Receiving Options"), },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "20.receive_options/10.mailcheck", (gchar *) N_("Checking for New Messages"), },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, },
+
+ { E_CONFIG_PAGE, (gchar *) "30.send", (gchar *) "vboxTransportBorder", emae_send_page },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport_type_table", emae_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "30.send/10.config", (gchar *) "vbox12", emae_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "30.send/20.security", (gchar *) "vbox183", emae_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "30.send/30.auth", (gchar *) "vbox61", emae_widget_glade },
+
+ { E_CONFIG_PAGE, (gchar *) "40.defaults", (gchar *) "vboxFoldersBorder", emae_defaults_page },
+ { E_CONFIG_SECTION, (gchar *) "40.defaults/00.folders", (gchar *) "vbox184", emae_widget_glade },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "table8", emae_widget_glade },
+
+ { E_CONFIG_PAGE, (gchar *) "50.security", (gchar *) "vboxSecurityBorder", emae_security_page },
/* 1x1 table(!) not vbox: { E_CONFIG_SECTION, "50.security/00.gpg", "table19", emae_widget_glade }, */
/* table not vbox: { E_CONFIG_SECTION, "50.security/10.smime", "smime_table", emae_widget_glade }, */
{ 0 },
@@ -2633,34 +2634,34 @@ emae_widget_druid_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *paren
/* plugin meta-data for "org.gnome.evolution.mail.config.accountDruid" */
static EMConfigItem emae_druid_items[] = {
- { E_CONFIG_DRUID, "", },
- { E_CONFIG_PAGE_START, "0.start", "start_page", emae_widget_druid_glade },
+ { E_CONFIG_DRUID, (gchar *) "" },
+ { E_CONFIG_PAGE_START, (gchar *) "0.start", (gchar *) "start_page", emae_widget_druid_glade },
- { E_CONFIG_PAGE, "00.identity", "vboxIdentityBorder", emae_identity_page },
- { E_CONFIG_SECTION, "00.identity/00.name", "account_vbox", emae_widget_glade },
- { E_CONFIG_SECTION_TABLE, "00.identity/10.required", "identity_required_table", emae_widget_glade },
- { E_CONFIG_SECTION_TABLE, "00.identity/20.info", "identity_optional_table", emae_widget_glade },
+ { E_CONFIG_PAGE, (gchar *) "00.identity", (gchar *) "vboxIdentityBorder", emae_identity_page },
+ { E_CONFIG_SECTION, (gchar *) "00.identity/00.name", (gchar *) "account_vbox", emae_widget_glade },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity_required_table", emae_widget_glade },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity_optional_table", emae_widget_glade },
- { E_CONFIG_PAGE, "10.receive", "vboxSourceBorder", emae_receive_page },
- { E_CONFIG_SECTION_TABLE, "10.receive/00.type", "source_type_table", emae_widget_glade },
- { E_CONFIG_SECTION_TABLE, "10.receive/10.config", "table4", emae_widget_glade },
- { E_CONFIG_SECTION, "10.receive/20.security", "vbox181", emae_widget_glade },
- { E_CONFIG_SECTION, "10.receive/30.auth", "vbox179", emae_widget_glade },
+ { E_CONFIG_PAGE, (gchar *) "10.receive", (gchar *) "vboxSourceBorder", emae_receive_page },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source_type_table", emae_widget_glade },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "table4", emae_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "10.receive/20.security", (gchar *) "vbox181", emae_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "10.receive/30.auth", (gchar *) "vbox179", emae_widget_glade },
/* Most sections for this is auto-generated fromt the camel config */
- { E_CONFIG_PAGE, "20.receive_options", N_("Receiving Options"), },
- { E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Messages"), },
- { E_CONFIG_ITEM_TABLE, "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, },
+ { E_CONFIG_PAGE, (gchar *) "20.receive_options", (gchar *) N_("Receiving Options"), },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "20.receive_options/10.mailcheck", (gchar *) N_("Checking for New Messages"), },
+ { E_CONFIG_ITEM_TABLE, (gchar *) "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, },
- { E_CONFIG_PAGE, "30.send", "vboxTransportBorder", emae_send_page },
- { E_CONFIG_SECTION_TABLE, "30.send/00.type", "transport_type_table", emae_widget_glade },
- { E_CONFIG_SECTION, "30.send/10.config", "vbox12", emae_widget_glade },
- { E_CONFIG_SECTION, "30.send/20.security", "vbox183", emae_widget_glade },
- { E_CONFIG_SECTION, "30.send/30.auth", "vbox61", emae_widget_glade },
+ { E_CONFIG_PAGE, (gchar *) "30.send", (gchar *) "vboxTransportBorder", emae_send_page },
+ { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport_type_table", emae_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "30.send/10.config", (gchar *) "vbox12", emae_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "30.send/20.security", (gchar *) "vbox183", emae_widget_glade },
+ { E_CONFIG_SECTION, (gchar *) "30.send/30.auth", (gchar *) "vbox61", emae_widget_glade },
- { E_CONFIG_PAGE, "40.management", "management_frame", emae_management_page },
+ { E_CONFIG_PAGE, (gchar *) "40.management", (gchar *) "management_frame", emae_management_page },
- { E_CONFIG_PAGE_FINISH, "999.end", "finish_page", emae_widget_druid_glade },
+ { E_CONFIG_PAGE_FINISH, (gchar *) "999.end", (gchar *) "finish_page", emae_widget_druid_glade },
{ 0 },
};
static gboolean emae_druid_items_translated = FALSE;
@@ -2706,7 +2707,7 @@ emae_service_complete(EMAccountEditor *emae, EMAccountEditorService *service)
if (CAMEL_PROVIDER_NEEDS(service->provider, CAMEL_URL_PART_HOST)) {
if (url->host == NULL || url->host[0] == 0)
ok = FALSE;
- else
+ else
gtk_entry_set_text(service->hostname, url->host);
}
/* We only need the user if the service needs auth as well, i think */
@@ -2734,11 +2735,11 @@ enum {
AOL
};
struct _server_prefill {
- char *key;
- char *recv;
- char *send;
- char *proto;
- char *ssl;
+ const gchar *key;
+ const gchar *recv;
+ const gchar *send;
+ const gchar *proto;
+ const gchar *ssl;
} mail_servers [] = {
{"gmail", "imap.gmail.com", "smtp.gmail.com", "imap", "always"},
{"yahoo", "pop3.yahoo.com", "smtp.yahoo.com", "pop", "never"},
@@ -2821,14 +2822,14 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
} else {
g_warning("buz1\n");
}
-
+
}
} else if (!strcmp(pageid, "30.send")) {
CamelURL *url;
char *at, *user;
int index;
char *uri = (char *)e_account_get_string(emae->account, E_ACCOUNT_TRANSPORT_URL);
-
+
tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS);
at = strchr(tmp, '@');
user = g_alloca(at-tmp+1);
@@ -2850,8 +2851,7 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
} else {
g_warning("buz2\n");
}
-
-
+
} else if (!strcmp(pageid, "20.receive_options")) {
if (emae->priv->source.provider
&& emae->priv->extra_provider != emae->priv->source.provider) {
@@ -2893,8 +2893,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
&& ((tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_REPLY_TO)) == NULL
|| tmp[0] == 0
|| is_email(tmp));
- if (!ok)
+ if (!ok) {
d(printf("identity incomplete\n"));
+ }
}
if (ok && (pageid == NULL || !strcmp(pageid, "10.receive"))) {
@@ -2902,8 +2903,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
emae_refresh_providers(emae, &emae->priv->source);
}
ok = emae_service_complete(emae, &emae->priv->source);
- if (!ok)
+ if (!ok) {
d(printf("receive page incomplete\n"));
+ }
}
if (ok && (pageid == NULL || !strcmp(pageid, "30.send"))) {
@@ -2911,8 +2913,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
emae_refresh_providers(emae, &emae->priv->transport);
}
ok = emae_service_complete(emae, &emae->priv->transport);
- if (!ok)
+ if (!ok) {
d(printf("send page incomplete\n"));
+ }
}
if (ok && (pageid == NULL || !strcmp(pageid, "40.management"))) {
@@ -2920,8 +2923,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
&& tmp[0]
&& ((ea = e_get_account_by_name (tmp)) == NULL
|| ea == emae->original);
- if (!ok)
+ if (!ok) {
d(printf("management page incomplete\n"));
+ }
}
return ok;
@@ -2995,7 +2999,7 @@ emae_editor_destroyed(GtkWidget *dialog, EMAccountEditor *emae)
}
static void
-em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, char *id)
+em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, const gchar *id)
{
EMAccountEditorPrivate *gui = emae->priv;
int i, index;
@@ -3120,5 +3124,5 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account
g_signal_connect(emae->editor, "destroy", G_CALLBACK(emae_editor_destroyed), emae);
} else {
e_config_create_widget((EConfig *)ec);
- }
+ }
}
generated by cgit (git 2.34.1) at 2024-11-19 13:02:37 +0800