From 8aee7c7e9696b378d639449e107bae7ac25f79aa Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 31 Mar 2010 07:39:49 +0200 Subject: Build libevolution-mail-settings as dll on windows --- capplet/settings/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'capplet') diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am index b75ffdb52b..91ee98db08 100644 --- a/capplet/settings/Makefile.am +++ b/capplet/settings/Makefile.am @@ -69,4 +69,5 @@ libevolution_mail_settings_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/e-util/libeutil.la +libevolution_mail_settings_la_LDFLAGS = $(NO_UNDEFINED) -- cgit From 7e567893e6de45650b0f425b37b2dc4e86fad701 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 31 Mar 2010 11:32:05 -0400 Subject: Fix build settings under capplet. --- capplet/Makefile.am | 17 +++++------------ capplet/settings/Makefile.am | 14 +++++--------- 2 files changed, 10 insertions(+), 21 deletions(-) (limited to 'capplet') diff --git a/capplet/Makefile.am b/capplet/Makefile.am index aac8cf7a98..b84e28425e 100644 --- a/capplet/Makefile.am +++ b/capplet/Makefile.am @@ -1,6 +1,9 @@ SUBDIRS = settings -AM_CPPFLAGS = \ +bin_PROGRAMS = evolution-settings + +evolution_settings_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir) \ @@ -30,22 +33,12 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-mail\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" - -AM_CFLAGS =\ - -Wall\ - -g -O0 - -bin_PROGRAMS = evolution-settings - evolution_settings_SOURCES = \ anjal-settings-main.c -evolution_settings_LDFLAGS = \ - -Wl,--export-dynamic - if OS_WIN32 -evolution_settings_LDFLAGS += -mwindows +evolution_settings_LDFLAGS = -mwindows endif evolution_settings_LDADD = \ diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am index 91ee98db08..dde24ee7ec 100644 --- a/capplet/settings/Makefile.am +++ b/capplet/settings/Makefile.am @@ -1,5 +1,8 @@ -AM_CPPFLAGS = \ +privsolib_LTLIBRARIES = libevolution-mail-settings.la + +libevolution_mail_settings_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir) \ @@ -16,6 +19,7 @@ AM_CPPFLAGS = \ $(EVOLUTION_MAIL_CFLAGS) \ $(CERT_UI_CFLAGS) \ $(CANBERRA_CFLAGS) \ + -DANJAL_SETTINGS \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ @@ -30,12 +34,6 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-mail\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" - -AM_CFLAGS =\ - -Wall\ - -g -O0 - -privsolib_LTLIBRARIES = libevolution-mail-settings.la libevolution_mail_settings_la_SOURCES = \ mail-settings-view.c \ @@ -53,8 +51,6 @@ libevolution_mail_settings_la_SOURCES = \ mail-guess-servers.c \ mail-guess-servers.h -libevolution_mail_settings_la_CFLAGS = -DANJAL_SETTINGS - libevolution_mail_settings_la_LIBADD = \ $(EVOLUTION_MAIL_LIBS) \ $(CERT_UI_LIBS) \ -- cgit From da7aacb87cd1d5d635f367928994c19af8c764f6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 31 Mar 2010 17:42:14 -0400 Subject: Capplet cleanups. --- capplet/anjal-settings-main.c | 95 ++------- capplet/settings/anjal-mail-view.c | 37 ++-- capplet/settings/anjal-mail-view.h | 20 +- capplet/settings/mail-account-view.c | 176 ++++++---------- capplet/settings/mail-account-view.h | 13 +- capplet/settings/mail-capplet-shell.c | 169 +++------------ capplet/settings/mail-capplet-shell.h | 14 +- capplet/settings/mail-decoration.c | 99 +++++---- capplet/settings/mail-decoration.h | 9 +- capplet/settings/mail-guess-servers.c | 70 +++---- capplet/settings/mail-guess-servers.h | 32 +-- capplet/settings/mail-settings-view.c | 34 ++- capplet/settings/mail-settings-view.h | 10 +- capplet/settings/mail-view.c | 384 ++++++++-------------------------- capplet/settings/mail-view.h | 15 +- 15 files changed, 355 insertions(+), 822 deletions(-) (limited to 'capplet') diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c index c9e08d18c0..6352f020bd 100644 --- a/capplet/anjal-settings-main.c +++ b/capplet/anjal-settings-main.c @@ -12,7 +12,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 * * * Authors: @@ -50,7 +50,6 @@ #include #endif - #include gboolean windowed = FALSE; @@ -59,7 +58,7 @@ gboolean default_app = FALSE; guint32 socket_id = 0; MailCappletShell *main_window; static gchar **remaining_args; -extern char *shell_moduledir; +extern gchar *shell_moduledir; #define GCONF_KEY_MAILTO_ENABLED "/desktop/gnome/url-handlers/mailto/enabled" #define GCONF_KEY_MAILTO_COMMAND "/desktop/gnome/url-handlers/mailto/command" @@ -74,8 +73,8 @@ mail_message_received_cb (UniqueApp *app G_GNUC_UNUSED, { gchar *url; GtkWindow *window = (GtkWindow *) user_data; - char *args[2]; - + gchar *args[2]; + switch (command) { case UNIQUE_ACTIVATE : gtk_window_deiconify (window); @@ -143,7 +142,7 @@ check_and_set_default_mail (void) g_object_unref (client); return; /* Anjal is the default mailer */ } - + gconf_client_set_bool(client, GCONF_KEY_MAILTO_ENABLED, TRUE, NULL); gconf_client_set_string(client, GCONF_KEY_MAILTO_COMMAND, ANJAL_MAILTO_COMMAND, NULL); g_object_unref (client); @@ -152,13 +151,11 @@ check_and_set_default_mail (void) static gboolean idle_cb (MailCappletShell *mshell G_GNUC_UNUSED) { - + if (default_app) { check_and_set_default_mail (); } - - return FALSE; } @@ -171,12 +168,12 @@ create_default_shell (void) g_idle_add ((GSourceFunc) idle_cb, remaining_args); } -int -main (int argc, char *argv[]) +gint +main (gint argc, gchar *argv[]) { GError *error = NULL; GConfClient *client; - + UniqueApp *app; #ifdef G_OS_WIN32 @@ -208,7 +205,7 @@ main (int argc, char *argv[]) &socket_id, /* TRANSLATORS: don't translate the terms in brackets */ N_("ID of the socket to embed in"), - N_("socket") }, + N_("socket") }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &remaining_args, NULL, NULL }, { NULL, 0, 0, 0, NULL, NULL, NULL } }; @@ -219,7 +216,6 @@ main (int argc, char *argv[]) textdomain (GETTEXT_PACKAGE); #endif - gtk_set_locale (); if (!gtk_init_with_args (&argc, &argv, _("Anjal email client"), entries, NULL, &error)) { @@ -239,11 +235,11 @@ main (int argc, char *argv[]) gconf_client_set_bool (client, "/apps/evolution/mail/display/enable_vfolders", FALSE, NULL); g_object_unref (client); - + app = unique_app_new ("org.gnome.AnjalSettings", NULL); if (unique_app_is_running (app) && !socket_id) { gboolean cmd_line = (remaining_args && remaining_args[0] != NULL); - + if (!cmd_line) unique_app_send_message (app, UNIQUE_ACTIVATE, NULL); else { @@ -263,73 +259,8 @@ main (int argc, char *argv[]) if (windowed) anjal_icon_decoration = TRUE; - + gtk_main (); return 0; } - -#ifndef HACK -gpointer em_format_html_print_new(gpointer p1 G_GNUC_UNUSED, - int i G_GNUC_UNUSED) -{ - return NULL; -} - -void em_format_html_print_raw_message (gpointer p1 G_GNUC_UNUSED, - gpointer p2 G_GNUC_UNUSED) -{ - return ; -} - -void -eab_merging_book_commit_contact () -{ -} - -void -e_searching_tokenizer_set_primary_case_sensitivity () -{ -} - -void -eab_prompt_save_dialog () -{ -} - -void -eab_merging_book_add_contact () -{ -} - -void -e_searching_tokenizer_match_count () -{ -} - -void -addressbook_load_cancel() -{ -} - -void -e_searching_tokenizer_new () -{ -} - -void -e_searching_tokenizer_set_primary_search_string() -{ -} - -void -addressbook_load() -{ -} - -void -eab_load_error_dialog() -{ -} - -#endif diff --git a/capplet/settings/anjal-mail-view.c b/capplet/settings/anjal-mail-view.c index 5178b56422..99ff93a065 100644 --- a/capplet/settings/anjal-mail-view.c +++ b/capplet/settings/anjal-mail-view.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 + * License along with the program; if not, see * * * Authors: @@ -31,13 +31,11 @@ #include "mail/mail-ops.h" #include "mail/em-folder-tree.h" - struct _AnjalMailViewPrivate { gboolean started; }; - G_DEFINE_TYPE (AnjalMailView, anjal_mail_view, GTK_TYPE_NOTEBOOK) static void @@ -52,31 +50,31 @@ anjal_mail_view_finalize (GObject *object) { AnjalMailView *shell = (AnjalMailView *)object; AnjalMailViewPrivate *priv = shell->priv; - + g_free (priv); - + G_OBJECT_CLASS (anjal_mail_view_parent_class)->finalize (object); } -static void +static void view_set_folder_uri (AnjalMailView *mail_view, const gchar *uri) { } -static void +static void view_set_folder_tree_widget (AnjalMailView *mail_view, GtkWidget *tree) { } -static void +static void view_set_folder_tree (AnjalMailView *mail_view, EMFolderTree *tree) { } -static void -view_set_search (AnjalMailView *mail_view, const char *search) +static void +view_set_search (AnjalMailView *mail_view, const gchar *search) { } -static void +static void view_init_search (AnjalMailView *mail_view, GtkWidget *search) { } @@ -95,17 +93,16 @@ anjal_mail_view_class_init (AnjalMailViewClass *klass) klass->init_search = view_init_search; }; - AnjalMailView * anjal_mail_view_new () { AnjalMailView *shell = g_object_new (ANJAL_MAIL_VIEW_TYPE, NULL); - + return shell; } -void -anjal_mail_view_set_folder_uri (AnjalMailView *mv, const char *uri) +void +anjal_mail_view_set_folder_uri (AnjalMailView *mv, const gchar *uri) { if (!mv || !uri) return; @@ -113,25 +110,25 @@ anjal_mail_view_set_folder_uri (AnjalMailView *mv, const char *uri) ANJAL_MAIL_VIEW_GET_CLASS(mv)->set_folder_uri (mv, uri); } -void +void anjal_mail_view_set_folder_tree_widget (AnjalMailView *mv, GtkWidget *tree) { ANJAL_MAIL_VIEW_GET_CLASS(mv)->set_folder_tree_widget (mv, tree); } -void +void anjal_mail_view_set_folder_tree (AnjalMailView *mv, GtkWidget *tree) { ANJAL_MAIL_VIEW_GET_CLASS(mv)->set_folder_tree (mv, (EMFolderTree *)tree); } -void -anjal_mail_view_set_search (AnjalMailView *view, const char *search) +void +anjal_mail_view_set_search (AnjalMailView *view, const gchar *search) { ANJAL_MAIL_VIEW_GET_CLASS(view)->set_search (view, search); } -void +void anjal_mail_view_init_search (AnjalMailView *mv, GtkWidget *search) { ANJAL_MAIL_VIEW_GET_CLASS(mv)->init_search (mv, search); diff --git a/capplet/settings/anjal-mail-view.h b/capplet/settings/anjal-mail-view.h index 647d07b29a..953aa4b935 100644 --- a/capplet/settings/anjal-mail-view.h +++ b/capplet/settings/anjal-mail-view.h @@ -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 + * License along with the program; if not, see * * * Authors: @@ -50,27 +50,15 @@ typedef struct _AnjalMailViewClass { void (*set_folder_tree) (AnjalMailView *mail_view, EMFolderTree *tree); void (*set_search) (AnjalMailView *mail_view, - const char *search); + const gchar *search); void (* init_search) (AnjalMailView *mail_view, GtkWidget *search); } AnjalMailViewClass; GType anjal_mail_view_get_type (void); AnjalMailView * anjal_mail_view_new (void); -void anjal_mail_view_set_folder_uri (AnjalMailView *mv, const char *uri); -#if 0 -void anjal_mail_view_show_sort_popup (AnjalMailView *mv, GtkWidget *); -void anjal_anjal_mail_view_show_list (AnjalMailView *mv); -void anjal_mail_view_close_view (AnjalMailView *mv); -void anjal_mail_view_set_check_email (AnjalMailView *mv, GtkWidget *button); -void anjal_mail_view_set_sort_by (AnjalMailView *mv, GtkWidget *button); -void anjal_mail_view_check_mail(AnjalMailView *mv, gboolean deep); -void anjal_mail_view_save (AnjalMailView *mv); -void anjal_mail_view_set_slider (AnjalMailView *mv, GtkWidget *slider); -void anjal_mail_view_switch_to_people (AnjalMailView* mv, MailViewChild *mpv); -void anjal_mail_view_switch_to_settings (AnjalMailView* mv, MailViewChild *mpv); -#endif +void anjal_mail_view_set_folder_uri (AnjalMailView *mv, const gchar *uri); void anjal_mail_view_set_folder_tree_widget (AnjalMailView *mv, GtkWidget *tree); void anjal_mail_view_set_folder_tree (AnjalMailView *mv, GtkWidget *tree); -void anjal_mail_view_set_search (AnjalMailView *view, const char *search); +void anjal_mail_view_set_search (AnjalMailView *view, const gchar *search); void anjal_mail_view_init_search (AnjalMailView *mv, GtkWidget *search); #endif diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index cb5b1aeda7..e97abdc6dc 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.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 + * License along with the program; if not, see * * * Authors: @@ -50,8 +50,8 @@ enum { }; struct _dialog_errors { - int error; - char *detail; + gint error; + const gchar *detail; } dialog_errors[] = { { ERROR_NO_FULLNAME, N_("Please enter your full name.") }, { ERROR_NO_EMAIL, N_("Please enter your email address.") }, @@ -90,7 +90,7 @@ mail_account_view_class_init (MailAccountViewClass *klass) NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - + } #ifdef NOT_USED @@ -101,21 +101,21 @@ enum { AOL }; struct _server_prefill { - char *key; - char *recv; - char *send; - char *proto; - char *ssl; + gchar *key; + gchar *recv; + gchar *send; + gchar *proto; + gchar *ssl; } std_server [] = { {"gmail", "imap.gmail.com", "smtp.gmail.com", "imap", "always"}, {"yahoo", "pop3.yahoo.com", "smtp.yahoo.com", "pop", "never"}, {"aol", "imap.aol.com", "smtp.aol.com", "pop", "never"}, {"msn", "pop3.email.msn.com", "smtp.email.msn.com", "pop", "never"} }; -static int -check_servers (char *server) +static gint +check_servers (gchar *server) { - int len = G_N_ELEMENTS(std_server), i; + gint len = G_N_ELEMENTS(std_server), i; for (i=0; ioriginal) { - char *tmp = e_account_get_string(view->edit->account, E_ACCOUNT_ID_ADDRESS); - char **token; - int index; - - if (tmp && *tmp) { - token = g_strsplit (tmp, "@", 2); - index = check_servers(token[1]); - - if (index != -1) { - char *uri = e_account_get_string(view->edit->account, E_ACCOUNT_SOURCE_URL); - CamelURL *url; - if (uri == NULL || (url = camel_url_new(uri, NULL)) == NULL) - return; - - if (strcmp(url->protocol, std_server[index].proto)) { - camel_url_set_protocol (url, std_server[index].proto); - g_datalist_clear (&url->params); - } - camel_url_set_param(url, "use_ssl", std_server[index].ssl); - camel_url_set_host (url, std_server[index].recv); - camel_url_set_user (url, token[0]); - uri = camel_url_to_string(url, 0); - e_account_set_string(view->edit->account, E_ACCOUNT_SOURCE_URL, uri); - g_free(uri); - - uri = e_account_get_string(view->edit->account, E_ACCOUNT_TRANSPORT_URL); - if (uri == NULL || (url = camel_url_new(uri, NULL)) == NULL) - return; - - camel_url_set_protocol (url, "smtp"); - camel_url_set_param(url, "use_ssl", std_server[index].ssl); - camel_url_set_host (url, std_server[index].recv); - camel_url_set_user (url, token[0]); - uri = camel_url_to_string(url, 0); - e_account_set_string(view->edit->account, E_ACCOUNT_TRANSPORT_URL, uri); - g_free(uri); - } - g_strfreev(token); - } - } -#endif } -static int +static gint validate_identity (MailAccountView *view) { - char *user = (char *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_NAME); - char *email = (char *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_ADDRESS); - char *tmp; + gchar *user = (gchar *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_NAME); + gchar *email = (gchar *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_ADDRESS); + gchar *tmp; if (!user || !*user) return ERROR_NO_FULLNAME; - if (!email || !*email) + if (!email || !*email) return ERROR_NO_EMAIL; - tmp = strchr(email, '@'); + tmp = strchr(email, '@'); if (!tmp || tmp[1] == 0) return ERROR_INVALID_EMAIL; @@ -209,11 +166,11 @@ static GtkWidget * create_review (MailAccountView *view) { GtkWidget *table, *box, *label, *entry; - char *uri; - char *enc; + gchar *uri; + gchar *enc; CamelURL *url; - uri = (char *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_SOURCE_URL); + uri = (gchar *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_SOURCE_URL); if (!uri || (url = camel_url_new(uri, NULL)) == NULL) return NULL; @@ -268,7 +225,6 @@ create_review (MailAccountView *view) PACK_BOX(entry); gtk_table_attach ((GtkTable *)table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); - label = gtk_label_new (_("Username:")); gtk_widget_show (label); PACK_BOX(label); @@ -282,15 +238,14 @@ create_review (MailAccountView *view) gtk_widget_show (label); PACK_BOX(label); gtk_table_attach ((GtkTable *)table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); - enc = (char *)camel_url_get_param(url, "use_ssl"); + enc = (gchar *)camel_url_get_param(url, "use_ssl"); entry = gtk_label_new (enc ? enc : _("never")); gtk_widget_show(entry); PACK_BOX(entry); gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); - camel_url_free(url); - uri =(char *) e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_TRANSPORT_URL); + uri =(gchar *) e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_TRANSPORT_URL); if (!uri || (url = camel_url_new(uri, NULL)) == NULL) return NULL; @@ -318,7 +273,6 @@ create_review (MailAccountView *view) PACK_BOX(entry); gtk_table_attach ((GtkTable *)table, box, 1, 2, 10, 11, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); - label = gtk_label_new (_("Username:")); gtk_widget_show (label); PACK_BOX(label); @@ -332,12 +286,12 @@ create_review (MailAccountView *view) gtk_widget_show (label); PACK_BOX(label); gtk_table_attach ((GtkTable *)table, box, 0, 1, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); - enc = (char *)camel_url_get_param(url, "use_ssl"); + enc = (gchar *)camel_url_get_param(url, "use_ssl"); entry = gtk_label_new (enc ? enc : _("never")); gtk_widget_show(entry); PACK_BOX(entry); gtk_table_attach ((GtkTable *)table, box, 1, 2, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); - + /* label = gtk_label_new (_("Organization:")); gtk_widget_show (label); @@ -347,7 +301,7 @@ create_review (MailAccountView *view) gtk_table_attach (table, entry, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); */ - gtk_widget_show(table); + gtk_widget_show(table); return table; } @@ -362,18 +316,18 @@ create_review (MailAccountView *view) #define DEFAULTS_DETAIL N_("You can specify your default settings for your account.") #define REVIEW_DETAIL N_("Time to check things over before we try and connect to the server and fetch your mail.") struct _page_text { - int id; - char *head; - char *next; - char *prev; - char *next_edit; - char *prev_edit; - char *detail; - char *path; + gint id; + const gchar *head; + const gchar *next; + const gchar *prev; + const gchar *next_edit; + const gchar *prev_edit; + const gchar *detail; + const gchar *path; GtkWidget * (*create_page) (MailAccountView *view); void (*fill_page) (MailAccountView *view); void (*save_page) (MailAccountView *view); - int (*validate_page) (MailAccountView *view); + gint (*validate_page) (MailAccountView *view); } mail_account_pages[] = { { MAV_IDENTITY_PAGE, N_("Identity"), N_("Next - Receiving mail"), NULL, N_("Next - Receiving mail"), NULL, IDENTITY_DETAIL, "00.identity",NULL, NULL, save_identity, validate_identity}, { MAV_RECV_PAGE, N_("Receiving mail"), N_("Next - Sending mail"), N_("Back - Identity"), N_("Next - Receiving options"), N_("Back - Identity"), RECEIVE_DETAIL, "10.receive", NULL, NULL, NULL, NULL }, @@ -389,7 +343,7 @@ static void mav_next_pressed (GtkButton *button, MailAccountView *mav) { if (mail_account_pages[mav->current_page].validate_page) { - int ret = (*mail_account_pages[mav->current_page].validate_page) (mav); + gint ret = (*mail_account_pages[mav->current_page].validate_page) (mav); MAVPage *page = mav->pages[mav->current_page]; if (ret) { gtk_label_set_text ((GtkLabel *)page->error_label, _(dialog_errors[ret-1].detail)); @@ -404,7 +358,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) } if (mav->current_page == MAV_LAST - 1) { - char *uri = (char *)e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_SOURCE_URL); + gchar *uri = (gchar *)e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_SOURCE_URL); CamelURL *url; e_account_set_string (em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_NAME, e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_ID_ADDRESS)); @@ -425,7 +379,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) camel_url_free(url); } em_account_editor_commit (mav->edit); - g_signal_emit (mav, signals[VIEW_CLOSE], 0); + g_signal_emit (mav, signals[VIEW_CLOSE], 0); return; } @@ -478,19 +432,18 @@ mav_prev_pressed (GtkButton *button, MailAccountView *mav) } - static GtkWidget * mav_construct_page(MailAccountView *view, MAVPageType type) { MAVPage *page = g_new0(MAVPage, 1); GtkWidget *box, *tmp, *error_box; - char *str; + gchar *str; page->type = type; page->box = gtk_vbox_new (FALSE, 2); - error_box = gtk_hbox_new (FALSE, 2); + error_box = gtk_hbox_new (FALSE, 2); page->error_label = gtk_label_new (""); tmp = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU); gtk_box_pack_start ((GtkBox *)error_box, tmp, FALSE, FALSE, 2); @@ -552,7 +505,7 @@ mav_construct_page(MailAccountView *view, MAVPageType type) tmp = gtk_label_new (_(view->original ? mail_account_pages[type].next_edit : mail_account_pages[type].next)); gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3); if (FALSE) { - tmp = gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_BUTTON); + tmp = gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_BUTTON); gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 0); } page->next = gtk_button_new (); @@ -560,7 +513,7 @@ mav_construct_page(MailAccountView *view, MAVPageType type) gtk_widget_show_all(page->next); g_signal_connect(page->next, "clicked", G_CALLBACK(mav_next_pressed), view); } - + box = gtk_hbox_new (FALSE, 0); if (page->prev) gtk_box_pack_start ((GtkBox *)box, page->prev, FALSE, FALSE, 12); @@ -578,17 +531,17 @@ emae_check_servers (const gchar *email) { ServerData *sdata = g_new0(ServerData, 1); EmailProvider *provider = g_new0(EmailProvider, 1); - char *dupe = g_strdup(email); - char *tmp; + gchar *dupe = g_strdup(email); + gchar *tmp; /* FIXME: Find a way to free the provider once given to account settings. */ - provider->email = (char *)email; + provider->email = (gchar *)email; tmp = strchr(email, '@'); tmp++; provider->domain = tmp; tmp = strchr(dupe, '@'); *tmp = 0; - provider->username = (char *)g_quark_to_string(g_quark_from_string(dupe)); + provider->username = (gchar *)g_quark_to_string(g_quark_from_string(dupe)); g_free(dupe); if (!mail_guess_servers (provider)) { @@ -596,11 +549,11 @@ emae_check_servers (const gchar *email) g_free (sdata); return NULL; } - /*printf("Recv: %s\n%s(%s), %s by %s \n Send: %s\n%s(%s), %s by %s\n via %s to %s\n", + /*printf("Recv: %s\n%s(%s), %s by %s \n Send: %s\n%s(%s), %s by %s\n via %s to %s\n", provider->recv_type, provider->recv_hostname, provider->recv_port, provider->recv_username, provider->recv_auth, provider->send_type, provider->send_hostname, provider->send_port, provider->send_username, provider->send_auth, provider->recv_socket_type, provider->send_socket_type); */ - + sdata->recv = provider->recv_hostname; sdata->recv_port = provider->recv_port; sdata->send = provider->send_hostname; @@ -612,32 +565,31 @@ emae_check_servers (const gchar *email) else sdata->proto = provider->recv_type; if (provider->recv_socket_type) { - if(g_ascii_strcasecmp(provider->recv_socket_type, "SSL") == 0) + if (g_ascii_strcasecmp(provider->recv_socket_type, "SSL") == 0) sdata->ssl = g_strdup("always"); - else if(g_ascii_strcasecmp(provider->recv_socket_type, "secure") == 0) + else if (g_ascii_strcasecmp(provider->recv_socket_type, "secure") == 0) sdata->ssl = g_strdup("always"); - else if(g_ascii_strcasecmp(provider->recv_socket_type, "STARTTLS") == 0) - sdata->ssl = g_strdup("when-possible"); - else if(g_ascii_strcasecmp(provider->recv_socket_type, "TLS") == 0) + else if (g_ascii_strcasecmp(provider->recv_socket_type, "STARTTLS") == 0) sdata->ssl = g_strdup("when-possible"); - else + else if (g_ascii_strcasecmp(provider->recv_socket_type, "TLS") == 0) + sdata->ssl = g_strdup("when-possible"); + else sdata->ssl = g_strdup("never"); } sdata->send_user = provider->send_username; sdata->recv_user = provider->recv_username; - g_free (provider); return sdata; } -void +static void mail_account_view_construct (MailAccountView *view) { - int i; - + gint i; + view->scroll = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy ((GtkScrolledWindow *)view->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *)view->scroll, GTK_SHADOW_NONE); @@ -676,7 +628,7 @@ mail_account_view_new (EAccount *account) view->uri = "account://"; view->original = account; mail_account_view_construct (view); - + return view; } @@ -697,7 +649,7 @@ mav_btn_expose (GtkWidget *w, GdkEventExpose *event, MailAccountView *mfv) static void mav_close (GtkButton *w, MailAccountView *mfv) { - g_signal_emit (mfv, signals[VIEW_CLOSE], 0); + g_signal_emit (mfv, signals[VIEW_CLOSE], 0); } GtkWidget * @@ -706,19 +658,19 @@ mail_account_view_get_tab_widget (MailAccountView *mcv) GdkPixbuf *pbuf = gtk_widget_render_icon ((GtkWidget *)mcv, "gtk-close", GTK_ICON_SIZE_MENU, NULL); GtkWidget *tool, *box, *img; - int w=-1, h=-1; + gint w=-1, h=-1; GtkWidget *tab_label; img = (GtkWidget *)gtk_image_new_from_pixbuf (pbuf); g_object_set_data ((GObject *)img, "pbuf", pbuf); g_signal_connect (img, "expose-event", G_CALLBACK(mav_btn_expose), mcv); - + tool = gtk_button_new (); gtk_button_set_relief((GtkButton *)tool, GTK_RELIEF_NONE); gtk_button_set_focus_on_click ((GtkButton *)tool, FALSE); gtk_widget_set_tooltip_text (tool, _("Close Tab")); g_signal_connect (tool, "clicked", G_CALLBACK(mav_close), mcv); - + box = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)box, img, FALSE, FALSE, 0); gtk_container_add ((GtkContainer *)tool, box); @@ -733,7 +685,7 @@ mail_account_view_get_tab_widget (MailAccountView *mcv) gtk_widget_show_all (tab_label); return tab_label; - + } void diff --git a/capplet/settings/mail-account-view.h b/capplet/settings/mail-account-view.h index 5066d83dce..618dce5361 100644 --- a/capplet/settings/mail-account-view.h +++ b/capplet/settings/mail-account-view.h @@ -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 + * License along with the program; if not, see * * * Authors: @@ -60,12 +60,10 @@ typedef struct _MAVPage { gboolean done; }MAVPage; - - typedef struct _MailAccountView { GtkVBox parent; - int type; - char *uri; + gint type; + const gchar *uri; MailViewFlags flags; /* Base class of MailChildView ends */ @@ -75,7 +73,7 @@ typedef struct _MailAccountView { MAVPage *pages[6]; struct _EAccount *original; GtkWidget *wpages[6]; - int current_page; + gint current_page; struct _EMAccountEditor *edit; MailAccountViewPrivate *priv; @@ -84,10 +82,11 @@ typedef struct _MailAccountView { typedef struct _MailAccountViewClass { GtkVBoxClass parent_class; - void (* view_close) (MailAccountView *); + void (* view_close) (MailAccountView *); } MailAccountViewClass; +GType mail_account_view_get_type (void); MailAccountView *mail_account_view_new (EAccount *account); GtkWidget * mail_account_view_get_tab_widget(MailAccountView *mcv); void mail_account_view_activate (MailAccountView *mcv, GtkWidget *tree, GtkWidget *folder_tree, GtkWidget *check_mail, GtkWidget *sort_by, gboolean act); diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 52f4519d42..da22b9d0d5 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -12,7 +12,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 * * * Authors: @@ -29,7 +29,7 @@ #include #include #include -#include "mail-capplet-shell.h" +#include "mail-capplet-shell.h" #include "mail-view.h" #include @@ -51,30 +51,30 @@ enum { /* Re usable colors */ GdkColor *pcolor_sel; -char *scolor_sel; +gchar *scolor_sel; GdkColor *pcolor_fg_sel; -char *scolor_fg_sel; +gchar *scolor_fg_sel; GdkColor *pcolor_bg_norm; -char *scolor_bg_norm; +gchar *scolor_bg_norm; GdkColor *pcolor_norm; -char *scolor_norm; +gchar *scolor_norm; GdkColor *pcolor_fg_norm; -char *scolor_fg_norm; +gchar *scolor_fg_norm; static guint mail_capplet_shell_signals[LAST_SIGNAL]; struct _MailCappletShellPrivate { GtkWidget *box; - + GtkWidget * top_bar; GtkWidget *message_pane; GtkWidget *bottom_bar; /* Top Bar */ GtkWidget *action_bar; - GtkWidget *quit; - + GtkWidget *quit; + gboolean main_loop; MailViewChild *settings_view; @@ -102,8 +102,6 @@ mail_capplet_shell_finalize (GObject *object) static void ms_ctrl_w_pressed (MailCappletShell *shell) { - MailCappletShellPrivate *priv = shell->priv; - mail_view_close_view ((MailView *)shell->view); } @@ -111,7 +109,7 @@ static void ms_ctrl_q_pressed (MailCappletShell *shell) { mail_capplet_shell_quit (shell); -} +} static void mail_capplet_shell_class_init (MailCappletShellClass *klass) @@ -132,7 +130,7 @@ mail_capplet_shell_class_init (MailCappletShellClass *klass) NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - + mail_capplet_shell_signals [CTRL_Q_PRESSED] = g_signal_new ("ctrl_q_pressed", G_TYPE_FROM_CLASS (object_class), @@ -150,36 +148,6 @@ mail_capplet_shell_class_init (MailCappletShellClass *klass) }; -static int -color_expose (GtkWidget *w, - GdkEventExpose *event G_GNUC_UNUSED, - gpointer data) -{ - GtkWindow *win = (GtkWindow *)data; - cairo_t *cr = gdk_cairo_create (w->window); - int wid = w->allocation.width; - int heig = w->allocation.height; - int wwid, wheig; - GdkColor paint; - - gtk_window_get_size (win, &wwid, &wheig); - gdk_color_parse ("#000000", &paint); - gdk_cairo_set_source_color (cr, &(paint)); - cairo_rectangle (cr, 0, 0, wwid, wheig); - cairo_stroke (cr); - - gdk_color_parse ("#000000", &paint); - gdk_cairo_set_source_color (cr, &(paint)); - cairo_rectangle (cr, 1, 1, wid, heig); - cairo_fill (cr); - - cairo_destroy (cr); - - return FALSE; -} - - - static void ms_init_style (GtkStyle *style) { @@ -208,13 +176,6 @@ mail_capplet_shell_quit (MailCappletShell *shell) gtk_main_quit(); else gtk_widget_hide ((GtkWidget *)shell); -} - -static void -mail_capplet_shell_quit_cb (GtkWidget *w G_GNUC_UNUSED, - MailCappletShell *shell) -{ - mail_capplet_shell_quit (shell); } static void @@ -225,60 +186,23 @@ ms_delete_event (MailCappletShell *shell, mail_capplet_shell_quit (shell); } -static gboolean -ms_check_new () -{ - GConfClient *client; - GSList *accounts; - - client = gconf_client_get_default (); - accounts = gconf_client_get_list (client, "/apps/evolution/mail/accounts", GCONF_VALUE_STRING, NULL); - g_object_unref (client); - - if (accounts != NULL) { - g_slist_foreach (accounts, (GFunc) g_free, NULL); - g_slist_free (accounts); - - return FALSE; - } - - return TRUE; -} - - static void ms_show_post_druid (MailViewChild *mfv G_GNUC_UNUSED, MailCappletShell *shell) { gtk_widget_destroy (GTK_WIDGET (shell)); - /* - if (shell->priv->settings_view) - mail_view_switch_to_settings ((MailView *)shell->view, (MailViewChild *)shell->priv->settings_view); - else { - shell->priv->settings_view = mail_view_add_page ((MailView *)shell->view, MAIL_VIEW_SETTINGS, NULL); - } */ - } #define PACK_IN_TOOL(wid,icon) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_BUTTON), FALSE, FALSE, 0); wid = (GtkWidget *)gtk_tool_button_new (tbox, NULL); } -#if 0 static void -handle_cmdline (MailView *mv, MailCappletShell *shell) -{ - g_signal_handlers_block_by_func (mv, handle_cmdline, shell); - mail_capplet_shell_handle_cmdline (shell); -} -#endif - -void -mail_capplet_shell_construct (MailCappletShell *shell, int socket_id, gboolean just_druid, gboolean main_loop) +mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean just_druid, gboolean main_loop) { MailCappletShellPrivate *priv = shell->priv; - GtkWidget *tmp, *img, *box, *ar1, *ar2, *lbl; + GtkWidget *tmp; GtkStyle *style = gtk_widget_get_default_style (); - int window_width = 1024; - char *custom_dir; + gint window_width = 1024; + gchar *custom_dir; gtk_window_set_icon_name ((GtkWindow *)shell, "evolution"); gtk_window_set_title ((GtkWindow *)shell, _("Evolution account assistant")); @@ -291,7 +215,6 @@ mail_capplet_shell_construct (MailCappletShell *shell, int socket_id, gboolean j gtk_window_set_default_size ((GtkWindow *)shell, gdk_screen_get_width(scr), gdk_screen_get_height (scr)); gtk_window_set_decorated ((GtkWindow *)shell, FALSE); } else { - //mail_decoration_new ((GtkWindow *)shell); gtk_window_set_default_size ((GtkWindow *)shell, 1024, 500); } @@ -300,47 +223,10 @@ mail_capplet_shell_construct (MailCappletShell *shell, int socket_id, gboolean j gtk_widget_show ((GtkWidget *)priv->box); if (!socket_id) { -#if 0 - /* Toolbar */ - priv->top_bar = gtk_toolbar_new (); - gtk_box_pack_start ((GtkBox *)priv->box, priv->top_bar, FALSE, FALSE, 0); - gtk_widget_show (priv->top_bar); - if (g_getenv("ANJAL_NO_MAX") || FALSE) { - gtk_container_set_border_width (GTK_CONTAINER (shell), 1); - g_signal_connect (priv->top_bar, "expose-event", - G_CALLBACK (color_expose), - shell); - /* Leave it to the theme to decide the height */ - /* gtk_widget_set_size_request (priv->top_bar, -1, 42); */ - } - - /* Label */ - tmp = (GtkWidget *)gtk_tool_item_new (); - gtk_tool_item_set_expand((GtkToolItem *)tmp, FALSE); - lbl = gtk_label_new (_("Email Settings")); - gtk_container_add ((GtkContainer *)tmp, lbl); - gtk_toolbar_insert ((GtkToolbar *)priv->top_bar, (GtkToolItem *)tmp, 0); - gtk_widget_show_all (tmp); - - tmp = (GtkWidget *)gtk_tool_item_new (); - gtk_tool_item_set_expand((GtkToolItem *)tmp, TRUE); - lbl = gtk_label_new (NULL); - gtk_container_add ((GtkContainer *)tmp, lbl); - gtk_toolbar_insert ((GtkToolbar *)priv->top_bar, (GtkToolItem *)tmp, 1); - gtk_widget_show_all (tmp); - - /* Close button */ - PACK_IN_TOOL(priv->quit, "gtk-close"); - gtk_widget_set_tooltip_text(priv->quit, _("Quit")); - gtk_tool_item_set_expand ((GtkToolItem *)priv->quit, FALSE); - gtk_toolbar_insert ((GtkToolbar *)priv->top_bar, (GtkToolItem *)priv->quit, -1); - gtk_widget_show_all (priv->quit); - g_signal_connect (priv->quit, "clicked", G_CALLBACK(mail_capplet_shell_quit_cb), shell); -#endif gtk_container_add ((GtkContainer *)shell, priv->box); } else { GtkWidget *plug = gtk_plug_new (socket_id); - + gtk_container_add ((GtkContainer *)plug, priv->box); g_signal_connect (plug, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (plug); @@ -360,11 +246,11 @@ mail_capplet_shell_construct (MailCappletShell *shell, int socket_id, gboolean j custom_dir = g_build_filename (e_get_user_data_dir (), "mail", NULL); e_mail_store_init (custom_dir); g_free (custom_dir); - + if (just_druid) { MailViewChild *mc; - char *pdir = g_build_filename (g_get_home_dir(), ".gnome2_private", NULL); - + gchar *pdir = g_build_filename (g_get_home_dir(), ".gnome2_private", NULL); + gtk_notebook_set_show_tabs ((GtkNotebook *)shell->view, FALSE); mc = mail_view_add_page ((MailView *)shell->view, MAIL_VIEW_ACCOUNT, NULL); g_signal_connect (mc, "view-close", G_CALLBACK(ms_show_post_druid), shell); @@ -373,20 +259,19 @@ mail_capplet_shell_construct (MailCappletShell *shell, int socket_id, gboolean j g_mkdir (pdir, 0700); } g_free (pdir); - } else + } else shell->priv->settings_view = mail_view_add_page ((MailView *)shell->view, MAIL_VIEW_SETTINGS, NULL); - } -int +gint mail_capplet_shell_toolbar_height (MailCappletShell *shell) { return shell->priv->top_bar->allocation.height; } MailCappletShell * -mail_capplet_shell_new (int socket_id, gboolean just_druid, gboolean main_loop) +mail_capplet_shell_new (gint socket_id, gboolean just_druid, gboolean main_loop) { MailCappletShell *shell = g_object_new (MAIL_CAPPLET_SHELL_TYPE, NULL); mail_capplet_shell_construct (shell, socket_id, just_druid, main_loop); @@ -399,7 +284,7 @@ mail_capplet_shell_new (int socket_id, gboolean just_druid, gboolean main_loop) static void setup_abooks() { - char *base_dir, *uri; + gchar *base_dir, *uri; GSList *groups; ESourceGroup *group; ESourceList *list = NULL; @@ -408,7 +293,7 @@ setup_abooks() base_dir = g_build_filename (e_get_user_data_dir (), "addressbook", "local", NULL); uri = g_filename_to_uri (base_dir, NULL, NULL); - + if (!e_book_get_addressbooks(&list, NULL)) { g_warning ("Unable to get books\n"); return; @@ -429,7 +314,7 @@ setup_abooks() } } } - + if (on_this_computer) { /* make sure "Personal" shows up as a source under this group */ @@ -470,7 +355,7 @@ setup_abooks() g_object_unref (on_this_computer); if (personal_source) g_object_unref (personal_source); - + e_source_list_sync (list, NULL); g_object_unref (list); g_free (uri); diff --git a/capplet/settings/mail-capplet-shell.h b/capplet/settings/mail-capplet-shell.h index 9cc4255760..5845973065 100644 --- a/capplet/settings/mail-capplet-shell.h +++ b/capplet/settings/mail-capplet-shell.h @@ -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 + * License along with the program; if not, see * * * Authors: @@ -47,12 +47,16 @@ typedef struct _MailCappletShellClass { GtkWindowClass parent_class; void (* ctrl_w_pressed) (MailCappletShell *class); - void (* ctrl_q_pressed) (MailCappletShell *class); + void (* ctrl_q_pressed) (MailCappletShell *class); } MailCappletShellClass; -MailCappletShell * mail_capplet_shell_new (int socket_id, gboolean just_druid, gboolean main_loop); -int mail_capplet_shell_toolbar_height (MailCappletShell *shell); +GType mail_capplet_shell_get_type (void); +MailCappletShell * + mail_capplet_shell_new (gint socket_id, + gboolean just_druid, + gboolean main_loop); +gint mail_capplet_shell_toolbar_height + (MailCappletShell *shell); #endif - diff --git a/capplet/settings/mail-decoration.c b/capplet/settings/mail-decoration.c index 9b8bc37886..056283dabe 100644 --- a/capplet/settings/mail-decoration.c +++ b/capplet/settings/mail-decoration.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 + * License along with the program; if not, see * * * Authors: @@ -37,14 +37,14 @@ struct _MailDecorationPrivate gboolean default_cursor; gboolean resizing; GdkWindowEdge last_edge; - int resize_width; - int top_height; + gint resize_width; + gint top_height; gboolean check_window; gboolean can_resize; gboolean full_screen; - int window_width; - int window_height; + gint window_width; + gint window_height; }; static GObjectClass *parent_class = NULL; @@ -80,14 +80,14 @@ mail_decoration_get_type(void) return type; } -static void -md_translate_position (GdkWindow *w, double ex, double ey, int *x, int *y, GtkWidget *window) +static void +md_translate_position (GdkWindow *w, double ex, double ey, gint *x, gint *y, GtkWidget *window) { - *x = (int)ex; - *y = (int)ey; + *x = (gint)ex; + *y = (gint)ey; while (w && w != window->window) { - int cx, cy, cw, ch, cd; + gint cx, cy, cw, ch, cd; gdk_window_get_geometry (w, &cx, &cy, &cw, &ch, &cd); *x += cx; *y += cy; @@ -96,30 +96,29 @@ md_translate_position (GdkWindow *w, double ex, double ey, int *x, int *y, GtkWi } static gboolean -in_top (MailDecoration *md, double y) -{ - return y <= md->priv->resize_width; +in_top (MailDecoration *md, double y) +{ + return y <= md->priv->resize_width; } static gboolean -in_left (MailDecoration *md, double x) -{ - return x <= md->priv->resize_width; +in_left (MailDecoration *md, double x) +{ + return x <= md->priv->resize_width; } -static gboolean -in_bottom (MailDecoration *md, double y) -{ - return y >= ((GtkWidget *)md->window)->allocation.height - md->priv->resize_width; +static gboolean +in_bottom (MailDecoration *md, double y) +{ + return y >= ((GtkWidget *)md->window)->allocation.height - md->priv->resize_width; } -static gboolean -in_right (MailDecoration *md, double x) -{ - return x >= ((GtkWidget *)md->window)->allocation.width - md->priv->resize_width; +static gboolean +in_right (MailDecoration *md, double x) +{ + return x >= ((GtkWidget *)md->window)->allocation.width - md->priv->resize_width; } - static void set_cursor (MailDecoration *md, GdkWindowEdge edge) { @@ -145,7 +144,7 @@ update_cursor (MailDecoration *md, double x, double y, gboolean update) if (in_top(md, y) && in_left (md, x)) { md->priv->last_edge = GDK_WINDOW_EDGE_NORTH_WEST; - set_cursor (md, GDK_WINDOW_EDGE_NORTH_WEST); + set_cursor (md, GDK_WINDOW_EDGE_NORTH_WEST); } else if (in_top (md, y) && in_right (md, x)) { md->priv->last_edge = GDK_WINDOW_EDGE_NORTH_EAST; set_cursor (md, GDK_WINDOW_EDGE_NORTH_EAST); @@ -174,11 +173,10 @@ update_cursor (MailDecoration *md, double x, double y, gboolean update) } } - -static gboolean -md_motion_event (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) +static gboolean +md_motion_event (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) { - int x, y; + gint x, y; MailDecoration *md = (MailDecoration *)user_data; md_translate_position (event->window, event->x, event->y, &x, &y, (GtkWidget *)md->window); @@ -190,11 +188,11 @@ md_motion_event (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) return FALSE; } -static gboolean -md_enter_event (GtkWidget *widget , GdkEventCrossing *event, gpointer user_data) +static gboolean +md_enter_event (GtkWidget *widget , GdkEventCrossing *event, gpointer user_data) { MailDecoration *md = (MailDecoration *)user_data; - int x, y; + gint x, y; md_translate_position (event->window, event->x, event->y, &x, &y, (GtkWidget *)md->window); @@ -205,7 +203,7 @@ md_enter_event (GtkWidget *widget , GdkEventCrossing *event, gpointer user_data) return FALSE; } -static gboolean +static gboolean md_leave_event (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) { MailDecoration *md = (MailDecoration *)user_data; @@ -216,17 +214,17 @@ md_leave_event (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) return FALSE; } -static void +static void md_size_allocate_event (GtkWidget *widget, GtkAllocation *allocation, gpointer user_data) { - int width=1024, height=500; + gint width=1024, height=500; MailDecoration *md = (MailDecoration *)user_data; gtk_widget_queue_draw (widget); gtk_window_get_size ((GtkWindow *)widget, &width, &height); if (width != md->priv->window_width || height != md->priv->window_height) { GConfClient *client = gconf_client_get_default (); - + md->priv->window_height = height; md->priv->window_width = width; gconf_client_set_int (client, "/apps/anjal/window_width", width, NULL); @@ -236,18 +234,18 @@ md_size_allocate_event (GtkWidget *widget, GtkAllocation *allocation, gpointer u } -static gboolean +static gboolean md_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) { MailDecoration *md = (MailDecoration *)user_data; - int x_root = (int) event->x_root; - int y_root = (int) event->y_root; - int x, y; + gint x_root = (gint) event->x_root; + gint y_root = (gint) event->y_root; + gint x, y; if (!md->priv->can_resize) { return FALSE; } - + md_translate_position (event->window, event->x, event->y, &x, &y, (GtkWidget *)md->window); update_cursor (md, x, y, TRUE); if (md->priv->resizing && event->button == 1 && event->type != GDK_2BUTTON_PRESS) { @@ -257,7 +255,7 @@ md_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_d (event->button == 1 && y <= md->priv->top_height && event->type != GDK_2BUTTON_PRESS)) { gtk_window_begin_move_drag ((GtkWindow *)widget, event->button, x_root, y_root, event->time); } else if (y <= md->priv->top_height && event->type == GDK_2BUTTON_PRESS) { - if (md->priv->full_screen) + if (md->priv->full_screen) gtk_window_unfullscreen (md->window); else gtk_window_fullscreen (md->window); @@ -269,15 +267,15 @@ md_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_d return TRUE; } -static gboolean +static gboolean md_button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) { - int x, y; + gint x, y; MailDecoration *md = (MailDecoration *)user_data; md_translate_position (event->window, event->x, event->y, &x, &y, (GtkWidget *)md->window); if (md->priv->resizing) { - update_cursor (md, x, y, TRUE); + update_cursor (md, x, y, TRUE); } return FALSE; @@ -287,7 +285,7 @@ MailDecoration* mail_decoration_new(GtkWindow *window) { MailDecoration *md = g_object_new(mail_decoration_get_type(), NULL); GConfClient *client = gconf_client_get_default (); - int width, height; + gint width, height; md->priv->window_width = width = gconf_client_get_int (client, "/apps/anjal/window_width", NULL); if (!width) @@ -299,7 +297,7 @@ MailDecoration* mail_decoration_new(GtkWindow *window) md->window = window; gtk_window_set_decorated (window, FALSE); - gtk_widget_add_events ((GtkWidget *)window, GDK_BUTTON_PRESS_MASK | + gtk_widget_add_events ((GtkWidget *)window, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | @@ -312,11 +310,10 @@ MailDecoration* mail_decoration_new(GtkWindow *window) g_signal_connect (window, "button-release-event", G_CALLBACK(md_button_release_event), md); g_signal_connect (window, "size-allocate", G_CALLBACK(md_size_allocate_event), md); gtk_window_set_default_size ((GtkWindow *)window , width, height);/* We officiall should support 800x600 */ - + return md; } - static void mail_decoration_class_init(MailDecorationClass *klass) { @@ -343,7 +340,7 @@ mail_decoration_init(MailDecoration *md) priv->cursors[5]= gdk_cursor_new (GDK_BOTTOM_LEFT_CORNER); priv->cursors[6]= gdk_cursor_new (GDK_BOTTOM_SIDE); priv->cursors[7]= gdk_cursor_new (GDK_BOTTOM_RIGHT_CORNER); - + priv->default_cursor = TRUE; priv->resizing = FALSE; priv->resize_width = 4; diff --git a/capplet/settings/mail-decoration.h b/capplet/settings/mail-decoration.h index 9010e8990c..1339cae305 100644 --- a/capplet/settings/mail-decoration.h +++ b/capplet/settings/mail-decoration.h @@ -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 + * License along with the program; if not, see * * * Authors: @@ -29,7 +29,6 @@ #include - #define MAIL_DECORATION_TYPE \ (mail_decoration_get_type ()) #define MAIL_DECORATION(obj) \ @@ -53,7 +52,7 @@ typedef struct _MailDecorationClass MailDecorationClass; typedef struct _MailDecorationPrivate MailDecorationPrivate; struct _MailDecoration { - GObject parent; + GObject parent; GtkWindow *window; MailDecorationPrivate *priv; @@ -63,7 +62,7 @@ struct _MailDecorationClass { GObjectClass parent_class; }; -MailDecoration *mail_decoration_new(GtkWindow *); - +GType mail_decoration_get_type (void); +MailDecoration *mail_decoration_new (GtkWindow *); #endif diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index ef656bf8a3..388f894e72 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.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 * * * Authors: @@ -44,22 +44,23 @@ #include "mail-guess-servers.h" -static char * +static gchar * xml_to_gchar (xmlChar *xml, EmailProvider *provider) { - char *gxml = NULL; - char *tmp; - char *repl = NULL, *sec_part; + gchar *gxml = NULL; + gchar *tmp; + gchar *repl = NULL; + const gchar *sec_part; - tmp = xml ? strstr(xml, "\%EMAIL") : NULL; + tmp = xml ? strstr((gchar *) xml, "\%EMAIL") : NULL; if (!tmp) { - gxml = xml ? g_strdup(xml) : NULL ; + gxml = xml ? g_strdup((gchar *) xml) : NULL; } else { decodepart: *tmp = 0; tmp+=6; - if(*tmp == 'A') + if (*tmp == 'A') repl = provider->email; else if (*tmp == 'L') repl = provider->username; @@ -69,25 +70,25 @@ xml_to_gchar (xmlChar *xml, EmailProvider *provider) sec_part++; if (!*sec_part) sec_part = ""; - - gxml = g_strdup_printf("%s%s%s", gxml ? gxml : (char *)xml, repl, sec_part); + + gxml = g_strdup_printf("%s%s%s", gxml ? gxml : (gchar *)xml, repl, sec_part); tmp = strstr (gxml, "\%EMAIL"); - if(tmp) { + if (tmp) { goto decodepart; } } xmlFree(xml); - + return gxml; } static SoupMessage * -get_url (SoupSession *session, const char *url) +get_url (SoupSession *session, const gchar *url) { - const char *name; + const gchar *name; SoupMessage *msg; - const char *header; + const gchar *header; msg = soup_message_new (SOUP_METHOD_GET, url); soup_message_set_flags (msg, SOUP_MESSAGE_NO_REDIRECT); @@ -96,7 +97,6 @@ get_url (SoupSession *session, const char *url) name = soup_message_get_uri (msg)->path; - if (SOUP_STATUS_IS_REDIRECTION (msg->status_code)) { header = soup_message_headers_get_one (msg->response_headers, "Location"); @@ -110,13 +110,12 @@ get_url (SoupSession *session, const char *url) return NULL; } - -static void +static void handle_incoming (xmlNodePtr head, EmailProvider *provider) { xmlNodePtr node = head->children; - provider->recv_type = xml_to_gchar(xmlGetProp(head, "type"), provider); + provider->recv_type = xml_to_gchar(xmlGetProp(head, (xmlChar *) "type"), provider); while (node) { if (strcmp ((gchar *)node->name, "hostname") == 0) { @@ -126,21 +125,21 @@ handle_incoming (xmlNodePtr head, EmailProvider *provider) } else if (strcmp ((gchar *)node->name, "socketType") == 0) { provider->recv_socket_type = xml_to_gchar(xmlNodeGetContent(node), provider); } else if (strcmp ((gchar *)node->name, "username") == 0) { - provider->recv_username = xml_to_gchar(xmlNodeGetContent(node), provider); + provider->recv_username = xml_to_gchar(xmlNodeGetContent(node), provider); } else if (strcmp ((gchar *)node->name, "authentication") == 0) { - provider->recv_auth = xml_to_gchar(xmlNodeGetContent(node), provider); + provider->recv_auth = xml_to_gchar(xmlNodeGetContent(node), provider); } node = node->next; } } -static void +static void handle_outgoing (xmlNodePtr head, EmailProvider *provider) { xmlNodePtr node = head->children; - provider->send_type = xml_to_gchar(xmlGetProp(head, "type"), provider); + provider->send_type = xml_to_gchar(xmlGetProp(head, (xmlChar *) "type"), provider); while (node) { if (strcmp ((gchar *)node->name, "hostname") == 0) { @@ -150,9 +149,9 @@ handle_outgoing (xmlNodePtr head, EmailProvider *provider) } else if (strcmp ((gchar *)node->name, "socketType") == 0) { provider->send_socket_type = xml_to_gchar(xmlNodeGetContent(node), provider); } else if (strcmp ((gchar *)node->name, "username") == 0) { - provider->send_username = xml_to_gchar(xmlNodeGetContent(node), provider); + provider->send_username = xml_to_gchar(xmlNodeGetContent(node), provider); } else if (strcmp ((gchar *)node->name, "authentication") == 0) { - provider->send_auth = xml_to_gchar(xmlNodeGetContent(node), provider); + provider->send_auth = xml_to_gchar(xmlNodeGetContent(node), provider); } node = node->next; @@ -165,7 +164,7 @@ parse_msg (SoupMessage *msg, EmailProvider *provider) xmlDocPtr doc; xmlNodePtr node, top; - doc = xmlReadMemory ((xmlChar *) msg->response_body->data, msg->response_body->length, "file.xml", NULL, 0); + doc = xmlReadMemory (msg->response_body->data, msg->response_body->length, "file.xml", NULL, 0); node = doc->children; while (node) { @@ -202,7 +201,7 @@ parse_msg (SoupMessage *msg, EmailProvider *provider) } else if (strcmp ((gchar *)node->name, "outgoingServer") == 0) { /* Handle Outgoing */ handle_outgoing (node, provider); - } + } node = node->next; } @@ -213,14 +212,13 @@ parse_msg (SoupMessage *msg, EmailProvider *provider) gboolean mail_guess_servers(EmailProvider *provider) { - const char *cafile = NULL; - char *url; + const gchar *cafile = NULL; + gchar *url; SoupURI *proxy = NULL, *parsed; - int opt; SoupMessage *msg; SoupSession *session; - url = g_strdup_printf("%s/%s", "https://live.mozillamessaging.com/autoconfig", provider->domain); + url = g_strdup_printf("%s/%s", "https://live.mozillamessaging.com/autoconfig", provider->domain); parsed = soup_uri_new (url); soup_uri_free (parsed); @@ -231,7 +229,7 @@ mail_guess_servers(EmailProvider *provider) NULL); if (proxy) { - g_object_set (G_OBJECT (session), + g_object_set (G_OBJECT (session), SOUP_SESSION_PROXY_URI, proxy, NULL); } @@ -251,8 +249,8 @@ mail_guess_servers(EmailProvider *provider) } #ifdef TEST -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { EmailProvider *provider; g_thread_init (NULL); @@ -266,10 +264,10 @@ main (int argc, char **argv) mail_guess_servers (provider); - printf("Recv: %s\n%s(%s), %s by %s \n Send: %s\n%s(%s), %s by %s\n via %s to %s\n", + printf("Recv: %s\n%s(%s), %s by %s \n Send: %s\n%s(%s), %s by %s\n via %s to %s\n", provider->recv_type, provider->recv_hostname, provider->recv_port, provider->recv_username, provider->recv_auth, provider->send_type, provider->send_hostname, provider->send_port, provider->send_username, provider->send_auth, - provider->recv_socket_type, provider->send_socket_type); + provider->recv_socket_type, provider->send_socket_type); return 0; } #endif diff --git a/capplet/settings/mail-guess-servers.h b/capplet/settings/mail-guess-servers.h index b1d6746a4d..84f6090ebe 100644 --- a/capplet/settings/mail-guess-servers.h +++ b/capplet/settings/mail-guess-servers.h @@ -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 + * License along with the program; if not, see * * * Authors: @@ -25,25 +25,25 @@ typedef struct _EmailProvider { /* Input */ - char *domain; - char *email; - char *username; + gchar *domain; + gchar *email; + gchar *username; /* Receiving server*/ - char *recv_type; - char *recv_hostname; - char *recv_port; - char *recv_socket_type; - char *recv_username; - char *recv_auth; + gchar *recv_type; + gchar *recv_hostname; + gchar *recv_port; + gchar *recv_socket_type; + gchar *recv_username; + gchar *recv_auth; /* Sending server */ - char *send_type; - char *send_hostname; - char *send_port; - char *send_socket_type; - char *send_username; - char *send_auth; + gchar *send_type; + gchar *send_hostname; + gchar *send_port; + gchar *send_socket_type; + gchar *send_username; + gchar *send_auth; } EmailProvider; gboolean mail_guess_servers (EmailProvider *provider); diff --git a/capplet/settings/mail-settings-view.c b/capplet/settings/mail-settings-view.c index 154fd0b319..3a9864ae23 100644 --- a/capplet/settings/mail-settings-view.c +++ b/capplet/settings/mail-settings-view.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 + * License along with the program; if not, see * * * Authors: @@ -50,7 +50,6 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; - static void msv_regen_view (MailSettingsView *acview); static void @@ -92,7 +91,7 @@ mail_settings_view_class_init (MailSettingsViewClass *klass) NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - + } static void @@ -125,19 +124,18 @@ msv_account_added (EAccountList *al, EAccount *account, MailSettingsView *msv) #define PACK_BOX(w,s) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, s); gtk_widget_show(box); gtk_widget_show(w); gtk_box_pack_start((GtkBox *)acview->priv->box, box, FALSE, FALSE, 3); - static void build_account_button (MailSettingsView *acview, EAccount *account) { GtkWidget *box, *box1, *label, *tbox, *tlabel; - char *tmp; - + gchar *tmp; + box1 = gtk_hbox_new (FALSE, 0); gtk_widget_show (box1); label = gtk_button_new (); tbox = gtk_hbox_new (FALSE, 0); - + if (FALSE) { tlabel = (GtkWidget *)gtk_image_new_from_stock (account ? "gtk-edit" : "gtk-new", GTK_ICON_SIZE_BUTTON); gtk_widget_show(tlabel); @@ -171,7 +169,7 @@ build_account_button (MailSettingsView *acview, EAccount *account) PACK_BOX(box1,24); } -static void +static void msv_regen_view (MailSettingsView *acview) { struct _EAccount *account; @@ -195,7 +193,7 @@ msv_regen_view (MailSettingsView *acview) build_account_button (acview, NULL); } -void +static void mail_settings_view_construct (MailSettingsView *acview) { acview->priv->scroll = gtk_scrolled_window_new (NULL, NULL); @@ -221,7 +219,7 @@ mail_settings_view_new () view->uri = "settings://"; mail_settings_view_construct (view); - + return view; } @@ -242,30 +240,28 @@ msv_btn_expose (GtkWidget *w, GdkEventExpose *event, MailSettingsView *mfv) static void msv_close (GtkButton *w, MailSettingsView *mfv) { - g_signal_emit (mfv, signals[VIEW_CLOSE], 0); + g_signal_emit (mfv, signals[VIEW_CLOSE], 0); } - - GtkWidget * mail_settings_view_get_tab_widget(MailSettingsView *mcv) { GdkPixbuf *pbuf = gtk_widget_render_icon ((GtkWidget *)mcv, "gtk-close", GTK_ICON_SIZE_MENU, NULL); GtkWidget *tool, *box, *img; - int w=-1, h=-1; + gint w=-1, h=-1; GtkWidget *tab_label; img = gtk_image_new_from_pixbuf (pbuf); g_object_set_data ((GObject *)img, "pbuf", pbuf); g_signal_connect (img, "expose-event", G_CALLBACK(msv_btn_expose), mcv); - + tool = gtk_button_new (); gtk_button_set_relief((GtkButton *)tool, GTK_RELIEF_NONE); gtk_button_set_focus_on_click ((GtkButton *)tool, FALSE); gtk_widget_set_tooltip_text (tool, _("Close Tab")); g_signal_connect (tool, "clicked", G_CALLBACK(msv_close), mcv); - + box = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)box, img, FALSE, FALSE, 0); gtk_container_add ((GtkContainer *)tool, box); @@ -276,13 +272,13 @@ mail_settings_view_get_tab_widget(MailSettingsView *mcv) box = gtk_label_new (_("Settings")); tab_label = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 0); -#ifndef ANJAL_SETTINGS +#ifndef ANJAL_SETTINGS gtk_box_pack_start ((GtkBox *)tab_label, tool, FALSE, FALSE, 0); -#endif +#endif gtk_widget_show_all (tab_label); return tab_label; - + } void diff --git a/capplet/settings/mail-settings-view.h b/capplet/settings/mail-settings-view.h index 6a649d31ad..136e4414a2 100644 --- a/capplet/settings/mail-settings-view.h +++ b/capplet/settings/mail-settings-view.h @@ -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 + * License along with the program; if not, see * * * Authors: @@ -33,13 +33,12 @@ #define IS_MAIL_SETTINGS_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MAIL_SETTINGS_VIEW_TYPE)) #define MAIL_SETTINGS_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), MAIL_SETTINGS_VIEW_TYPE, MailFolderViewClass)) - typedef struct _MailSettingsViewPrivate MailSettingsViewPrivate; typedef struct _MailSettingsView { GtkVBox parent; - int type; - char *uri; + gint type; + const gchar *uri; MailViewFlags flags; /* Base class of MailChildView ends */ @@ -49,10 +48,11 @@ typedef struct _MailSettingsView { typedef struct _MailSettingsViewClass { GtkVBoxClass parent_class; - void (* view_close) (MailSettingsView *); + void (* view_close) (MailSettingsView *); void (* show_account) (MailSettingsView *, gpointer); } MailSettingsViewClass; +GType mail_settings_view_get_type (void); MailSettingsView *mail_settings_view_new (void); GtkWidget * mail_settings_view_get_tab_widget(MailSettingsView *mcv); void mail_settings_view_activate (MailSettingsView *mcv, GtkWidget *tree, GtkWidget *folder_tree, GtkWidget *check_mail, GtkWidget *sort_by, GtkWidget *slider, gboolean act); diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c index cb6afb659d..84214888a9 100644 --- a/capplet/settings/mail-view.c +++ b/capplet/settings/mail-view.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 + * License along with the program; if not, see * * * Authors: @@ -36,9 +36,6 @@ #include "mail-settings-view.h" -#if HAVE_ANERLEY -# include "mail-people-view.h" -#endif #include "anjal-mail-view.h" #include "mail-account-view.h" #include "mail/em-folder-tree.h" @@ -61,19 +58,17 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; -#undef MV_NEW_TAB - G_DEFINE_TYPE (MailView, mail_view, ANJAL_MAIL_VIEW_TYPE) #ifndef ANJAL_SETTINGS -static MailConvView * mv_switch_message_view (MailView *mv, const char *uri); +static MailConvView * mv_switch_message_view (MailView *mv, const gchar *uri); #endif #define REALIGN_NODES(list,pdata) if (list->data != pdata) { \ list = g_list_remove (list, pdata); \ list = g_list_prepend (list, pdata); \ } - -void anjal_shell_view_restore_state (EShellView *view, const char *uri); + +void anjal_shell_view_restore_state (EShellView *view, const gchar *uri); static void mail_view_init (MailView *shell) @@ -91,17 +86,17 @@ mail_view_finalize (GObject *object) { MailView *shell = (MailView *)object; MailViewPrivate *priv = shell->priv; - + g_list_free (priv->children); g_free (priv); - + G_OBJECT_CLASS (mail_view_parent_class)->finalize (object); } static void -mv_set_folder_uri (AnjalMailView *mv, const char *uri) +mv_set_folder_uri (AnjalMailView *mv, const gchar *uri) { -#ifndef ANJAL_SETTINGS +#ifndef ANJAL_SETTINGS mail_view_set_folder_uri ((MailView *)mv, uri); #endif } @@ -112,11 +107,11 @@ static void set_folder_tree (AnjalMailView *mv, EMFolderTree *tree) } static void -set_search (AnjalMailView *mv, const char *search) +set_search (AnjalMailView *mv, const gchar *search) { -#ifndef ANJAL_SETTINGS +#ifndef ANJAL_SETTINGS mail_view_set_search ((MailView *)mv, search); -#endif +#endif } static void @@ -142,125 +137,48 @@ mail_view_class_init (MailViewClass *klass) }; -#ifdef MV_NEW_TAB -static void -mv_new_page (GtkButton *w, MailView *mv) -{ - mail_view_add_page (mv, MAIL_VIEW_FOLDER, NULL); - gtk_notebook_set_current_page (mv, g_list_length (mv->priv->children)-1); -} -#endif - static void mv_switch (GtkNotebook *notebook,GtkNotebookPage *page, guint page_num, gpointer user_data) { MailView *shell = (MailView *)notebook; MailViewPrivate *priv = shell->priv; MailViewChild *curr = priv->current_view; + MailViewChild *child; + gint current_child = gtk_notebook_get_current_page (notebook); curr->flags &= ~MAIL_VIEW_HOLD_FOCUS; - -#ifdef MV_NEW_TAB - if (page_num == g_list_length(priv->children) && shell->priv->new) { - mail_view_add_page (shell, MAIL_VIEW_FOLDER, NULL); - gtk_notebook_set_current_page (shell, g_list_length (shell->priv->children)-1); - } else { -#endif - MailViewChild *child; - int current_child = gtk_notebook_get_current_page (notebook); - - child = (MailViewChild *)gtk_notebook_get_nth_page (notebook, current_child); - - priv->current_view = child; - REALIGN_NODES(shell->priv->children,child); - -#ifndef ANJAL_SETTINGS - if (child->type == MAIL_VIEW_COMPOSER) - mail_composer_view_activate ((MailComposerView *)child, shell->folder_tree, shell->check_mail, shell->sort_by, TRUE); - else if (child->type == MAIL_VIEW_MESSAGE) - mail_conv_view_activate ((MailConvView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE); - else if (child->type == MAIL_VIEW_FOLDER) { - mail_folder_view_activate ((MailFolderView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, TRUE); - anjal_shell_view_restore_state (shell->shell_view, child->uri); - } else if (child->type == MAIL_VIEW_ACCOUNT) - mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE); - else if (child->type == MAIL_VIEW_SETTINGS) - mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE); -#else - if (child->type == MAIL_VIEW_ACCOUNT) - mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE); - else if (child->type == MAIL_VIEW_SETTINGS) - mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE); -#endif -#if HAVE_ANERLEY - else if (child->type == MAIL_VIEW_PEOPLE) - mail_people_view_activate ((MailPeopleView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE); -#endif - - - -#ifdef MV_NEW_TAB - } -#endif -} + child = (MailViewChild *)gtk_notebook_get_nth_page (notebook, current_child); -#ifdef MV_NEW_TAB -static gboolean -mv_btn_expose (GtkWidget *w, GdkEventExpose *event, MailView *mv) -{ - GdkPixbuf *img = g_object_get_data (w, "pbuf"); - cairo_t *cr = gdk_cairo_create (w->window); - int wid = w->allocation.width; - int heig = w->allocation.height; - cairo_save (cr); - gdk_cairo_set_source_pixbuf (cr, img, event->area.x-4, event->area.y-5); - cairo_paint(cr); - cairo_restore(cr); - cairo_destroy (cr); + priv->current_view = child; + REALIGN_NODES(shell->priv->children,child); - return TRUE; +#ifndef ANJAL_SETTINGS + if (child->type == MAIL_VIEW_COMPOSER) + mail_composer_view_activate ((MailComposerView *)child, shell->folder_tree, shell->check_mail, shell->sort_by, TRUE); + else if (child->type == MAIL_VIEW_MESSAGE) + mail_conv_view_activate ((MailConvView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE); + else if (child->type == MAIL_VIEW_FOLDER) { + mail_folder_view_activate ((MailFolderView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, TRUE); + anjal_shell_view_restore_state (shell->shell_view, child->uri); + } else if (child->type == MAIL_VIEW_ACCOUNT) + mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE); + else if (child->type == MAIL_VIEW_SETTINGS) + mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE); +#else + if (child->type == MAIL_VIEW_ACCOUNT) + mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE); + else if (child->type == MAIL_VIEW_SETTINGS) + mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE); +#endif } static void -mv_new_tab_button (MailView *shell) -{ - int position; - GtkWidget *label = gtk_button_new (), *img; - GdkPixbuf *pbuf = e_icon_factory_get_icon ("gtk-add", E_ICON_SIZE_MENU); - GtkWidget *box = gtk_hbox_new (FALSE, 0); - int w,h; - - img = gtk_image_new_from_pixbuf (pbuf); - g_object_set_data (img, "pbuf", pbuf); - g_signal_connect (img, "expose-event", mv_btn_expose, shell); - g_signal_connect (label, "clicked", G_CALLBACK(mv_new_page), shell); - gtk_button_set_image (label, img); - gtk_icon_size_lookup_for_settings (gtk_widget_get_settings(label) , GTK_ICON_SIZE_MENU, &w, &h); - gtk_widget_set_size_request (label, w+2, h+2); - - gtk_button_set_relief(label, GTK_RELIEF_NONE); - gtk_button_set_focus_on_click (label, FALSE); - gtk_widget_set_tooltip_text (label, _("New Tab")); - gtk_widget_show_all (label); - gtk_widget_show (box); - shell->priv->new = box; - position = gtk_notebook_append_page (shell, box, label); - gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (shell), box, FALSE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (shell), box, FALSE); - -} -#endif - -void mail_view_construct (MailView *shell) { gtk_notebook_set_show_tabs ((GtkNotebook *)shell, TRUE); gtk_notebook_set_scrollable ((GtkNotebook *)shell, TRUE); gtk_notebook_popup_disable ((GtkNotebook *)shell); -#ifdef MV_NEW_TAB - mv_new_tab_button (shell); -#endif g_signal_connect_after (shell, "switch-page", G_CALLBACK(mv_switch), shell); } @@ -269,42 +187,14 @@ mail_view_new () { MailView *shell = g_object_new (MAIL_VIEW_TYPE, NULL); mail_view_construct (shell); - - return shell; -} - -static void -mv_message_shown (MailViewChild *mfv, MailView *mv) -{ - GtkWidget *arr; - - if (!mv->slider) - return; - - arr = g_object_get_data ((GObject *)mv->slider, "right-arrow"); - //gtk_widget_hide (mv->folder_tree); - gtk_widget_show (arr); - gtk_widget_show (mv->slider); -} - -static int -list_data_pos (GList *list, gpointer data) -{ - int i=-1; - while (list) { - i++; - if (list->data == data) - return i; - list = list->next; - } - return i; + return shell; } -static int +static gint mv_get_page_number (GtkNotebook *note, GtkWidget *widget) { - int i, total; + gint i, total; total = gtk_notebook_get_n_pages (note); for (i=0; ipriv->children) == 1) return; -#ifndef ANJAL_SETTINGS +#ifndef ANJAL_SETTINGS /* Make sure atleast one folder view is open. */ if (mfv->type == MAIL_VIEW_FOLDER) { GList *tmp = mv->priv->children; @@ -348,12 +238,12 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv) if (!mail_composer_view_can_quit((MailComposerView *)mfv)) return; } -#endif +#endif g_signal_handlers_block_by_func(mv, mv_switch, mv); gtk_notebook_remove_page ((GtkNotebook *)mv, n); g_signal_handlers_unblock_by_func(mv, mv_switch, mv); - + if (mfv == mv->priv->children->data) removing_viewed = TRUE; mv->priv->children = g_list_remove (mv->priv->children, mfv); @@ -366,7 +256,7 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv) pos = mv_get_page_number ((GtkNotebook *)mv, (GtkWidget *)child); gtk_notebook_set_current_page ((GtkNotebook *)mv, pos); -#ifndef ANJAL_SETTINGS +#ifndef ANJAL_SETTINGS if (child->type == MAIL_VIEW_COMPOSER) mail_composer_view_activate ((MailComposerView *)child, mv->folder_tree, mv->check_mail, mv->sort_by, TRUE); else if (child->type == MAIL_VIEW_MESSAGE) @@ -374,7 +264,6 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv) else if (child->type == MAIL_VIEW_FOLDER) { mail_folder_view_activate ((MailFolderView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, TRUE); anjal_shell_view_restore_state ((EShellView *)mv->shell_view, child->uri); - //mail_search_set_state (mv->priv->search, ((MailFolderView *)child)->search_str, ((MailFolderView *)child)->search_state); } else if (child->type == MAIL_VIEW_ACCOUNT) mail_account_view_activate ((MailAccountView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); else if (child->type == MAIL_VIEW_SETTINGS) @@ -384,22 +273,17 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv) mail_account_view_activate ((MailAccountView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); else if (child->type == MAIL_VIEW_SETTINGS) mail_settings_view_activate ((MailSettingsView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE); - -#endif -#if HAVE_ANERLEY - else if (child->type == MAIL_VIEW_PEOPLE) - mail_people_view_activate ((MailPeopleView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE); -#endif +#endif } #ifndef ANJAL_SETTINGS static void -mv_message_new (MailFolderView *mfv, gpointer data, char *umid, MailView *mv) +mv_message_new (MailFolderView *mfv, gpointer data, gchar *umid, MailView *mv) { MailConvView *conv = (MailConvView *)mv_switch_message_view(mv, umid); *(MailConvView **)data = conv; - + if (conv) conv->uri = g_strdup(umid); @@ -410,7 +294,6 @@ static void mv_search_set (MailFolderView *mfv, MailView *mv) { anjal_shell_view_restore_state (mv->shell_view, ((MailViewChild *)mfv)->uri); - //mail_search_set_state (mv->priv->search, mfv->search_str, mfv->search_state); } static void @@ -426,7 +309,7 @@ mail_view_add_folder (MailView *mv, gpointer data, gboolean block) MailFolderView *mfv = mail_folder_view_new (); gint position = 0; mail_folder_view_set_folder_pane (mfv, mv->folder_tree); - if(!block) + if (!block) mv->priv->current_view = (MailViewChild *)mfv; mv->priv->children = block ? g_list_append(mv->priv->children, mfv) : g_list_prepend (mv->priv->children, mfv); position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mfv, mfv->tab_label); @@ -464,17 +347,17 @@ mail_view_add_composer (MailView *mv, gpointer data, gboolean block) if (!block) mv->priv->current_view = (MailViewChild *)mcv; mv->priv->children = block ? g_list_append(mv->priv->children, mcv) : g_list_prepend (mv->priv->children, mcv); - - if (!special) - position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mcv->tab_label); + + if (!special) + position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mcv->tab_label); else { - int position = gtk_notebook_get_current_page ((GtkNotebook *)mv); + gint position = gtk_notebook_get_current_page ((GtkNotebook *)mv); gtk_notebook_insert_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mcv->tab_label, position+1); } gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, TRUE); gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE); - if (!block) + if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position); gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)mcv, FALSE, FALSE, 0); if (!block) @@ -483,7 +366,6 @@ mail_view_add_composer (MailView *mv, gpointer data, gboolean block) g_signal_connect (mcv, "view-close", G_CALLBACK(mv_close_mcv), mv); g_signal_connect (mcv, "message-shown", G_CALLBACK(mv_message_shown), mv); - //mv_message_shown ((MailViewChild *)mcv, mv); return (MailViewChild *)mcv; } @@ -495,10 +377,10 @@ mail_view_add_message (MailView *mv, gpointer data, gboolean block) gtk_widget_show ((GtkWidget *)mcv); mcv->type = MAIL_VIEW_MESSAGE; - if(!block) + if (!block) mv->priv->current_view = (MailViewChild *)mcv; mv->priv->children = block ? g_list_append(mv->priv->children, mcv) : g_list_prepend (mv->priv->children, mcv); - + position = gtk_notebook_get_current_page ((GtkNotebook *)mv); gtk_notebook_insert_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mail_conv_view_get_tab_widget(mcv), position+1); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, TRUE); @@ -511,7 +393,7 @@ mail_view_add_message (MailView *mv, gpointer data, gboolean block) g_signal_connect (mcv, "view-close", G_CALLBACK(mv_close_mcv), mv); g_signal_connect (mcv, "message-shown", G_CALLBACK(mv_message_shown), mv); - + return (MailViewChild *)mcv; } @@ -528,9 +410,9 @@ mail_view_add_settings (MailView *mv, gpointer data, gboolean block) { MailSettingsView *msv = mail_settings_view_new (); gint position = 0; - + gtk_widget_show ((GtkWidget *)msv); - if(!block) + if (!block) mv->priv->current_view = (MailViewChild *)msv; mv->priv->children = block ? g_list_append(mv->priv->children, msv) : g_list_prepend (mv->priv->children, msv); @@ -541,69 +423,29 @@ mail_view_add_settings (MailView *mv, gpointer data, gboolean block) gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE); if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position); - gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)msv, FALSE, FALSE, 0); - if(!block) + if (!block) mail_settings_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE); return (MailViewChild *)msv; } -#if HAVE_ANERLEY -void -mail_view_switch_to_people (MailView* mv, MailViewChild *mpv) -{ - GList *tmp = mv->priv->children; - int position = 0; - - position = mv_get_page_number(mv, mpv); - REALIGN_NODES(mv->priv->children,mpv); - gtk_notebook_set_current_page ((GtkNotebook *)mv, position); - mail_people_view_activate ((MailPeopleView *)mpv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE); -} -#endif - void mail_view_switch_to_settings (MailView* mv, MailViewChild *mpv) { - int position = 0; + gint position = 0; position = mv_get_page_number((GtkNotebook *)mv, (GtkWidget *)mpv); - REALIGN_NODES(mv->priv->children,mpv); + REALIGN_NODES(mv->priv->children,mpv); gtk_notebook_set_current_page ((GtkNotebook *)mv, position); mail_settings_view_activate ((MailSettingsView *)mpv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE); } - -#if HAVE_ANERLEY -static MailViewChild * -mail_view_add_people (MailView *mv, gpointer data, gboolean block) -{ - MailPeopleView *msv = mail_people_view_new (); - gint position = 0; - - gtk_widget_show ((GtkWidget *)msv); - if (!block) - mv->priv->current_view = (MailViewChild *)msv; - mv->priv->children = block ? g_list_append(mv->priv->children, msv) : g_list_prepend (mv->priv->children, msv); - position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)msv, mail_people_view_get_tab_widget(msv)); - g_signal_connect (msv, "view-close", G_CALLBACK(mv_close_mcv), mv); - gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE); - if (!block) - gtk_notebook_set_current_page ((GtkNotebook *)mv, position); - gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)msv, FALSE, FALSE, 0); - if(!block) - mail_people_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE); - - return (MailViewChild *)msv; -} -#endif static MailViewChild * mail_view_add_account (MailView *mv, gpointer data, gboolean block) { MailAccountView *msv = mail_account_view_new (data); gint position = 0; - + gtk_widget_show ((GtkWidget *)msv); if (!block) mv->priv->current_view = (MailViewChild *)msv; @@ -612,10 +454,9 @@ mail_view_add_account (MailView *mv, gpointer data, gboolean block) g_signal_connect_after (msv, "view-close", G_CALLBACK(mv_close_mcv), mv); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, TRUE); gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE); - if(!block) + if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position); - gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)msv, FALSE, FALSE, 0); - if(!block) + if (!block) mail_account_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); return (MailViewChild *)msv; @@ -626,14 +467,14 @@ mail_view_add_page (MailView *mv, guint16 type, gpointer data) { MailViewChild *child = NULL, *current_child; gboolean block = FALSE; - + current_child = mv->priv->current_view; if (current_child && (current_child->flags & MAIL_VIEW_HOLD_FOCUS)) block = TRUE; - + g_signal_handlers_block_by_func(mv, mv_switch, mv); - switch (type){ -#ifndef ANJAL_SETTINGS + switch (type) { +#ifndef ANJAL_SETTINGS case MAIL_VIEW_FOLDER: child = mail_view_add_folder (mv, data, block); break; @@ -644,47 +485,37 @@ mail_view_add_page (MailView *mv, guint16 type, gpointer data) case MAIL_VIEW_MESSAGE: child = mail_view_add_message (mv, data, block); break; -#endif +#endif case MAIL_VIEW_SETTINGS: child = mail_view_add_settings (mv, data, block); break; -#if HAVE_ANERLEY - case MAIL_VIEW_PEOPLE: - child = mail_view_add_people (mv, data, block); - break; -#endif case MAIL_VIEW_ACCOUNT: child = mail_view_add_account (mv, data, block); - break; + break; } gtk_widget_grab_focus((GtkWidget *)child); child->type = type; -#ifdef MV_NEW_TAB - gtk_notebook_reorder_child (mv, mv->priv->new, -1); - gtk_notebook_set_current_page (mv, g_list_length (mv->priv->children)-1); -#endif g_signal_handlers_unblock_by_func(mv, mv_switch, mv); child->flags = 0; - + return child; } #ifndef ANJAL_SETTINGS static void -mv_switch_folder_view (MailView *mv, const char *uri) +mv_switch_folder_view (MailView *mv, const gchar *uri) { - int i=0, len = g_list_length(mv->priv->children); + gint i=0, len = g_list_length(mv->priv->children); GList *tmp = mv->priv->children; while (itype == MAIL_VIEW_FOLDER && !strcmp (uri, child->uri)) { - if(child != mv->priv->current_view) { + if (child != mv->priv->current_view) { gtk_notebook_set_current_page ((GtkNotebook *)mv, i); - //REALIGN_NODES(mv->priv->children, child); - } - return; + } + return; } i++; tmp = tmp->next; @@ -695,9 +526,9 @@ mv_switch_folder_view (MailView *mv, const char *uri) } static MailConvView * -mv_switch_message_view (MailView *mv, const char *uri) +mv_switch_message_view (MailView *mv, const gchar *uri) { - int i=0; + gint i=0; GList *tmp = mv->priv->children; while (tmp) { MailViewChild *child = tmp->data; @@ -715,11 +546,10 @@ mv_switch_message_view (MailView *mv, const char *uri) } void -mail_view_set_folder_uri (MailView *mv, const char *uri) +mail_view_set_folder_uri (MailView *mv, const gchar *uri) { - + mv_switch_folder_view (mv, uri); - //mail_folder_view_set_folder_uri (mv->priv->current_view, uri); } void @@ -738,7 +568,6 @@ mail_view_show_list (MailView *mv) else if (child->type == MAIL_VIEW_FOLDER) mail_folder_view_show_list ((MailFolderView *)mv->priv->current_view); - } #endif void @@ -777,36 +606,10 @@ mail_view_set_folder_tree_widget (MailView *mv, GtkWidget *tree) mv->folder_tree = tree; } -#if 0 -static gboolean -mv_tree_click_cb (GtkWidget *w, GdkEventButton *event, MailView *mv) -{ - if ((event->button == 1 && event->type == GDK_2BUTTON_PRESS) || event->button == 2) { - GtkTreeSelection *selection; - GtkTreePath *tree_path; - - if (!gtk_tree_view_get_path_at_pos ((GtkTreeView *)w, (int) event->x, (int) event->y, &tree_path, NULL, NULL, NULL)) - return FALSE; - mail_view_add_page (mv, MAIL_VIEW_FOLDER, NULL); - gtk_notebook_set_current_page ((GtkNotebook *)mv, g_list_length (mv->priv->children)-1); - selection = gtk_tree_view_get_selection ((GtkTreeView *)w); - gtk_tree_selection_unselect_path (selection, tree_path); - gtk_tree_selection_select_path(selection, tree_path); - gtk_tree_view_set_cursor ((GtkTreeView *)w, tree_path, NULL, FALSE); - - - return TRUE; - } - return FALSE; -} -#endif - void mail_view_set_folder_tree (MailView *mv, GtkWidget *tree) { mv->tree = tree; - //em_folder_tree_set_skip_double_click ((EMFolderTree *)tree, FALSE); - //g_signal_connect ((GObject *)em_folder_tree_get_tree_view((EMFolderTree *)tree), "button-press-event", G_CALLBACK(mv_tree_click_cb), mv); } void @@ -821,46 +624,29 @@ mail_view_set_sort_by (MailView *mv, GtkWidget *button) mv->sort_by = button;; } -static void -mv_spinner_show (MailView *mv, gboolean show) -{ - GtkWidget *spinner = g_object_get_data ((GObject *)mv->check_mail, "spinner"); - GtkWidget *icon = g_object_get_data ((GObject *)mv->check_mail, "icon"); - - if(show) { - gtk_widget_show (spinner); - gtk_widget_hide(icon); - gtk_button_set_relief ((GtkButton *)mv->check_mail, GTK_RELIEF_NORMAL); - - } else { - gtk_widget_show (icon); - gtk_widget_hide(spinner); - gtk_button_set_relief ((GtkButton *)mv->check_mail, GTK_RELIEF_NONE); - } -} - +#ifndef ANJAL_SETTINGS static void mv_spinner_done (CamelFolder *f, gpointer data) { MailView *mv = (MailView *)data; mv_spinner_show (mv, FALSE); } -#ifndef ANJAL_SETTINGS + void mail_view_check_mail(MailView *mv, gboolean deep) { MailViewChild *child = (MailViewChild *)mv->priv->current_view; - + if (child && child->type == MAIL_VIEW_FOLDER) { mail_folder_view_check_mail ((MailFolderView *)child); CamelFolder *folder; - + if ((folder = em_folder_tree_get_selected_folder ((EMFolderTree *)mv->tree)) != NULL) { mv_spinner_show (mv, TRUE); mail_refresh_folder(folder, mv_spinner_done, mv); } } - + if (deep) { em_utils_clear_get_password_canceled_accounts_flag (); mail_send_receive (NULL); @@ -883,7 +669,7 @@ mail_view_save (MailView *mv) } void -mail_view_set_search (MailView *mv, const char *search) +mail_view_set_search (MailView *mv, const gchar *search) { MailViewChild *child = (MailViewChild *)mv->priv->current_view; diff --git a/capplet/settings/mail-view.h b/capplet/settings/mail-view.h index 339d690c43..b76a425bbe 100644 --- a/capplet/settings/mail-view.h +++ b/capplet/settings/mail-view.h @@ -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 + * License along with the program; if not, see * * * Authors: @@ -52,7 +52,7 @@ typedef struct _MailView { GtkWidget *folder_tree; GtkWidget *slider; GtkWidget *check_mail; - GtkWidget *sort_by; + GtkWidget *sort_by; MailViewPrivate *priv; EShellView *shell_view; } MailView; @@ -60,7 +60,7 @@ typedef struct _MailView { typedef struct _MailViewClass { AnjalMailViewClass parent_class; void (* view_new) (MailView*); - + } MailViewClass; typedef enum { @@ -69,13 +69,14 @@ typedef enum { typedef struct _MailViewChild { GtkVBox parent; - int type; - char *uri; + gint type; + gchar *uri; MailViewFlags flags; }MailViewChild; +GType mail_view_get_type (void); MailView * mail_view_new (void); -void mail_view_set_folder_uri (MailView *mv, const char *uri); +void mail_view_set_folder_uri (MailView *mv, const gchar *uri); void mail_view_show_sort_popup (MailView *mv, GtkWidget *); void mail_view_show_list (MailView *mv); void mail_view_close_view (MailView *mv); @@ -86,7 +87,7 @@ void mail_view_set_folder_tree_widget (MailView *mv, GtkWidget *tree); void mail_view_set_folder_tree (MailView *mv, GtkWidget *tree); void mail_view_save (MailView *mv); MailViewChild * mail_view_add_page (MailView *mv, guint16 type, gpointer data); -void mail_view_set_search (MailView *view, const char *search); +void mail_view_set_search (MailView *view, const gchar *search); void mail_view_set_slider (MailView *mv, GtkWidget *slider); void mail_view_init_search (MailView *mv, GtkWidget *search); void mail_view_switch_to_people (MailView* mv, MailViewChild *mpv); -- cgit From 8ca1c47874b85a1c7ee37427f3877fef37129e6a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 16 Mar 2010 19:06:34 +0000 Subject: Factor out function to parse a soup message from a string We'll need this when we want to parse a pre-cached file for the account configuration guesser. Signed-off-by: Federico Mena Quintero Conflicts: capplet/settings/mail-guess-servers.c --- capplet/settings/mail-guess-servers.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index 388f894e72..bb5f15d293 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -159,12 +159,12 @@ handle_outgoing (xmlNodePtr head, EmailProvider *provider) } static void -parse_msg (SoupMessage *msg, EmailProvider *provider) +parse_message (const char *msg, int length, EmailProvider *provider) { xmlDocPtr doc; xmlNodePtr node, top; - doc = xmlReadMemory (msg->response_body->data, msg->response_body->length, "file.xml", NULL, 0); + doc = xmlReadMemory (msg, length, "file.xml", NULL, 0); node = doc->children; while (node) { @@ -209,6 +209,12 @@ parse_msg (SoupMessage *msg, EmailProvider *provider) xmlFreeDoc(doc); } +static gboolean +parse_soup_message (SoupMessage *msg, EmailProvider *provider) +{ + parse_message (msg->response_body->data, msg->response_body->length, provider); +} + gboolean mail_guess_servers(EmailProvider *provider) { -- cgit From 2e5b6ea7a491c1f236aac3a75c3bac5493e890dd Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 16 Mar 2010 13:08:33 -0600 Subject: Return a success code when parsing a message The child functions of parse_message() do not yet return error values, but this will make it easier to do something with them in the future if they get added. Signed-off-by: Federico Mena Quintero --- capplet/settings/mail-guess-servers.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index bb5f15d293..aa5ebd7de4 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -158,7 +158,7 @@ handle_outgoing (xmlNodePtr head, EmailProvider *provider) } } -static void +static gboolean parse_message (const char *msg, int length, EmailProvider *provider) { xmlDocPtr doc; @@ -176,7 +176,7 @@ parse_message (const char *msg, int length, EmailProvider *provider) if (!node) { g_warning ("Incorrect data: ClientConfig not found ... Quitting\n"); - return; + return FALSE; } node = node->children; @@ -189,7 +189,7 @@ parse_message (const char *msg, int length, EmailProvider *provider) if (!node) { g_warning ("Incorrect data: ClientConfig not found ... Quitting\n"); - return; + return FALSE; } top = node; @@ -207,12 +207,14 @@ parse_message (const char *msg, int length, EmailProvider *provider) } xmlFreeDoc(doc); + + return TRUE; } static gboolean parse_soup_message (SoupMessage *msg, EmailProvider *provider) { - parse_message (msg->response_body->data, msg->response_body->length, provider); + return parse_message (msg->response_body->data, msg->response_body->length, provider); } gboolean -- cgit From 92145ffeb494b823c430f3101771ee05b2c31be0 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 16 Mar 2010 13:34:18 -0600 Subject: Basic logic to guess mail autoconfig when offline We will use a set of hardcoded autoconfiguration files, based on the ones from mozillamessaging.com, so that we can auto-configure mail accounts even when we can't read their information from the net. Signed-off-by: Federico Mena Quintero --- capplet/settings/mail-guess-servers.c | 54 ++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 4 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index aa5ebd7de4..f956058262 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -217,8 +217,14 @@ parse_soup_message (SoupMessage *msg, EmailProvider *provider) return parse_message (msg->response_body->data, msg->response_body->length, provider); } -gboolean -mail_guess_servers(EmailProvider *provider) +static gboolean +is_offline (void) +{ + return FALSE; /* FIXME */ +} + +static gboolean +guess_when_online (EmailProvider *provider) { const gchar *cafile = NULL; gchar *url; @@ -230,7 +236,6 @@ mail_guess_servers(EmailProvider *provider) parsed = soup_uri_new (url); soup_uri_free (parsed); - session = soup_session_sync_new_with_options ( SOUP_SESSION_SSL_CA_FILE, cafile, SOUP_SESSION_USER_AGENT, "get ", @@ -246,7 +251,7 @@ mail_guess_servers(EmailProvider *provider) if (!msg) return FALSE; - parse_msg(msg, provider); + parse_soup_message (msg, provider); g_object_unref (msg); g_object_unref(session); @@ -256,6 +261,47 @@ mail_guess_servers(EmailProvider *provider) } +static char * +get_filename_for_offline_autoconfig (const char *domain) +{ + return NULL; /* FIXME */ +} + +static gboolean +guess_when_offline (EmailProvider *provider) +{ + char *filename; + char *contents; + gssize length; + gboolean success; + + if (!provider->domain || provider->domain[0] == 0) + return FALSE; + + success = FALSE; + + filename = get_filename_for_offline_autoconfig (provider->domain); + if (!g_file_get_contents (filename, &contents, &length, NULL)) /* NULL-GError */ + goto out; + + success = parse_message (contents, (int) length, provider); + +out: + g_free (filename); + g_free (contents); + + return success; +} + +gboolean +mail_guess_servers(EmailProvider *provider) +{ + if (is_offline ()) + return guess_when_offline (provider); + else + return guess_when_online (provider); +} + #ifdef TEST gint main (gint argc, gchar **argv) -- cgit From 7718f55de9190e6f3ef53879763bce3ba1b4b747 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 16 Mar 2010 21:16:39 +0000 Subject: Add a bunch of mail autoconfiguration files These come from http://live.mozillamessaging.com/autoconfig/ Signed-off-by: Federico Mena Quintero Conflicts: capplet/settings/Makefile.am --- capplet/settings/Makefile.am | 1 + capplet/settings/mail-autoconfig/Makefile.am | 188 +++ capplet/settings/mail-autoconfig/README | 12 + capplet/settings/mail-autoconfig/a.memail.jp | 1423 ++++++++++++++++++++ capplet/settings/mail-autoconfig/abc.plala.or.jp | 24 + capplet/settings/mail-autoconfig/agate.plala.or.jp | 24 + capplet/settings/mail-autoconfig/amail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/amber.plala.or.jp | 24 + capplet/settings/mail-autoconfig/amethyst.broba.cc | 27 + capplet/settings/mail-autoconfig/aol.com | 30 + capplet/settings/mail-autoconfig/apost.plala.or.jp | 24 + capplet/settings/mail-autoconfig/aqua.plala.or.jp | 24 + capplet/settings/mail-autoconfig/arcor.de | 38 + .../settings/mail-autoconfig/ballade.plala.or.jp | 24 + .../settings/mail-autoconfig/bay.gunmanet.ne.jp | 28 + capplet/settings/mail-autoconfig/bb-niigata.jp | 24 + capplet/settings/mail-autoconfig/bc.iij4u.or.jp | 35 + capplet/settings/mail-autoconfig/beige.plala.or.jp | 24 + capplet/settings/mail-autoconfig/blue.plala.or.jp | 24 + capplet/settings/mail-autoconfig/bmail.plala.or.jp | 24 + .../settings/mail-autoconfig/bolero.plala.or.jp | 24 + capplet/settings/mail-autoconfig/bpost.plala.or.jp | 24 + capplet/settings/mail-autoconfig/brown.plala.or.jp | 24 + capplet/settings/mail-autoconfig/camel.plala.or.jp | 24 + capplet/settings/mail-autoconfig/cameo.plala.or.jp | 24 + capplet/settings/mail-autoconfig/cc9.ne.jp | 23 + capplet/settings/mail-autoconfig/cek.ne.jp | 23 + capplet/settings/mail-autoconfig/clio.ne.jp | 24 + capplet/settings/mail-autoconfig/cmail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/co1.wind.jp | 25 + capplet/settings/mail-autoconfig/co2.wind.jp | 25 + capplet/settings/mail-autoconfig/co3.wind.jp | 25 + capplet/settings/mail-autoconfig/cocoa.plala.or.jp | 24 + capplet/settings/mail-autoconfig/coda.plala.or.jp | 24 + capplet/settings/mail-autoconfig/comcast.net | 29 + .../settings/mail-autoconfig/concerto.plala.or.jp | 24 + capplet/settings/mail-autoconfig/coral.plala.or.jp | 24 + .../settings/mail-autoconfig/courante.plala.or.jp | 24 + capplet/settings/mail-autoconfig/cpost.plala.or.jp | 24 + capplet/settings/mail-autoconfig/cream.plala.or.jp | 24 + .../settings/mail-autoconfig/dan.gunmanet.ne.jp | 28 + capplet/settings/mail-autoconfig/dance.plala.or.jp | 24 + capplet/settings/mail-autoconfig/dmail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/e23.jp | 28 + capplet/settings/mail-autoconfig/earthlink.net | 29 + capplet/settings/mail-autoconfig/ebony.plala.or.jp | 24 + capplet/settings/mail-autoconfig/email.plala.or.jp | 24 + .../settings/mail-autoconfig/fantasy.plala.or.jp | 24 + .../settings/mail-autoconfig/flamenco.plala.or.jp | 24 + capplet/settings/mail-autoconfig/fmail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/free.fr | 30 + capplet/settings/mail-autoconfig/freenet.de | 39 + capplet/settings/mail-autoconfig/fuga.plala.or.jp | 24 + capplet/settings/mail-autoconfig/gmail.com | 32 + capplet/settings/mail-autoconfig/gmail.com imap | 32 + capplet/settings/mail-autoconfig/gmail.com pop | 35 + capplet/settings/mail-autoconfig/gmail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/gmx.com | 24 + capplet/settings/mail-autoconfig/gmx.net | 39 + capplet/settings/mail-autoconfig/go.tvm.ne.jp | 24 + capplet/settings/mail-autoconfig/goo.jp | 24 + capplet/settings/mail-autoconfig/googlemail.com | 32 + capplet/settings/mail-autoconfig/grape.plala.or.jp | 24 + capplet/settings/mail-autoconfig/gray.plala.or.jp | 24 + capplet/settings/mail-autoconfig/hal.ne.jp | 24 + capplet/settings/mail-autoconfig/hana.or.jp | 24 + capplet/settings/mail-autoconfig/hotmail.co.jp | 40 + capplet/settings/mail-autoconfig/hotmail.co.uk | 41 + capplet/settings/mail-autoconfig/hotmail.com | 41 + capplet/settings/mail-autoconfig/hotmail.de | 41 + capplet/settings/mail-autoconfig/hotmail.fr | 41 + capplet/settings/mail-autoconfig/hotmail.it | 41 + capplet/settings/mail-autoconfig/ic-net.or.jp | 24 + capplet/settings/mail-autoconfig/iiyama-catv.ne.jp | 23 + capplet/settings/mail-autoconfig/imail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/inbox.lt | 28 + capplet/settings/mail-autoconfig/inbox.lv | 28 + .../settings/mail-autoconfig/indigo.plala.or.jp | 24 + .../settings/mail-autoconfig/inet-shibata.or.jp | 24 + capplet/settings/mail-autoconfig/ivory.plala.or.jp | 24 + capplet/settings/mail-autoconfig/iwafune.ne.jp | 24 + capplet/settings/mail-autoconfig/jade.plala.or.jp | 24 + capplet/settings/mail-autoconfig/janis.or.jp | 44 + capplet/settings/mail-autoconfig/jet.ne.jp | 24 + capplet/settings/mail-autoconfig/jet.ne.jp imap | 24 + capplet/settings/mail-autoconfig/jet.ne.jp pop | 24 + capplet/settings/mail-autoconfig/ji.jet.ne.jp | 24 + capplet/settings/mail-autoconfig/jmail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/k1.wind.jp | 32 + capplet/settings/mail-autoconfig/khaki.plala.or.jp | 24 + capplet/settings/mail-autoconfig/kmail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/kokuyou.ne.jp | 23 + capplet/settings/mail-autoconfig/lapis.plala.or.jp | 24 + capplet/settings/mail-autoconfig/laposte.net | 29 + capplet/settings/mail-autoconfig/lemon.plala.or.jp | 24 + capplet/settings/mail-autoconfig/lilac.plala.or.jp | 24 + capplet/settings/mail-autoconfig/lime.plala.or.jp | 24 + capplet/settings/mail-autoconfig/live.co.jp | 40 + capplet/settings/mail-autoconfig/live.co.uk | 41 + capplet/settings/mail-autoconfig/live.com | 41 + capplet/settings/mail-autoconfig/live.de | 41 + capplet/settings/mail-autoconfig/live.fr | 41 + capplet/settings/mail-autoconfig/live.it | 41 + capplet/settings/mail-autoconfig/ma100.tiki.ne.jp | 54 + capplet/settings/mail-autoconfig/mac.com | 30 + capplet/settings/mail-autoconfig/mahoroba.ne.jp | 24 + capplet/settings/mail-autoconfig/mail.gunmanet.jp | 29 + .../settings/mail-autoconfig/mail.iwafune.ne.jp | 24 + .../settings/mail-autoconfig/maroon.plala.or.jp | 24 + capplet/settings/mail-autoconfig/me.com | 30 + .../settings/mail-autoconfig/minuet.plala.or.jp | 24 + capplet/settings/mail-autoconfig/ml.murakami.ne.jp | 29 + capplet/settings/mail-autoconfig/ml.shibata.ne.jp | 25 + capplet/settings/mail-autoconfig/mnet.ne.jp | 24 + capplet/settings/mail-autoconfig/mopera.net | 24 + capplet/settings/mail-autoconfig/msn.com | 41 + capplet/settings/mail-autoconfig/navy.plala.or.jp | 24 + capplet/settings/mail-autoconfig/nifty.com | 24 + capplet/settings/mail-autoconfig/nsat.jp | 24 + capplet/settings/mail-autoconfig/olive.plala.or.jp | 24 + capplet/settings/mail-autoconfig/online.de | 43 + capplet/settings/mail-autoconfig/opal.plala.or.jp | 24 + capplet/settings/mail-autoconfig/orange.fr | 30 + .../settings/mail-autoconfig/orange.plala.or.jp | 24 + .../settings/mail-autoconfig/orchid.plala.or.jp | 24 + .../settings/mail-autoconfig/pal.kijimadaira.jp | 23 + .../settings/mail-autoconfig/palette.plala.or.jp | 24 + capplet/settings/mail-autoconfig/parabox.or.jp | 24 + capplet/settings/mail-autoconfig/peach.plala.or.jp | 24 + capplet/settings/mail-autoconfig/peoplepc.com | 29 + capplet/settings/mail-autoconfig/plum.plala.or.jp | 24 + capplet/settings/mail-autoconfig/po.dcn.ne.jp | 23 + capplet/settings/mail-autoconfig/po.wind.jp | 28 + capplet/settings/mail-autoconfig/polka.plala.or.jp | 24 + capplet/settings/mail-autoconfig/pop.shibata.ne.jp | 25 + .../settings/mail-autoconfig/purple.plala.or.jp | 24 + .../settings/mail-autoconfig/rainbow.plala.or.jp | 24 + capplet/settings/mail-autoconfig/red.plala.or.jp | 24 + capplet/settings/mail-autoconfig/rmail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/rondo.plala.or.jp | 24 + capplet/settings/mail-autoconfig/rose.plala.or.jp | 24 + capplet/settings/mail-autoconfig/rouge.plala.or.jp | 24 + capplet/settings/mail-autoconfig/ruby.plala.or.jp | 24 + capplet/settings/mail-autoconfig/sakunet.ne.jp | 23 + capplet/settings/mail-autoconfig/sea.plala.or.jp | 24 + capplet/settings/mail-autoconfig/sepia.plala.or.jp | 24 + .../settings/mail-autoconfig/serenade.plala.or.jp | 24 + capplet/settings/mail-autoconfig/silk.plala.or.jp | 24 + .../settings/mail-autoconfig/silver.plala.or.jp | 24 + capplet/settings/mail-autoconfig/sky.plala.or.jp | 24 + capplet/settings/mail-autoconfig/smail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/snow.plala.or.jp | 24 + capplet/settings/mail-autoconfig/so.wind.ne.jp | 25 + .../settings/mail-autoconfig/sonata.plala.or.jp | 24 + capplet/settings/mail-autoconfig/suite.plala.or.jp | 24 + .../settings/mail-autoconfig/symphony.plala.or.jp | 24 + capplet/settings/mail-autoconfig/t-online.de | 32 + capplet/settings/mail-autoconfig/t-online.de free | 32 + .../settings/mail-autoconfig/t-online.de imap ssl | 32 + .../settings/mail-autoconfig/t-online.de pop ssl | 32 + capplet/settings/mail-autoconfig/taupe.plala.or.jp | 24 + capplet/settings/mail-autoconfig/tiki.ne.jp | 24 + capplet/settings/mail-autoconfig/tmail.plala.or.jp | 24 + .../settings/mail-autoconfig/toccata.plala.or.jp | 24 + capplet/settings/mail-autoconfig/topaz.plala.or.jp | 24 + capplet/settings/mail-autoconfig/trio.plala.or.jp | 24 + capplet/settings/mail-autoconfig/umail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/verizon.net | 29 + .../settings/mail-autoconfig/violet.plala.or.jp | 24 + capplet/settings/mail-autoconfig/vm.aikis.or.jp | 24 + capplet/settings/mail-autoconfig/vmail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/vp.tiki.ne.jp | 24 + capplet/settings/mail-autoconfig/waltz.plala.or.jp | 24 + capplet/settings/mail-autoconfig/wanadoo.fr | 30 + capplet/settings/mail-autoconfig/wanadoo.fr imap | 30 + capplet/settings/mail-autoconfig/wanadoo.fr pop | 30 + capplet/settings/mail-autoconfig/wave.plala.or.jp | 24 + capplet/settings/mail-autoconfig/web.de | 29 + capplet/settings/mail-autoconfig/white.plala.or.jp | 24 + capplet/settings/mail-autoconfig/wine.plala.or.jp | 24 + capplet/settings/mail-autoconfig/wmail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/xmail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/xp.wind.jp | 24 + capplet/settings/mail-autoconfig/xpost.plala.or.jp | 24 + capplet/settings/mail-autoconfig/xs4all.nl | 29 + capplet/settings/mail-autoconfig/yahoo.com | 36 + capplet/settings/mail-autoconfig/ybb.ne.jp | 24 + .../settings/mail-autoconfig/yellow.plala.or.jp | 24 + capplet/settings/mail-autoconfig/ymail.plala.or.jp | 24 + capplet/settings/mail-autoconfig/ypost.plala.or.jp | 24 + capplet/settings/mail-autoconfig/zmail.plala.or.jp | 24 + 191 files changed, 6661 insertions(+) create mode 100644 capplet/settings/mail-autoconfig/Makefile.am create mode 100644 capplet/settings/mail-autoconfig/README create mode 100644 capplet/settings/mail-autoconfig/a.memail.jp create mode 100644 capplet/settings/mail-autoconfig/abc.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/agate.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/amail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/amber.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/amethyst.broba.cc create mode 100644 capplet/settings/mail-autoconfig/aol.com create mode 100644 capplet/settings/mail-autoconfig/apost.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/aqua.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/arcor.de create mode 100644 capplet/settings/mail-autoconfig/ballade.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp create mode 100644 capplet/settings/mail-autoconfig/bb-niigata.jp create mode 100644 capplet/settings/mail-autoconfig/bc.iij4u.or.jp create mode 100644 capplet/settings/mail-autoconfig/beige.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/blue.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/bmail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/bolero.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/bpost.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/brown.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/camel.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/cameo.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/cc9.ne.jp create mode 100644 capplet/settings/mail-autoconfig/cek.ne.jp create mode 100644 capplet/settings/mail-autoconfig/clio.ne.jp create mode 100644 capplet/settings/mail-autoconfig/cmail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/co1.wind.jp create mode 100644 capplet/settings/mail-autoconfig/co2.wind.jp create mode 100644 capplet/settings/mail-autoconfig/co3.wind.jp create mode 100644 capplet/settings/mail-autoconfig/cocoa.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/coda.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/comcast.net create mode 100644 capplet/settings/mail-autoconfig/concerto.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/coral.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/courante.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/cpost.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/cream.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp create mode 100644 capplet/settings/mail-autoconfig/dance.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/dmail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/e23.jp create mode 100644 capplet/settings/mail-autoconfig/earthlink.net create mode 100644 capplet/settings/mail-autoconfig/ebony.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/email.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/fantasy.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/flamenco.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/fmail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/free.fr create mode 100644 capplet/settings/mail-autoconfig/freenet.de create mode 100644 capplet/settings/mail-autoconfig/fuga.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/gmail.com create mode 100644 capplet/settings/mail-autoconfig/gmail.com imap create mode 100644 capplet/settings/mail-autoconfig/gmail.com pop create mode 100644 capplet/settings/mail-autoconfig/gmail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/gmx.com create mode 100644 capplet/settings/mail-autoconfig/gmx.net create mode 100644 capplet/settings/mail-autoconfig/go.tvm.ne.jp create mode 100644 capplet/settings/mail-autoconfig/goo.jp create mode 100644 capplet/settings/mail-autoconfig/googlemail.com create mode 100644 capplet/settings/mail-autoconfig/grape.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/gray.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/hal.ne.jp create mode 100644 capplet/settings/mail-autoconfig/hana.or.jp create mode 100644 capplet/settings/mail-autoconfig/hotmail.co.jp create mode 100644 capplet/settings/mail-autoconfig/hotmail.co.uk create mode 100644 capplet/settings/mail-autoconfig/hotmail.com create mode 100644 capplet/settings/mail-autoconfig/hotmail.de create mode 100644 capplet/settings/mail-autoconfig/hotmail.fr create mode 100644 capplet/settings/mail-autoconfig/hotmail.it create mode 100644 capplet/settings/mail-autoconfig/ic-net.or.jp create mode 100644 capplet/settings/mail-autoconfig/iiyama-catv.ne.jp create mode 100644 capplet/settings/mail-autoconfig/imail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/inbox.lt create mode 100644 capplet/settings/mail-autoconfig/inbox.lv create mode 100644 capplet/settings/mail-autoconfig/indigo.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/inet-shibata.or.jp create mode 100644 capplet/settings/mail-autoconfig/ivory.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/iwafune.ne.jp create mode 100644 capplet/settings/mail-autoconfig/jade.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/janis.or.jp create mode 100644 capplet/settings/mail-autoconfig/jet.ne.jp create mode 100644 capplet/settings/mail-autoconfig/jet.ne.jp imap create mode 100644 capplet/settings/mail-autoconfig/jet.ne.jp pop create mode 100644 capplet/settings/mail-autoconfig/ji.jet.ne.jp create mode 100644 capplet/settings/mail-autoconfig/jmail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/k1.wind.jp create mode 100644 capplet/settings/mail-autoconfig/khaki.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/kmail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/kokuyou.ne.jp create mode 100644 capplet/settings/mail-autoconfig/lapis.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/laposte.net create mode 100644 capplet/settings/mail-autoconfig/lemon.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/lilac.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/lime.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/live.co.jp create mode 100644 capplet/settings/mail-autoconfig/live.co.uk create mode 100644 capplet/settings/mail-autoconfig/live.com create mode 100644 capplet/settings/mail-autoconfig/live.de create mode 100644 capplet/settings/mail-autoconfig/live.fr create mode 100644 capplet/settings/mail-autoconfig/live.it create mode 100644 capplet/settings/mail-autoconfig/ma100.tiki.ne.jp create mode 100644 capplet/settings/mail-autoconfig/mac.com create mode 100644 capplet/settings/mail-autoconfig/mahoroba.ne.jp create mode 100644 capplet/settings/mail-autoconfig/mail.gunmanet.jp create mode 100644 capplet/settings/mail-autoconfig/mail.iwafune.ne.jp create mode 100644 capplet/settings/mail-autoconfig/maroon.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/me.com create mode 100644 capplet/settings/mail-autoconfig/minuet.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/ml.murakami.ne.jp create mode 100644 capplet/settings/mail-autoconfig/ml.shibata.ne.jp create mode 100644 capplet/settings/mail-autoconfig/mnet.ne.jp create mode 100644 capplet/settings/mail-autoconfig/mopera.net create mode 100644 capplet/settings/mail-autoconfig/msn.com create mode 100644 capplet/settings/mail-autoconfig/navy.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/nifty.com create mode 100644 capplet/settings/mail-autoconfig/nsat.jp create mode 100644 capplet/settings/mail-autoconfig/olive.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/online.de create mode 100644 capplet/settings/mail-autoconfig/opal.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/orange.fr create mode 100644 capplet/settings/mail-autoconfig/orange.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/orchid.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/pal.kijimadaira.jp create mode 100644 capplet/settings/mail-autoconfig/palette.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/parabox.or.jp create mode 100644 capplet/settings/mail-autoconfig/peach.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/peoplepc.com create mode 100644 capplet/settings/mail-autoconfig/plum.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/po.dcn.ne.jp create mode 100644 capplet/settings/mail-autoconfig/po.wind.jp create mode 100644 capplet/settings/mail-autoconfig/polka.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/pop.shibata.ne.jp create mode 100644 capplet/settings/mail-autoconfig/purple.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/rainbow.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/red.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/rmail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/rondo.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/rose.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/rouge.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/ruby.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/sakunet.ne.jp create mode 100644 capplet/settings/mail-autoconfig/sea.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/sepia.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/serenade.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/silk.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/silver.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/sky.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/smail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/snow.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/so.wind.ne.jp create mode 100644 capplet/settings/mail-autoconfig/sonata.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/suite.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/symphony.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/t-online.de create mode 100644 capplet/settings/mail-autoconfig/t-online.de free create mode 100644 capplet/settings/mail-autoconfig/t-online.de imap ssl create mode 100644 capplet/settings/mail-autoconfig/t-online.de pop ssl create mode 100644 capplet/settings/mail-autoconfig/taupe.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/tiki.ne.jp create mode 100644 capplet/settings/mail-autoconfig/tmail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/toccata.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/topaz.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/trio.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/umail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/verizon.net create mode 100644 capplet/settings/mail-autoconfig/violet.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/vm.aikis.or.jp create mode 100644 capplet/settings/mail-autoconfig/vmail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/vp.tiki.ne.jp create mode 100644 capplet/settings/mail-autoconfig/waltz.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/wanadoo.fr create mode 100644 capplet/settings/mail-autoconfig/wanadoo.fr imap create mode 100644 capplet/settings/mail-autoconfig/wanadoo.fr pop create mode 100644 capplet/settings/mail-autoconfig/wave.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/web.de create mode 100644 capplet/settings/mail-autoconfig/white.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/wine.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/wmail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/xmail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/xp.wind.jp create mode 100644 capplet/settings/mail-autoconfig/xpost.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/xs4all.nl create mode 100644 capplet/settings/mail-autoconfig/yahoo.com create mode 100644 capplet/settings/mail-autoconfig/ybb.ne.jp create mode 100644 capplet/settings/mail-autoconfig/yellow.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/ymail.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/ypost.plala.or.jp create mode 100644 capplet/settings/mail-autoconfig/zmail.plala.or.jp (limited to 'capplet') diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am index dde24ee7ec..61b74c888b 100644 --- a/capplet/settings/Makefile.am +++ b/capplet/settings/Makefile.am @@ -1,3 +1,4 @@ +SUBDIRS = mail-autoconfig privsolib_LTLIBRARIES = libevolution-mail-settings.la diff --git a/capplet/settings/mail-autoconfig/Makefile.am b/capplet/settings/mail-autoconfig/Makefile.am new file mode 100644 index 0000000000..2375fcf134 --- /dev/null +++ b/capplet/settings/mail-autoconfig/Makefile.am @@ -0,0 +1,188 @@ +autoconfig_DATA = \ + abc.plala.or.jp \ + agate.plala.or.jp \ + amail.plala.or.jp \ + amber.plala.or.jp \ + a.memail.jp \ + amethyst.broba.cc \ + aol.com \ + apost.plala.or.jp \ + aqua.plala.or.jp \ + arcor.de \ + ballade.plala.or.jp \ + bay.gunmanet.ne.jp \ + bb-niigata.jp \ + bc.iij4u.or.jp \ + beige.plala.or.jp \ + blue.plala.or.jp \ + bmail.plala.or.jp \ + bolero.plala.or.jp \ + bpost.plala.or.jp \ + brown.plala.or.jp \ + camel.plala.or.jp \ + cameo.plala.or.jp \ + cc9.ne.jp \ + cek.ne.jp \ + clio.ne.jp \ + cmail.plala.or.jp \ + co1.wind.jp \ + co2.wind.jp \ + co3.wind.jp \ + cocoa.plala.or.jp \ + coda.plala.or.jp \ + comcast.net \ + concerto.plala.or.jp \ + coral.plala.or.jp \ + courante.plala.or.jp \ + cpost.plala.or.jp \ + cream.plala.or.jp \ + dance.plala.or.jp \ + dan.gunmanet.ne.jp \ + dmail.plala.or.jp \ + e23.jp \ + earthlink.net \ + ebony.plala.or.jp \ + email.plala.or.jp \ + fantasy.plala.or.jp \ + flamenco.plala.or.jp \ + fmail.plala.or.jp \ + free.fr \ + freenet.de \ + fuga.plala.or.jp \ + gmail.com \ + gmail.com \ + gmail.com \ + gmail.plala.or.jp \ + gmx.com \ + gmx.net \ + googlemail.com \ + goo.jp \ + go.tvm.ne.jp \ + grape.plala.or.jp \ + gray.plala.or.jp \ + hal.ne.jp \ + hana.or.jp \ + hotmail.co.jp \ + hotmail.com \ + hotmail.co.uk \ + hotmail.de \ + hotmail.fr \ + hotmail.it \ + ic-net.or.jp \ + iiyama-catv.ne.jp \ + imail.plala.or.jp \ + inbox.lt \ + inbox.lv \ + indigo.plala.or.jp \ + inet-shibata.or.jp \ + ivory.plala.or.jp \ + iwafune.ne.jp \ + jade.plala.or.jp \ + janis.or.jp \ + jet.ne.jp \ + ji.jet.ne.jp \ + jmail.plala.or.jp \ + k1.wind.jp \ + khaki.plala.or.jp \ + kmail.plala.or.jp \ + kokuyou.ne.jp \ + lapis.plala.or.jp \ + laposte.net \ + lemon.plala.or.jp \ + lilac.plala.or.jp \ + lime.plala.or.jp \ + live.co.jp \ + live.com \ + live.co.uk \ + live.de \ + live.fr \ + live.it \ + ma100.tiki.ne.jp \ + mac.com \ + mahoroba.ne.jp \ + mail.gunmanet.jp \ + mail.iwafune.ne.jp \ + maroon.plala.or.jp \ + me.com \ + minuet.plala.or.jp \ + ml.murakami.ne.jp \ + ml.shibata.ne.jp \ + mnet.ne.jp \ + mopera.net \ + msn.com \ + navy.plala.or.jp \ + nifty.com \ + nsat.jp \ + olive.plala.or.jp \ + online.de \ + opal.plala.or.jp \ + orange.fr \ + orange.plala.or.jp \ + orchid.plala.or.jp \ + palette.plala.or.jp \ + pal.kijimadaira.jp \ + parabox.or.jp \ + peach.plala.or.jp \ + peoplepc.com \ + plum.plala.or.jp \ + po.dcn.ne.jp \ + polka.plala.or.jp \ + pop.shibata.ne.jp \ + po.wind.jp \ + purple.plala.or.jp \ + rainbow.plala.or.jp \ + red.plala.or.jp \ + rmail.plala.or.jp \ + rondo.plala.or.jp \ + rose.plala.or.jp \ + rouge.plala.or.jp \ + ruby.plala.or.jp \ + sakunet.ne.jp \ + sea.plala.or.jp \ + sepia.plala.or.jp \ + serenade.plala.or.jp \ + silk.plala.or.jp \ + silver.plala.or.jp \ + sky.plala.or.jp \ + smail.plala.or.jp \ + snow.plala.or.jp \ + sonata.plala.or.jp \ + so.wind.ne.jp \ + suite.plala.or.jp \ + symphony.plala.or.jp \ + taupe.plala.or.jp \ + tiki.ne.jp \ + tmail.plala.or.jp \ + toccata.plala.or.jp \ + t-online.de \ + topaz.plala.or.jp \ + trio.plala.or.jp \ + umail.plala.or.jp \ + verizon.net \ + violet.plala.or.jp \ + vm.aikis.or.jp \ + vmail.plala.or.jp \ + vp.tiki.ne.jp \ + waltz.plala.or.jp \ + wanadoo.fr \ + wave.plala.or.jp \ + web.de \ + white.plala.or.jp \ + wine.plala.or.jp \ + wmail.plala.or.jp \ + xmail.plala.or.jp \ + xpost.plala.or.jp \ + xp.wind.jp \ + xs4all.nl \ + yahoo.com \ + ybb.ne.jp \ + yellow.plala.or.jp \ + ymail.plala.or.jp \ + ypost.plala.or.jp \ + zmail.plala.or.jp + +autoconfigdir = $(pkgdatadir)/evolution/mail-autoconfig + +EXTRA_DIST = \ + $(autoconfig_DATA) \ + README diff --git a/capplet/settings/mail-autoconfig/README b/capplet/settings/mail-autoconfig/README new file mode 100644 index 0000000000..f9fc70ccc6 --- /dev/null +++ b/capplet/settings/mail-autoconfig/README @@ -0,0 +1,12 @@ +The files in this directory are used by Evolution's control center +capplet to automatically configure email accounts. This so that you +can tell it, "My mail is example@gmail.com" and it will automatically +figure out that it must use imap.googlemail.com and smtp.googlemail.com. + +These files are copied from +http://live.mozillamessaging.com/autoconfig/ + +We should update these files periodically, maybe. + + Federico Mena Quintero + March 2010 diff --git a/capplet/settings/mail-autoconfig/a.memail.jp b/capplet/settings/mail-autoconfig/a.memail.jp new file mode 100644 index 0000000000..61eb90d86d --- /dev/null +++ b/capplet/settings/mail-autoconfig/a.memail.jp @@ -0,0 +1,1423 @@ + + + + 007.biglobe.ne.jp + 2001.biglobe.ne.jp + 4649.biglobe.ne.jp + 777.biglobe.ne.jp + a.biglobe.ne.jp + a.memail.jp + ab.biglobe.ne.jp + ab.memail.jp + abashiri.eeyo.jp + abukuma.eeyo.jp + ace.biglobe.ne.jp + ace.memail.jp + achoo.biglobe.ne.jp + achoo.memail.jp + adachi.eeyo.jp + aizu.eeyo.jp + akan.eeyo.jp + aki.eeyo.jp + akita.eeyo.jp + alien.biglobe.ne.jp + alien.memail.jp + aloha.biglobe.ne.jp + aloha.memail.jp + amakusa.eeyo.jp + amami.eeyo.jp + amethyst.biglobe.ne.jp + amethyst.memail.jp + amigo.biglobe.ne.jp + amigo.memail.jp + angel.biglobe.ne.jp + angel.memail.jp + angler.biglobe.ne.jp + angler.memail.jp + aomori.eeyo.jp + appi.eeyo.jp + apricot.biglobe.ne.jp + apricot.memail.jp + aqua.biglobe.ne.jp + aqua.memail.jp + aquamarine.biglobe.ne.jp + aquamarine.memail.jp + aquarius.biglobe.ne.jp + aquarius.memail.jp + arashiyama.eeyo.jp + aries.biglobe.ne.jp + aries.memail.jp + arima.eeyo.jp + asahikawa.eeyo.jp + asakusa.eeyo.jp + asama.eeyo.jp + ashizuri.eeyo.jp + aso.eeyo.jp + asuka.eeyo.jp + atami.eeyo.jp + atsumi.eeyo.jp + autumn.biglobe.ne.jp + autumn.memail.jp + awa.eeyo.jp + awaji.eeyo.jp + ayu.biglobe.ne.jp + ayu.memail.jp + azumino.eeyo.jp + b.biglobe.ne.jp + b.memail.jp + bamboo.biglobe.ne.jp + bamboo.memail.jp + banana.biglobe.ne.jp + banana.memail.jp + bandai.eeyo.jp + baseball.biglobe.ne.jp + baseball.memail.jp + basil.biglobe.ne.jp + basil.memail.jp + basketball.biglobe.ne.jp + basketball.memail.jp + bass.biglobe.ne.jp + bass.memail.jp + bat.biglobe.ne.jp + bat.memail.jp + bazar.de.gozarre.jp + bcs.biglobe.ne.jp + bear.biglobe.ne.jp + bear.memail.jp + beat.biglobe.ne.jp + beat.memail.jp + beautiful.biglobe.ne.jp + beautiful.memail.jp + beer.biglobe.ne.jp + beer.memail.jp + believe.biglobe.ne.jp + believe.memail.jp + bell.biglobe.ne.jp + bell.memail.jp + beppu.eeyo.jp + bike.biglobe.ne.jp + bike.memail.jp + bingo.eeyo.jp + bird.biglobe.ne.jp + bird.memail.jp + bitchu.eeyo.jp + biwako.eeyo.jp + bizen.eeyo.jp + black.biglobe.ne.jp + black.memail.jp + blue.biglobe.ne.jp + blue.memail.jp + blues.biglobe.ne.jp + blues.memail.jp + bluesky.biglobe.ne.jp + bluesky.memail.jp + bma.biglobe.ne.jp + boar.biglobe.ne.jp + boar.memail.jp + bohemian.biglobe.ne.jp + bohemian.memail.jp + boso.eeyo.jp + bowwow.biglobe.ne.jp + bowwow.memail.jp + bqd.biglobe.ne.jp + bravo.biglobe.ne.jp + bravo.memail.jp + breeze.biglobe.ne.jp + breeze.memail.jp + bridge.biglobe.ne.jp + bridge.memail.jp + bro.biglobe.ne.jp + bro.memail.jp + bungo.eeyo.jp + butterfly.biglobe.ne.jp + butterfly.memail.jp + buzen.eeyo.jp + c.biglobe.ne.jp + c.memail.jp + cafe.biglobe.ne.jp + cafe.memail.jp + cake.biglobe.ne.jp + cake.memail.jp + cancer.biglobe.ne.jp + cancer.memail.jp + candy.biglobe.ne.jp + candy.memail.jp + capricorn.biglobe.ne.jp + capricorn.memail.jp + cat.biglobe.ne.jp + cat.memail.jp + catch.biglobe.ne.jp + catch.memail.jp + center.biglobe.ne.jp + center.memail.jp + chameleon.biglobe.ne.jp + chameleon.memail.jp + cheers.biglobe.ne.jp + cheers.memail.jp + cheetah.biglobe.ne.jp + cheetah.memail.jp + cherry.biglobe.ne.jp + cherry.memail.jp + chiba.eeyo.jp + chichibu.eeyo.jp + chikugo.eeyo.jp + chikuho.eeyo.jp + chikushi.eeyo.jp + chikuzen.eeyo.jp + chita.eeyo.jp + chocolate.biglobe.ne.jp + chocolate.memail.jp + chokaisan.eeyo.jp + chu.biglobe.ne.jp + chu.memail.jp + chubu.eeyo.jp + chugoku.eeyo.jp + ciao.biglobe.ne.jp + ciao.memail.jp + classical.biglobe.ne.jp + classical.memail.jp + clever.biglobe.ne.jp + clever.memail.jp + club.biglobe.ne.jp + club.memail.jp + cobra.biglobe.ne.jp + cobra.memail.jp + comet.biglobe.ne.jp + comet.memail.jp + condor.biglobe.ne.jp + condor.memail.jp + cool.biglobe.ne.jp + cool.memail.jp + coral.biglobe.ne.jp + coral.memail.jp + cow.biglobe.ne.jp + cow.memail.jp + crow.biglobe.ne.jp + crow.memail.jp + cute.biglobe.ne.jp + cute.memail.jp + d.biglobe.ne.jp + d.memail.jp + dad.biglobe.ne.jp + dad.memail.jp + daisen.eeyo.jp + daisuki.biglobe.ne.jp + daisuki.memail.jp + dance.biglobe.ne.jp + dance.memail.jp + darling.biglobe.ne.jp + darling.memail.jp + dazaifu.eeyo.jp + de.gozarre.jp + dear.biglobe.ne.jp + dear.memail.jp + denbe.biglobe.ne.jp + denbe.memail.jp + dewa.eeyo.jp + diamond.biglobe.ne.jp + diamond.memail.jp + dog.biglobe.ne.jp + dog.memail.jp + dogo.eeyo.jp + dokidoki.biglobe.ne.jp + dokidoki.memail.jp + doll.biglobe.ne.jp + doll.memail.jp + dolphin.biglobe.ne.jp + dolphin.memail.jp + dotonbori.eeyo.jp + dr.biglobe.ne.jp + dr.memail.jp + dragon.biglobe.ne.jp + dragon.memail.jp + dreamer.biglobe.ne.jp + dreamer.memail.jp + drum.biglobe.ne.jp + drum.memail.jp + duck.biglobe.ne.jp + duck.memail.jp + dunk.biglobe.ne.jp + dunk.memail.jp + e.biglobe.ne.jp + e.memail.jp + eagle.biglobe.ne.jp + eagle.memail.jp + earth.biglobe.ne.jp + earth.memail.jp + east.biglobe.ne.jp + east.memail.jp + echigo.eeyo.jp + echizen.eeyo.jp + edo.eeyo.jp + ehime.eeyo.jp + eight.biglobe.ne.jp + eight.memail.jp + elephant.biglobe.ne.jp + elephant.memail.jp + eleven.biglobe.ne.jp + eleven.memail.jp + emerald.biglobe.ne.jp + emerald.memail.jp + energy.biglobe.ne.jp + energy.memail.jp + enjoy.biglobe.ne.jp + enjoy.memail.jp + erimo.eeyo.jp + etchu.eeyo.jp + f.biglobe.ne.jp + f.memail.jp + fairy.biglobe.ne.jp + fairy.memail.jp + falcon.biglobe.ne.jp + falcon.memail.jp + fan.biglobe.ne.jp + fan.memail.jp + fantasy.biglobe.ne.jp + fantasy.memail.jp + fawn.biglobe.ne.jp + fawn.memail.jp + ferret.biglobe.ne.jp + ferret.memail.jp + fever.biglobe.ne.jp + fever.memail.jp + fight.biglobe.ne.jp + fight.memail.jp + fine.biglobe.ne.jp + fine.memail.jp + fire.biglobe.ne.jp + fire.memail.jp + first.biglobe.ne.jp + first.memail.jp + fish.biglobe.ne.jp + fish.memail.jp + fist.biglobe.ne.jp + fist.memail.jp + five.biglobe.ne.jp + five.memail.jp + folk.biglobe.ne.jp + folk.memail.jp + force.biglobe.ne.jp + force.memail.jp + forest.biglobe.ne.jp + forest.memail.jp + four.biglobe.ne.jp + four.memail.jp + fox.biglobe.ne.jp + fox.memail.jp + fresh.biglobe.ne.jp + fresh.memail.jp + fruit.biglobe.ne.jp + fruit.memail.jp + fuji.eeyo.jp + fukui.eeyo.jp + fukuoka.eeyo.jp + fukushima.eeyo.jp + fukuyama.eeyo.jp + funky.biglobe.ne.jp + funky.memail.jp + furano.eeyo.jp + future.biglobe.ne.jp + future.memail.jp + g.biglobe.ne.jp + g.memail.jp + gaia.biglobe.ne.jp + gaia.memail.jp + galaxy.biglobe.ne.jp + galaxy.memail.jp + gambler.biglobe.ne.jp + gambler.memail.jp + gamer.biglobe.ne.jp + gamer.memail.jp + garnet.biglobe.ne.jp + garnet.memail.jp + gassan.eeyo.jp + gem.biglobe.ne.jp + gem.memail.jp + gemini.biglobe.ne.jp + gemini.memail.jp + genius.biglobe.ne.jp + genius.memail.jp + genki.biglobe.ne.jp + genki.memail.jp + george.biglobe.ne.jp + gifu.eeyo.jp + ginga.biglobe.ne.jp + ginga.memail.jp + giraffe.biglobe.ne.jp + giraffe.memail.jp + glasses.biglobe.ne.jp + glasses.memail.jp + globe.biglobe.ne.jp + globe.memail.jp + gold.biglobe.ne.jp + gold.memail.jp + golden.biglobe.ne.jp + golden.memail.jp + golf.biglobe.ne.jp + golf.memail.jp + good.biglobe.ne.jp + good.memail.jp + grace.biglobe.ne.jp + grace.memail.jp + grandma.biglobe.ne.jp + grandma.memail.jp + grandpa.biglobe.ne.jp + grandpa.memail.jp + grazie.biglobe.ne.jp + grazie.memail.jp + great.biglobe.ne.jp + great.memail.jp + green.biglobe.ne.jp + green.memail.jp + groove.biglobe.ne.jp + groove.memail.jp + guitar.biglobe.ne.jp + guitar.memail.jp + gunma.eeyo.jp + guts.biglobe.ne.jp + guts.memail.jp + guy.biglobe.ne.jp + guy.memail.jp + h.biglobe.ne.jp + h.memail.jp + hachijo.eeyo.jp + hachinohe.eeyo.jp + hachioji.eeyo.jp + hagi.eeyo.jp + hakata.eeyo.jp + hakkoda.eeyo.jp + hakodate.eeyo.jp + hakone.eeyo.jp + hakuba.eeyo.jp + hakusan.eeyo.jp + hamamatsu.eeyo.jp + hamster.biglobe.ne.jp + hamster.memail.jp + hanabi.biglobe.ne.jp + hanabi.memail.jp + handsome.biglobe.ne.jp + handsome.memail.jp + happo.eeyo.jp + happy.biglobe.ne.jp + happy.memail.jp + harajuku.eeyo.jp + harima.eeyo.jp + harmony.biglobe.ne.jp + harmony.memail.jp + hawk.biglobe.ne.jp + hawk.memail.jp + heart.biglobe.ne.jp + heart.memail.jp + hello.biglobe.ne.jp + hello.memail.jp + hey.biglobe.ne.jp + hey.memail.jp + hi.biglobe.ne.jp + hi.memail.jp + hida.eeyo.jp + hidaka.eeyo.jp + hiei.eeyo.jp + higo.eeyo.jp + himeji.eeyo.jp + hiphop.biglobe.ne.jp + hiphop.memail.jp + hippo.biglobe.ne.jp + hippo.memail.jp + hirosaki.eeyo.jp + hiroshima.eeyo.jp + hit.biglobe.ne.jp + hit.memail.jp + hita.eeyo.jp + hitachi.eeyo.jp + hizen.eeyo.jp + hobby.biglobe.ne.jp + hobby.memail.jp + hockey.biglobe.ne.jp + hockey.memail.jp + hodaka.eeyo.jp + hokkaido.eeyo.jp + hokuriku.eeyo.jp + honey.biglobe.ne.jp + honey.memail.jp + hoop.biglobe.ne.jp + hoop.memail.jp + horse.biglobe.ne.jp + horse.memail.jp + hot.biglobe.ne.jp + hot.memail.jp + houki.eeyo.jp + hyoryugai.biglobe.ne.jp + hyuga.eeyo.jp + i.biglobe.ne.jp + i.memail.jp + ibusuki.eeyo.jp + ice.biglobe.ne.jp + ice.memail.jp + ichigo.biglobe.ne.jp + ichigo.memail.jp + ichihara.eeyo.jp + iga.eeyo.jp + ikaho.eeyo.jp + ikaruga.eeyo.jp + ikebukuro.eeyo.jp + iki.eeyo.jp + imari.eeyo.jp + inaba.eeyo.jp + iriomote.eeyo.jp + iron.biglobe.ne.jp + iron.memail.jp + ise.eeyo.jp + ishigaki.eeyo.jp + ishikari.eeyo.jp + ishikawa.eeyo.jp + ishizuchi.eeyo.jp + ivory.biglobe.ne.jp + ivory.memail.jp + ivy.biglobe.ne.jp + ivy.memail.jp + iwaki.eeyo.jp + iwami.eeyo.jp + iwashiro.eeyo.jp + iwata.eeyo.jp + iwate.eeyo.jp + iyo.eeyo.jp + izu.eeyo.jp + izuhara.eeyo.jp + izumi.eeyo.jp + izumo.eeyo.jp + j.biglobe.ne.jp + j.memail.jp + jambo.biglobe.ne.jp + jambo.memail.jp + jazz.biglobe.ne.jp + jazz.memail.jp + jewel.biglobe.ne.jp + jewel.memail.jp + joetsu.eeyo.jp + joke.biglobe.ne.jp + joke.memail.jp + joy.biglobe.ne.jp + joy.memail.jp + jr.biglobe.ne.jp + jr.memail.jp + jumbo.biglobe.ne.jp + jumbo.memail.jp + jump.biglobe.ne.jp + jump.memail.jp + jungle.biglobe.ne.jp + jungle.memail.jp + jupiter.biglobe.ne.jp + jupiter.memail.jp + k.biglobe.ne.jp + k.memail.jp + kaga.eeyo.jp + kagawa.eeyo.jp + kagoshima.eeyo.jp + kai.eeyo.jp + kamakura.eeyo.jp + kamikochi.eeyo.jp + kanazawa.eeyo.jp + kanto.eeyo.jp + karatsu.eeyo.jp + karuizawa.eeyo.jp + kashima.eeyo.jp + kashiwa.eeyo.jp + kasukabe.eeyo.jp + katsuyama.eeyo.jp + kawachi.eeyo.jp + kawasaki.eeyo.jp + kazusa.eeyo.jp + kba.biglobe.ne.jp + kbd.biglobe.ne.jp + kbe.biglobe.ne.jp + kbf.biglobe.ne.jp + kbh.biglobe.ne.jp + kca.biglobe.ne.jp + kcd.biglobe.ne.jp + kce.biglobe.ne.jp + kcf.biglobe.ne.jp + kch.biglobe.ne.jp + kde.biglobe.ne.jp + kdn.biglobe.ne.jp + kdp.biglobe.ne.jp + kdr.biglobe.ne.jp + kdt.biglobe.ne.jp + keb.biglobe.ne.jp + ked.biglobe.ne.jp + keh.biglobe.ne.jp + kej.biglobe.ne.jp + kem.biglobe.ne.jp + kfa.biglobe.ne.jp + kfd.biglobe.ne.jp + kfx.biglobe.ne.jp + kfy.biglobe.ne.jp + kfz.biglobe.ne.jp + kha.biglobe.ne.jp + khc.biglobe.ne.jp + khe.biglobe.ne.jp + khf.biglobe.ne.jp + khh.biglobe.ne.jp + kib.biglobe.ne.jp + kichijoji.eeyo.jp + kif.biglobe.ne.jp + kih.biglobe.ne.jp + kii.eeyo.jp + king.biglobe.ne.jp + king.memail.jp + kinki.eeyo.jp + kinugawa.eeyo.jp + kir.biglobe.ne.jp + kirigamine.eeyo.jp + kirishima.eeyo.jp + kiso.eeyo.jp + kiss.biglobe.ne.jp + kiss.memail.jp + kitakata.eeyo.jp + kitakyushu.eeyo.jp + kitami.eeyo.jp + kiu.biglobe.ne.jp + kiyosato.eeyo.jp + kjb.biglobe.ne.jp + kjc.biglobe.ne.jp + kjd.biglobe.ne.jp + kje.biglobe.ne.jp + kjf.biglobe.ne.jp + kkd.biglobe.ne.jp + kke.biglobe.ne.jp + kkf.biglobe.ne.jp + kkh.biglobe.ne.jp + kki.biglobe.ne.jp + kmd.biglobe.ne.jp + kme.biglobe.ne.jp + kmf.biglobe.ne.jp + kmh.biglobe.ne.jp + kmj.biglobe.ne.jp + kna.biglobe.ne.jp + knd.biglobe.ne.jp + kne.biglobe.ne.jp + knh.biglobe.ne.jp + kni.biglobe.ne.jp + knight.biglobe.ne.jp + knight.memail.jp + koala.biglobe.ne.jp + koala.memail.jp + kobe.eeyo.jp + kochi.eeyo.jp + kofu.eeyo.jp + koga.eeyo.jp + koiwai.eeyo.jp + konpira.eeyo.jp + kotohira.eeyo.jp + kozuke.eeyo.jp + kpa.biglobe.ne.jp + kpb.biglobe.ne.jp + kpd.biglobe.ne.jp + kpe.biglobe.ne.jp + kph.biglobe.ne.jp + kra.biglobe.ne.jp + krb.biglobe.ne.jp + krc.biglobe.ne.jp + krd.biglobe.ne.jp + krf.biglobe.ne.jp + ksf.biglobe.ne.jp + ksh.biglobe.ne.jp + ksj.biglobe.ne.jp + ksn.biglobe.ne.jp + kss.biglobe.ne.jp + kta.biglobe.ne.jp + ktb.biglobe.ne.jp + ktd.biglobe.ne.jp + ktf.biglobe.ne.jp + ktj.biglobe.ne.jp + kub.biglobe.ne.jp + kuc.biglobe.ne.jp + kud.biglobe.ne.jp + kuf.biglobe.ne.jp + kuh.biglobe.ne.jp + kuju.eeyo.jp + kumagaya.eeyo.jp + kumamoto.eeyo.jp + kumano.eeyo.jp + kunisaki.eeyo.jp + kurama.eeyo.jp + kurashiki.eeyo.jp + kurobe.eeyo.jp + kurume.eeyo.jp + kusatsu.eeyo.jp + kushiro.eeyo.jp + kvd.biglobe.ne.jp + kve.biglobe.ne.jp + kvf.biglobe.ne.jp + kvj.biglobe.ne.jp + kvp.biglobe.ne.jp + kxa.biglobe.ne.jp + kxb.biglobe.ne.jp + kxd.biglobe.ne.jp + kxe.biglobe.ne.jp + kxf.biglobe.ne.jp + kyf.biglobe.ne.jp + kyi.biglobe.ne.jp + kyj.biglobe.ne.jp + kym.biglobe.ne.jp + kyoto.eeyo.jp + kyp.biglobe.ne.jp + kyushu.eeyo.jp + kza.biglobe.ne.jp + kzc.biglobe.ne.jp + kzd.biglobe.ne.jp + kzf.biglobe.ne.jp + kzh.biglobe.ne.jp + l.biglobe.ne.jp + l.memail.jp + lady.biglobe.ne.jp + lady.memail.jp + lake.biglobe.ne.jp + lake.memail.jp + latin.biglobe.ne.jp + latin.memail.jp + lavender.biglobe.ne.jp + lavender.memail.jp + lavie.biglobe.ne.jp + lavie.memail.jp + leaf.biglobe.ne.jp + leaf.memail.jp + left.biglobe.ne.jp + left.memail.jp + lefty.biglobe.ne.jp + lefty.memail.jp + lemon.biglobe.ne.jp + lemon.memail.jp + leo.biglobe.ne.jp + leo.memail.jp + libra.biglobe.ne.jp + libra.memail.jp + lily.biglobe.ne.jp + lily.memail.jp + lime.biglobe.ne.jp + lime.memail.jp + lion.biglobe.ne.jp + lion.memail.jp + lonely.biglobe.ne.jp + lonely.memail.jp + long.biglobe.ne.jp + long.memail.jp + love.biglobe.ne.jp + love.memail.jp + lovelove.biglobe.ne.jp + lovelove.memail.jp + lovely.biglobe.ne.jp + lovely.memail.jp + lucky.biglobe.ne.jp + lucky.memail.jp + luna.biglobe.ne.jp + luna.memail.jp + m.biglobe.ne.jp + m.memail.jp + macho.biglobe.ne.jp + macho.memail.jp + magic.biglobe.ne.jp + magic.memail.jp + mama.biglobe.ne.jp + mama.memail.jp + mambo.biglobe.ne.jp + mambo.memail.jp + marine.biglobe.ne.jp + marine.memail.jp + maroon.biglobe.ne.jp + maroon.memail.jp + mars.biglobe.ne.jp + mars.memail.jp + matsue.eeyo.jp + matsumoto.eeyo.jp + matsusaka.eeyo.jp + matsushima.eeyo.jp + melody.biglobe.ne.jp + melody.memail.jp + melon.biglobe.ne.jp + melon.memail.jp + memoad.jp + meow.biglobe.ne.jp + meow.memail.jp + mercury.biglobe.ne.jp + mercury.memail.jp + mermaid.biglobe.ne.jp + mermaid.memail.jp + mie.eeyo.jp + mikawa.eeyo.jp + milk.biglobe.ne.jp + milk.memail.jp + mimasaka.eeyo.jp + minakami.eeyo.jp + mino.eeyo.jp + mint.biglobe.ne.jp + mint.memail.jp + miracle.biglobe.ne.jp + miracle.memail.jp + mito.eeyo.jp + miura.eeyo.jp + miyagi.eeyo.jp + miyajima.eeyo.jp + miyako.eeyo.jp + miyazaki.eeyo.jp + mocha.biglobe.ne.jp + mocha.memail.jp + mogami.eeyo.jp + momo.biglobe.ne.jp + momo.memail.jp + monkey.biglobe.ne.jp + monkey.memail.jp + moon.biglobe.ne.jp + moon.memail.jp + moonstone.biglobe.ne.jp + moonstone.memail.jp + motor.biglobe.ne.jp + motor.memail.jp + motto.biglobe.ne.jp + motto.memail.jp + mount.biglobe.ne.jp + mount.memail.jp + mouse.biglobe.ne.jp + mouse.memail.jp + mpd.biglobe.ne.jp + mqb.biglobe.ne.jp + mqc.biglobe.ne.jp + mqd.biglobe.ne.jp + mqe.biglobe.ne.jp + mqf.biglobe.ne.jp + mqg.biglobe.ne.jp + mqh.biglobe.ne.jp + mqi.biglobe.ne.jp + mqj.biglobe.ne.jp + mra.biglobe.ne.jp + mrb.biglobe.ne.jp + mrc.biglobe.ne.jp + mrd.biglobe.ne.jp + mre.biglobe.ne.jp + mrf.biglobe.ne.jp + mrg.biglobe.ne.jp + mrh.biglobe.ne.jp + mri.biglobe.ne.jp + mrj.biglobe.ne.jp + msa.biglobe.ne.jp + msb.biglobe.ne.jp + msc.biglobe.ne.jp + msd.biglobe.ne.jp + mse.biglobe.ne.jp + msf.biglobe.ne.jp + msg.biglobe.ne.jp + msh.biglobe.ne.jp + msi.biglobe.ne.jp + msj.biglobe.ne.jp + mta.biglobe.ne.jp + mtb.biglobe.ne.jp + mtc.biglobe.ne.jp + mtd.biglobe.ne.jp + mte.biglobe.ne.jp + mtf.biglobe.ne.jp + mtg.biglobe.ne.jp + mth.biglobe.ne.jp + mti.biglobe.ne.jp + mtj.biglobe.ne.jp + mua.biglobe.ne.jp + mub.biglobe.ne.jp + muc.biglobe.ne.jp + mud.biglobe.ne.jp + mue.biglobe.ne.jp + muf.biglobe.ne.jp + mug.biglobe.ne.jp + muh.biglobe.ne.jp + mui.biglobe.ne.jp + muj.biglobe.ne.jp + muroran.eeyo.jp + muroto.eeyo.jp + musashi.eeyo.jp + muscle.biglobe.ne.jp + muscle.memail.jp + mutsu.eeyo.jp + mva.biglobe.ne.jp + mvb.biglobe.ne.jp + mvc.biglobe.ne.jp + mvd.biglobe.ne.jp + mve.biglobe.ne.jp + mvf.biglobe.ne.jp + mvg.biglobe.ne.jp + mvh.biglobe.ne.jp + mvi.biglobe.ne.jp + mvj.biglobe.ne.jp + mwa.biglobe.ne.jp + mwb.biglobe.ne.jp + mwc.biglobe.ne.jp + mwd.biglobe.ne.jp + mwe.biglobe.ne.jp + myad.jp + myoko.eeyo.jp + n.biglobe.ne.jp + n.memail.jp + nada.eeyo.jp + naeba.eeyo.jp + nagano.eeyo.jp + nagaoka.eeyo.jp + nagara.eeyo.jp + nagasaki.eeyo.jp + nagato.eeyo.jp + nagoya.eeyo.jp + naniwa.eeyo.jp + nara.eeyo.jp + narashino.eeyo.jp + naruto.eeyo.jp + nasu.eeyo.jp + neko.biglobe.ne.jp + neko.memail.jp + nemuro.eeyo.jp + neptune.biglobe.ne.jp + neptune.memail.jp + nerima.eeyo.jp + nice.biglobe.ne.jp + nice.memail.jp + nigata.eeyo.jp + nikko.eeyo.jp + nine.biglobe.ne.jp + nine.memail.jp + no1.biglobe.ne.jp + no1.memail.jp + noboribetsu.eeyo.jp + noda.eeyo.jp + noodle.biglobe.ne.jp + noodle.memail.jp + north.biglobe.ne.jp + north.memail.jp + note.biglobe.ne.jp + note.memail.jp + noto.eeyo.jp + nozawa.eeyo.jp + numazu.eeyo.jp + o.biglobe.ne.jp + o.memail.jp + obihiro.eeyo.jp + octopus.biglobe.ne.jp + octopus.memail.jp + oga.eeyo.jp + ogasawara.eeyo.jp + ohara.eeyo.jp + ohu.eeyo.jp + oita.eeyo.jp + ok.biglobe.ne.jp + ok.memail.jp + okayama.eeyo.jp + oki.eeyo.jp + okinawa.eeyo.jp + ole.biglobe.ne.jp + ole.memail.jp + omi.eeyo.jp + omiya.eeyo.jp + one.biglobe.ne.jp + one.memail.jp + onomichi.eeyo.jp + opal.biglobe.ne.jp + opal.memail.jp + opera.biglobe.ne.jp + opera.memail.jp + orange.biglobe.ne.jp + orange.memail.jp + osaka.eeyo.jp + osumi.eeyo.jp + otaru.eeyo.jp + owari.eeyo.jp + owl.biglobe.ne.jp + owl.memail.jp + oyaji.biglobe.ne.jp + oyaji.memail.jp + oze.eeyo.jp + p.biglobe.ne.jp + p.memail.jp + pan.biglobe.ne.jp + pan.memail.jp + panda.biglobe.ne.jp + panda.memail.jp + pansy.biglobe.ne.jp + pansy.memail.jp + panther.biglobe.ne.jp + panther.memail.jp + papa.biglobe.ne.jp + papa.memail.jp + parapara.biglobe.ne.jp + parapara.memail.jp + passion.biglobe.ne.jp + passion.memail.jp + peace.biglobe.ne.jp + peace.memail.jp + peach.biglobe.ne.jp + peach.memail.jp + pearl.biglobe.ne.jp + pearl.memail.jp + pegasus.biglobe.ne.jp + pegasus.memail.jp + penguin.biglobe.ne.jp + penguin.memail.jp + peridot.biglobe.ne.jp + peridot.memail.jp + piano.biglobe.ne.jp + piano.memail.jp + pig.biglobe.ne.jp + pig.memail.jp + pine.biglobe.ne.jp + pine.memail.jp + pink.biglobe.ne.jp + pink.memail.jp + pisces.biglobe.ne.jp + pisces.memail.jp + piyo.biglobe.ne.jp + piyo.memail.jp + plum.biglobe.ne.jp + plum.memail.jp + pony.biglobe.ne.jp + pony.memail.jp + pops.biglobe.ne.jp + pops.memail.jp + potato.biglobe.ne.jp + potato.memail.jp + power.biglobe.ne.jp + power.memail.jp + pretty.biglobe.ne.jp + pretty.memail.jp + pride.biglobe.ne.jp + pride.memail.jp + private.biglobe.ne.jp + private.memail.jp + punk.biglobe.ne.jp + punk.memail.jp + puppy.biglobe.ne.jp + puppy.memail.jp + pure.biglobe.ne.jp + pure.memail.jp + purin.biglobe.ne.jp + purin.memail.jp + puripuri.biglobe.ne.jp + puripuri.memail.jp + q.biglobe.ne.jp + q.memail.jp + queen.biglobe.ne.jp + queen.memail.jp + r.biglobe.ne.jp + r.memail.jp + rabbit.biglobe.ne.jp + rabbit.memail.jp + raccoondog.biglobe.ne.jp + raccoondog.memail.jp + racer.biglobe.ne.jp + racer.memail.jp + rain.biglobe.ne.jp + rain.memail.jp + rainbow.biglobe.ne.jp + rainbow.memail.jp + rap.biglobe.ne.jp + rap.memail.jp + red.biglobe.ne.jp + red.memail.jp + rhythm.biglobe.ne.jp + rhythm.memail.jp + rice.biglobe.ne.jp + rice.memail.jp + rider.biglobe.ne.jp + rider.memail.jp + right.biglobe.ne.jp + right.memail.jp + rikuchu.eeyo.jp + rikuzen.eeyo.jp + river.biglobe.ne.jp + river.memail.jp + robin.biglobe.ne.jp + robin.memail.jp + rock.biglobe.ne.jp + rock.memail.jp + rokko.eeyo.jp + rookie.biglobe.ne.jp + rookie.memail.jp + rose.biglobe.ne.jp + rose.memail.jp + ruby.biglobe.ne.jp + ruby.memail.jp + runrun.biglobe.ne.jp + runrun.memail.jp + ryukyu.eeyo.jp + s.biglobe.ne.jp + s.memail.jp + sado.eeyo.jp + safari.biglobe.ne.jp + safari.memail.jp + saga.eeyo.jp + sagami.eeyo.jp + sagittarius.biglobe.ne.jp + sagittarius.memail.jp + saitama.eeyo.jp + sakai.eeyo.jp + sakura.biglobe.ne.jp + sakura.memail.jp + salt.biglobe.ne.jp + salt.memail.jp + samba.biglobe.ne.jp + samba.memail.jp + sanin.eeyo.jp + sanriku.eeyo.jp + sanuki.eeyo.jp + sanyo.eeyo.jp + sapphire.biglobe.ne.jp + sapphire.memail.jp + sapporo.eeyo.jp + sasebo.eeyo.jp + sata.eeyo.jp + satsuma.eeyo.jp + saturn.biglobe.ne.jp + saturn.memail.jp + scorpio.biglobe.ne.jp + scorpio.memail.jp + sea.biglobe.ne.jp + sea.memail.jp + seabass.biglobe.ne.jp + seabass.memail.jp + second.biglobe.ne.jp + second.memail.jp + seeya.biglobe.ne.jp + seeya.memail.jp + sendai.eeyo.jp + sepia.biglobe.ne.jp + sepia.memail.jp + setagaya.eeyo.jp + setouchi.eeyo.jp + settu.eeyo.jp + seven.biglobe.ne.jp + seven.memail.jp + sf.biglobe.ne.jp + sf.memail.jp + shake.biglobe.ne.jp + shake.memail.jp + shakotan.eeyo.jp + sheep.biglobe.ne.jp + sheep.memail.jp + shibuya.eeyo.jp + shiga.eeyo.jp + shikoku.eeyo.jp + shikotsu.eeyo.jp + shima.eeyo.jp + shimane.eeyo.jp + shimanto.eeyo.jp + shimizu.eeyo.jp + shimokita.eeyo.jp + shimotsuke.eeyo.jp + shimousa.eeyo.jp + shinagawa.eeyo.jp + shinano.eeyo.jp + shine.biglobe.ne.jp + shine.memail.jp + shinjuku.eeyo.jp + shiobara.eeyo.jp + shirahama.eeyo.jp + shirakami.eeyo.jp + shiretoko.eeyo.jp + shizuoka.eeyo.jp + shonai.eeyo.jp + shonan.eeyo.jp + shoot.biglobe.ne.jp + shoot.memail.jp + short.biglobe.ne.jp + short.memail.jp + shout.biglobe.ne.jp + shout.memail.jp + shrimp.biglobe.ne.jp + shrimp.memail.jp + silver.biglobe.ne.jp + silver.memail.jp + simplem.biglobe.ne.jp + simplem.memail.jp + six.biglobe.ne.jp + six.memail.jp + ski.biglobe.ne.jp + ski.memail.jp + sky.biglobe.ne.jp + sky.memail.jp + smart.biglobe.ne.jp + smart.memail.jp + smash.biglobe.ne.jp + smash.memail.jp + smile.biglobe.ne.jp + smile.memail.jp + snake.biglobe.ne.jp + snake.memail.jp + snowboard.biglobe.ne.jp + snowboard.memail.jp + snowy.biglobe.ne.jp + snowy.memail.jp + soccer.biglobe.ne.jp + soccer.memail.jp + sodegaura.eeyo.jp + soul.biglobe.ne.jp + soul.memail.jp + south.biglobe.ne.jp + south.memail.jp + soya.eeyo.jp + space.biglobe.ne.jp + space.memail.jp + spice.biglobe.ne.jp + spice.memail.jp + spider.biglobe.ne.jp + spider.memail.jp + spring.biglobe.ne.jp + spring.memail.jp + star.biglobe.ne.jp + star.memail.jp + step.biglobe.ne.jp + step.memail.jp + stone.biglobe.ne.jp + stone.memail.jp + storm.biglobe.ne.jp + storm.memail.jp + strawberry.biglobe.ne.jp + strawberry.memail.jp + string.biglobe.ne.jp + string.memail.jp + sugar.biglobe.ne.jp + sugar.memail.jp + summer.biglobe.ne.jp + summer.memail.jp + sunflower.biglobe.ne.jp + sunflower.memail.jp + sunshine.biglobe.ne.jp + sunshine.memail.jp + suo.eeyo.jp + super.biglobe.ne.jp + super.memail.jp + surfing.biglobe.ne.jp + surfing.memail.jp + suruga.eeyo.jp + suzuka.eeyo.jp + swallow.biglobe.ne.jp + swallow.memail.jp + swan.biglobe.ne.jp + swan.memail.jp + sweet.biglobe.ne.jp + sweet.memail.jp + swing.biglobe.ne.jp + swing.memail.jp + symphony.biglobe.ne.jp + symphony.memail.jp + t.biglobe.ne.jp + t.memail.jp + tai.biglobe.ne.jp + tai.memail.jp + tajima.eeyo.jp + takachiho.eeyo.jp + takamatsu.eeyo.jp + takayama.eeyo.jp + tama.eeyo.jp + tanba.eeyo.jp + tango.biglobe.ne.jp + tango.eeyo.jp + tango.memail.jp + tanzawa.eeyo.jp + tateshina.eeyo.jp + tateyama.eeyo.jp + taurus.biglobe.ne.jp + taurus.memail.jp + tazawako.eeyo.jp + tea.biglobe.ne.jp + tea.memail.jp + techno.biglobe.ne.jp + techno.memail.jp + ten.biglobe.ne.jp + ten.memail.jp + tender.biglobe.ne.jp + tender.memail.jp + tennis.biglobe.ne.jp + tennis.memail.jp + terra.biglobe.ne.jp + terra.memail.jp + test.test.biglobe.ne.jp + thanks.biglobe.ne.jp + thanks.memail.jp + third.biglobe.ne.jp + third.memail.jp + three.biglobe.ne.jp + three.memail.jp + thunder.biglobe.ne.jp + thunder.memail.jp + tiger.biglobe.ne.jp + tiger.memail.jp + tiny.biglobe.ne.jp + tiny.memail.jp + tochigi.eeyo.jp + togakushi.eeyo.jp + tohoku.eeyo.jp + toi.eeyo.jp + tokachi.eeyo.jp + tokai.eeyo.jp + tokoro.biglobe.ne.jp + tokorozawa.eeyo.jp + tokushima.eeyo.jp + tokyo.eeyo.jp + tone.eeyo.jp + tono.eeyo.jp + topaz.biglobe.ne.jp + topaz.memail.jp + tornado.biglobe.ne.jp + tornado.memail.jp + tosa.eeyo.jp + tosu.eeyo.jp + totoumi.eeyo.jp + tottori.eeyo.jp + tough.biglobe.ne.jp + tough.memail.jp + tourmaline.biglobe.ne.jp + tourmaline.memail.jp + towada.eeyo.jp + toya.eeyo.jp + toyama.eeyo.jp + toyohashi.eeyo.jp + traveler.biglobe.ne.jp + traveler.memail.jp + tree.biglobe.ne.jp + tree.memail.jp + tropical.biglobe.ne.jp + tropical.memail.jp + tsuchiura.eeyo.jp + tsugaike.eeyo.jp + tsugaru.eeyo.jp + tsukuba.eeyo.jp + tsumagoi.eeyo.jp + tsushima.eeyo.jp + tsuwano.eeyo.jp + tsuyama.eeyo.jp + tulip.biglobe.ne.jp + tulip.memail.jp + turbo.biglobe.ne.jp + turbo.memail.jp + turquoise.biglobe.ne.jp + turquoise.memail.jp + twelve.biglobe.ne.jp + twelve.memail.jp + twist.biglobe.ne.jp + twist.memail.jp + two.biglobe.ne.jp + two.memail.jp + typhoon.biglobe.ne.jp + typhoon.memail.jp + u.biglobe.ne.jp + u.memail.jp + ueno.eeyo.jp + ugo.eeyo.jp + uji.eeyo.jp + ultra.biglobe.ne.jp + ultra.memail.jp + ume.biglobe.ne.jp + ume.memail.jp + umeda.eeyo.jp + unicorn.biglobe.ne.jp + unicorn.memail.jp + unzen.eeyo.jp + uonuma.eeyo.jp + urawa.eeyo.jp + uwa.eeyo.jp + uzen.eeyo.jp + v.biglobe.ne.jp + v.memail.jp + valuestar.biglobe.ne.jp + valuestar.memail.jp + venus.biglobe.ne.jp + venus.memail.jp + violet.biglobe.ne.jp + violet.memail.jp + virgo.biglobe.ne.jp + virgo.memail.jp + viva.biglobe.ne.jp + viva.memail.jp + volleyball.biglobe.ne.jp + volleyball.memail.jp + w.biglobe.ne.jp + w.memail.jp + wakasa.eeyo.jp + wakayama.eeyo.jp + wakkanai.eeyo.jp + west.biglobe.ne.jp + west.memail.jp + whale.biglobe.ne.jp + whale.memail.jp + white.biglobe.ne.jp + white.memail.jp + wild.biglobe.ne.jp + wild.memail.jp + winter.biglobe.ne.jp + winter.memail.jp + with.biglobe.ne.jp + with.memail.jp + wolf.biglobe.ne.jp + wolf.memail.jp + wonder.biglobe.ne.jp + wonder.memail.jp + wood.biglobe.ne.jp + wood.memail.jp + x.biglobe.ne.jp + x.memail.jp + xqb.biglobe.ne.jp + xqd.biglobe.ne.jp + xqe.biglobe.ne.jp + xqg.biglobe.ne.jp + xqh.biglobe.ne.jp + xqj.biglobe.ne.jp + xrh.biglobe.ne.jp + xrj.biglobe.ne.jp + xsj.biglobe.ne.jp + xug.biglobe.ne.jp + xui.biglobe.ne.jp + xvb.biglobe.ne.jp + xvf.biglobe.ne.jp + xvg.biglobe.ne.jp + xvh.biglobe.ne.jp + y.biglobe.ne.jp + y.memail.jp + yaeyama.eeyo.jp + yakushima.eeyo.jp + yamagata.eeyo.jp + yamaguchi.eeyo.jp + yamame.biglobe.ne.jp + yamame.memail.jp + yamanashi.eeyo.jp + yamashiro.eeyo.jp + yamato.eeyo.jp + yeah.biglobe.ne.jp + yeah.memail.jp + yes.biglobe.ne.jp + yes.memail.jp + yodogawa.eeyo.jp + yokohama.eeyo.jp + yoron.eeyo.jp + yoshino.eeyo.jp + yours.biglobe.ne.jp + yours.memail.jp + yufuin.eeyo.jp + yuzawa.eeyo.jp + z.biglobe.ne.jp + z.memail.jp + zao.eeyo.jp + zoo.biglobe.ne.jp + zoo.memail.jp + zzz.biglobe.ne.jp + zzz.memail.jp + BIGLOBE + BIGLOBE + + mail.biglobe.ne.jp + 110 + plain + %EMAILADDRESS% + secure + + + mail.biglobe.ne.jp + 587 + plain + %EMAILADDRESS% + secure + true + false + + + diff --git a/capplet/settings/mail-autoconfig/abc.plala.or.jp b/capplet/settings/mail-autoconfig/abc.plala.or.jp new file mode 100644 index 0000000000..549bed6cb3 --- /dev/null +++ b/capplet/settings/mail-autoconfig/abc.plala.or.jp @@ -0,0 +1,24 @@ + + + + abc.plala.or.jp + ぷらら + ぷらら + + abc.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + abc.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/agate.plala.or.jp b/capplet/settings/mail-autoconfig/agate.plala.or.jp new file mode 100644 index 0000000000..6195f58519 --- /dev/null +++ b/capplet/settings/mail-autoconfig/agate.plala.or.jp @@ -0,0 +1,24 @@ + + + + agate.plala.or.jp + ぷらら + ぷらら + + agate.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + agate.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/amail.plala.or.jp b/capplet/settings/mail-autoconfig/amail.plala.or.jp new file mode 100644 index 0000000000..b4bd8af5fc --- /dev/null +++ b/capplet/settings/mail-autoconfig/amail.plala.or.jp @@ -0,0 +1,24 @@ + + + + amail.plala.or.jp + ぷらら + ぷらら + + amail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + amail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/amber.plala.or.jp b/capplet/settings/mail-autoconfig/amber.plala.or.jp new file mode 100644 index 0000000000..ae682933ee --- /dev/null +++ b/capplet/settings/mail-autoconfig/amber.plala.or.jp @@ -0,0 +1,24 @@ + + + + amber.plala.or.jp + ぷらら + ぷらら + + amber.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + amber.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/amethyst.broba.cc b/capplet/settings/mail-autoconfig/amethyst.broba.cc new file mode 100644 index 0000000000..86276cc517 --- /dev/null +++ b/capplet/settings/mail-autoconfig/amethyst.broba.cc @@ -0,0 +1,27 @@ + + + + garnet.broba.cc + amethyst.broba.cc + coral.broba.ccv + diamond.broba.cc + ぷらら + ぷらら + + mail.broba.cc + 110 + plain + %EMAILADDRESS% + plain + + + mail.broba.cc + 587 + plain + %EMAILADDRESS% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/aol.com b/capplet/settings/mail-autoconfig/aol.com new file mode 100644 index 0000000000..7e16ab5335 --- /dev/null +++ b/capplet/settings/mail-autoconfig/aol.com @@ -0,0 +1,30 @@ + + + + + aol.com + aim.com + + AOL + AOL + + + imap.aol.com + 143 + plain + %EMAILLOCALPART% + plain + + + + smtp.aol.com + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/apost.plala.or.jp b/capplet/settings/mail-autoconfig/apost.plala.or.jp new file mode 100644 index 0000000000..c4f936a7c1 --- /dev/null +++ b/capplet/settings/mail-autoconfig/apost.plala.or.jp @@ -0,0 +1,24 @@ + + + + apost.plala.or.jp + ぷらら + ぷらら + + apost.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + apost.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/aqua.plala.or.jp b/capplet/settings/mail-autoconfig/aqua.plala.or.jp new file mode 100644 index 0000000000..0c78abc615 --- /dev/null +++ b/capplet/settings/mail-autoconfig/aqua.plala.or.jp @@ -0,0 +1,24 @@ + + + + aqua.plala.or.jp + ぷらら + ぷらら + + aqua.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + aqua.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/arcor.de b/capplet/settings/mail-autoconfig/arcor.de new file mode 100644 index 0000000000..953f669fd8 --- /dev/null +++ b/capplet/settings/mail-autoconfig/arcor.de @@ -0,0 +1,38 @@ + + + + + arcor.de + + Arcor + Arcor + + + imap.arcor.de + 993 + SSL + + plain + %EMAILLOCALPART% + + + + mail.arcor.de + 465 + SSL + + plain + %EMAILLOCALPART% + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/ballade.plala.or.jp b/capplet/settings/mail-autoconfig/ballade.plala.or.jp new file mode 100644 index 0000000000..913390f9ee --- /dev/null +++ b/capplet/settings/mail-autoconfig/ballade.plala.or.jp @@ -0,0 +1,24 @@ + + + + ballade.plala.or.jp + ぷらら + ぷらら + + ballade.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + ballade.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp b/capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp new file mode 100644 index 0000000000..930cf3ab09 --- /dev/null +++ b/capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp @@ -0,0 +1,28 @@ + + + + bay.wind.ne.jp + bay.wind.jp + bay.wind.co.jp + bay.gunmanet.or.jp + bay.gunmanet.ne.jp + 群馬インターネット + wind + + bay.wind.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + bay.wind.ne.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/bb-niigata.jp b/capplet/settings/mail-autoconfig/bb-niigata.jp new file mode 100644 index 0000000000..174f5cbc74 --- /dev/null +++ b/capplet/settings/mail-autoconfig/bb-niigata.jp @@ -0,0 +1,24 @@ + + + + bb-niigata.jp + ＢＢにいがた + BB-NIIGATA + + pop.bb-niigata.jp + 110 + plain + %EMAILLOCALPART% + plain + + + pop.bb-niigata.jp + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/bc.iij4u.or.jp b/capplet/settings/mail-autoconfig/bc.iij4u.or.jp new file mode 100644 index 0000000000..baa1d0e7a0 --- /dev/null +++ b/capplet/settings/mail-autoconfig/bc.iij4u.or.jp @@ -0,0 +1,35 @@ + + + + dd.iij4u.or.jp + ff.iij4u.or.jp + hh.iij4u.or.jp + kk.iij4u.or.jp + nn.iij4u.or.jp + pp.iij4u.or.jp + rr.iij4u.or.jp + ss.iij4u.or.jp + bc.iij4u.or.jp + bk.iij4u.or.jp + bp.iij4u.or.jp + bu.iij4u.or.jp + IIJ4U + IIJ4U + + mbox.iij4u.or.jp + 110 + STARTTLS + %EMAILLOCALPART%.%EMAILDOMAIN% + secure + + + mbox.iij4u.or.jp + 587 + STARTTLS + %EMAILLOCALPART%.%EMAILDOMAIN% + secure + true + false + + + diff --git a/capplet/settings/mail-autoconfig/beige.plala.or.jp b/capplet/settings/mail-autoconfig/beige.plala.or.jp new file mode 100644 index 0000000000..1da18eb675 --- /dev/null +++ b/capplet/settings/mail-autoconfig/beige.plala.or.jp @@ -0,0 +1,24 @@ + + + + beige.plala.or.jp + ぷらら + ぷらら + + beige.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + beige.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/blue.plala.or.jp b/capplet/settings/mail-autoconfig/blue.plala.or.jp new file mode 100644 index 0000000000..510042ee9e --- /dev/null +++ b/capplet/settings/mail-autoconfig/blue.plala.or.jp @@ -0,0 +1,24 @@ + + + + blue.plala.or.jp + ぷらら + ぷらら + + blue.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + blue.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/bmail.plala.or.jp b/capplet/settings/mail-autoconfig/bmail.plala.or.jp new file mode 100644 index 0000000000..f849e6e4b6 --- /dev/null +++ b/capplet/settings/mail-autoconfig/bmail.plala.or.jp @@ -0,0 +1,24 @@ + + + + bmail.plala.or.jp + ぷらら + ぷらら + + bmail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + bmail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/bolero.plala.or.jp b/capplet/settings/mail-autoconfig/bolero.plala.or.jp new file mode 100644 index 0000000000..171776a28b --- /dev/null +++ b/capplet/settings/mail-autoconfig/bolero.plala.or.jp @@ -0,0 +1,24 @@ + + + + bolero.plala.or.jp + ぷらら + ぷらら + + bolero.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + bolero.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/bpost.plala.or.jp b/capplet/settings/mail-autoconfig/bpost.plala.or.jp new file mode 100644 index 0000000000..24c8ebd843 --- /dev/null +++ b/capplet/settings/mail-autoconfig/bpost.plala.or.jp @@ -0,0 +1,24 @@ + + + + bpost.plala.or.jp + ぷらら + ぷらら + + bpost.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + bpost.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/brown.plala.or.jp b/capplet/settings/mail-autoconfig/brown.plala.or.jp new file mode 100644 index 0000000000..3bd4be2168 --- /dev/null +++ b/capplet/settings/mail-autoconfig/brown.plala.or.jp @@ -0,0 +1,24 @@ + + + + brown.plala.or.jp + ぷらら + ぷらら + + brown.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + brown.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/camel.plala.or.jp b/capplet/settings/mail-autoconfig/camel.plala.or.jp new file mode 100644 index 0000000000..c55faa8270 --- /dev/null +++ b/capplet/settings/mail-autoconfig/camel.plala.or.jp @@ -0,0 +1,24 @@ + + + + camel.plala.or.jp + ぷらら + ぷらら + + camel.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + camel.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/cameo.plala.or.jp b/capplet/settings/mail-autoconfig/cameo.plala.or.jp new file mode 100644 index 0000000000..7376c1fffe --- /dev/null +++ b/capplet/settings/mail-autoconfig/cameo.plala.or.jp @@ -0,0 +1,24 @@ + + + + cameo.plala.or.jp + ぷらら + ぷらら + + cameo.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + cameo.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/cc9.ne.jp b/capplet/settings/mail-autoconfig/cc9.ne.jp new file mode 100644 index 0000000000..28bad2cd01 --- /dev/null +++ b/capplet/settings/mail-autoconfig/cc9.ne.jp @@ -0,0 +1,23 @@ + + + + cc9.ne.jp + CC9インターネットサービス + CC9 + + pop.cc9.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + smtp.cc9.ne.jp + 25 + plain + none + true + false + + + diff --git a/capplet/settings/mail-autoconfig/cek.ne.jp b/capplet/settings/mail-autoconfig/cek.ne.jp new file mode 100644 index 0000000000..0af49bd435 --- /dev/null +++ b/capplet/settings/mail-autoconfig/cek.ne.jp @@ -0,0 +1,23 @@ + + + + cek.ne.jp + エコーシティー・駒ケ岳 + CEK-Net + + mail.cek.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + smtp.cek.ne.jp + 25 + plain + none + true + false + + + diff --git a/capplet/settings/mail-autoconfig/clio.ne.jp b/capplet/settings/mail-autoconfig/clio.ne.jp new file mode 100644 index 0000000000..90f1a41ba3 --- /dev/null +++ b/capplet/settings/mail-autoconfig/clio.ne.jp @@ -0,0 +1,24 @@ + + + + clio.ne.jp + CLIO-Net移管サービス + CLIO-Net + + mail.clio.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + mail.clio.ne.jp + 587 + plain + %EMAILLOCALPART% + secure + true + false + + + diff --git a/capplet/settings/mail-autoconfig/cmail.plala.or.jp b/capplet/settings/mail-autoconfig/cmail.plala.or.jp new file mode 100644 index 0000000000..eb2558272b --- /dev/null +++ b/capplet/settings/mail-autoconfig/cmail.plala.or.jp @@ -0,0 +1,24 @@ + + + + cmail.plala.or.jp + ぷらら + ぷらら + + cmail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + cmail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/co1.wind.jp b/capplet/settings/mail-autoconfig/co1.wind.jp new file mode 100644 index 0000000000..e086cd7785 --- /dev/null +++ b/capplet/settings/mail-autoconfig/co1.wind.jp @@ -0,0 +1,25 @@ + + + + co1.wind.ne.jp + co1.wind.jp + 群馬インターネット + wind + + co1.wind.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + co1.wind.ne.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/co2.wind.jp b/capplet/settings/mail-autoconfig/co2.wind.jp new file mode 100644 index 0000000000..010477274d --- /dev/null +++ b/capplet/settings/mail-autoconfig/co2.wind.jp @@ -0,0 +1,25 @@ + + + + co2.wind.ne.jp + co2.wind.jp + 群馬インターネット + wind + + co2.wind.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + co2.wind.ne.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/co3.wind.jp b/capplet/settings/mail-autoconfig/co3.wind.jp new file mode 100644 index 0000000000..498384cb09 --- /dev/null +++ b/capplet/settings/mail-autoconfig/co3.wind.jp @@ -0,0 +1,25 @@ + + + + co3.wind.ne.jp + co3.wind.jp + 群馬インターネット + wind + + co3.wind.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + co3.wind.ne.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/cocoa.plala.or.jp b/capplet/settings/mail-autoconfig/cocoa.plala.or.jp new file mode 100644 index 0000000000..5387cd368d --- /dev/null +++ b/capplet/settings/mail-autoconfig/cocoa.plala.or.jp @@ -0,0 +1,24 @@ + + + + cocoa.plala.or.jp + ぷらら + ぷらら + + cocoa.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + cocoa.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/coda.plala.or.jp b/capplet/settings/mail-autoconfig/coda.plala.or.jp new file mode 100644 index 0000000000..f668775d84 --- /dev/null +++ b/capplet/settings/mail-autoconfig/coda.plala.or.jp @@ -0,0 +1,24 @@ + + + + coda.plala.or.jp + ぷらら + ぷらら + + coda.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + coda.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/comcast.net b/capplet/settings/mail-autoconfig/comcast.net new file mode 100644 index 0000000000..56b1fa92bf --- /dev/null +++ b/capplet/settings/mail-autoconfig/comcast.net @@ -0,0 +1,29 @@ + + + + + comcast.net + + Comcast + Comcast + + + mail.comcast.net + 110 + STARTTLS + %EMAILLOCALPART% + secure + + + + smtp.comcast.net + 587 + STARTTLS + %EMAILLOCALPART% + secure + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/concerto.plala.or.jp b/capplet/settings/mail-autoconfig/concerto.plala.or.jp new file mode 100644 index 0000000000..1c190b5d70 --- /dev/null +++ b/capplet/settings/mail-autoconfig/concerto.plala.or.jp @@ -0,0 +1,24 @@ + + + + concerto.plala.or.jp + ぷらら + ぷらら + + concerto.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + concerto.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/coral.plala.or.jp b/capplet/settings/mail-autoconfig/coral.plala.or.jp new file mode 100644 index 0000000000..1c52fcee37 --- /dev/null +++ b/capplet/settings/mail-autoconfig/coral.plala.or.jp @@ -0,0 +1,24 @@ + + + + coral.plala.or.jp + ぷらら + ぷらら + + coral.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + coral.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/courante.plala.or.jp b/capplet/settings/mail-autoconfig/courante.plala.or.jp new file mode 100644 index 0000000000..05976ef0b3 --- /dev/null +++ b/capplet/settings/mail-autoconfig/courante.plala.or.jp @@ -0,0 +1,24 @@ + + + + courante.plala.or.jp + ぷらら + ぷらら + + courante.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + courante.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/cpost.plala.or.jp b/capplet/settings/mail-autoconfig/cpost.plala.or.jp new file mode 100644 index 0000000000..613d3774b9 --- /dev/null +++ b/capplet/settings/mail-autoconfig/cpost.plala.or.jp @@ -0,0 +1,24 @@ + + + + cpost.plala.or.jp + ぷらら + ぷらら + + cpost.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + cpost.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/cream.plala.or.jp b/capplet/settings/mail-autoconfig/cream.plala.or.jp new file mode 100644 index 0000000000..16e232591b --- /dev/null +++ b/capplet/settings/mail-autoconfig/cream.plala.or.jp @@ -0,0 +1,24 @@ + + + + cream.plala.or.jp + ぷらら + ぷらら + + cream.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + cream.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp b/capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp new file mode 100644 index 0000000000..b027d98d04 --- /dev/null +++ b/capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp @@ -0,0 +1,28 @@ + + + + dan.wind.ne.jp + dan.wind.jp + dan.wind.co.jp + dan.gunmanet.or.jp + dan.gunmanet.ne.jp + 群馬インターネット + wind + + dan.wind.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + dan.wind.ne.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/dance.plala.or.jp b/capplet/settings/mail-autoconfig/dance.plala.or.jp new file mode 100644 index 0000000000..74f90c8fbc --- /dev/null +++ b/capplet/settings/mail-autoconfig/dance.plala.or.jp @@ -0,0 +1,24 @@ + + + + dance.plala.or.jp + ぷらら + ぷらら + + dance.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + dance.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/dmail.plala.or.jp b/capplet/settings/mail-autoconfig/dmail.plala.or.jp new file mode 100644 index 0000000000..f742605b4f --- /dev/null +++ b/capplet/settings/mail-autoconfig/dmail.plala.or.jp @@ -0,0 +1,24 @@ + + + + dmail.plala.or.jp + ぷらら + ぷらら + + dmail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + dmail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/e23.jp b/capplet/settings/mail-autoconfig/e23.jp new file mode 100644 index 0000000000..f1f08b908a --- /dev/null +++ b/capplet/settings/mail-autoconfig/e23.jp @@ -0,0 +1,28 @@ + + + + iijmio-mail.jp + miomio.jp + miobox.jp + e23.jp + x-il.jp + IIJmio セーフティメール + IIJmio + + mbox.iijmio-mail.jp + 110 + STARTTLS + %EMAILLOCALPART%.%EMAILDOMAIN% + secure + + + mbox.iijmio-mail.jp + 587 + STARTTLS + %EMAILLOCALPART%.%EMAILDOMAIN% + secure + true + false + + + diff --git a/capplet/settings/mail-autoconfig/earthlink.net b/capplet/settings/mail-autoconfig/earthlink.net new file mode 100644 index 0000000000..0f204b2bbd --- /dev/null +++ b/capplet/settings/mail-autoconfig/earthlink.net @@ -0,0 +1,29 @@ + + + + + earthlink.net + + EarthLink + EarthLink + + + imap.earthlink.net + 143 + plain + %EMAILADDRESS% + secure + + + + smtpauth.earthlink.net + 587 + plain + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/ebony.plala.or.jp b/capplet/settings/mail-autoconfig/ebony.plala.or.jp new file mode 100644 index 0000000000..11a275e990 --- /dev/null +++ b/capplet/settings/mail-autoconfig/ebony.plala.or.jp @@ -0,0 +1,24 @@ + + + + ebony.plala.or.jp + ぷらら + ぷらら + + ebony.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + ebony.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/email.plala.or.jp b/capplet/settings/mail-autoconfig/email.plala.or.jp new file mode 100644 index 0000000000..45a8e0d500 --- /dev/null +++ b/capplet/settings/mail-autoconfig/email.plala.or.jp @@ -0,0 +1,24 @@ + + + + email.plala.or.jp + ぷらら + ぷらら + + email.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + email.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/fantasy.plala.or.jp b/capplet/settings/mail-autoconfig/fantasy.plala.or.jp new file mode 100644 index 0000000000..5774cc239a --- /dev/null +++ b/capplet/settings/mail-autoconfig/fantasy.plala.or.jp @@ -0,0 +1,24 @@ + + + + fantasy.plala.or.jp + ぷらら + ぷらら + + fantasy.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + fantasy.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/flamenco.plala.or.jp b/capplet/settings/mail-autoconfig/flamenco.plala.or.jp new file mode 100644 index 0000000000..3a8ade7488 --- /dev/null +++ b/capplet/settings/mail-autoconfig/flamenco.plala.or.jp @@ -0,0 +1,24 @@ + + + + flamenco.plala.or.jp + ぷらら + ぷらら + + flamenco.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + flamenco.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/fmail.plala.or.jp b/capplet/settings/mail-autoconfig/fmail.plala.or.jp new file mode 100644 index 0000000000..c4a4dbc14b --- /dev/null +++ b/capplet/settings/mail-autoconfig/fmail.plala.or.jp @@ -0,0 +1,24 @@ + + + + fmail.plala.or.jp + ぷらら + ぷらら + + fmail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + fmail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/free.fr b/capplet/settings/mail-autoconfig/free.fr new file mode 100644 index 0000000000..f97fe38504 --- /dev/null +++ b/capplet/settings/mail-autoconfig/free.fr @@ -0,0 +1,30 @@ + + + + + free.fr + + Free Telecom + free.fr + + + imap.free.fr + 143 + plain + %EMAILLOCALPART% + plain + + + + smtp.free.fr + 25 + plain + %EMAILLOCALPART% + plain + true + + true + + + + diff --git a/capplet/settings/mail-autoconfig/freenet.de b/capplet/settings/mail-autoconfig/freenet.de new file mode 100644 index 0000000000..1144a80c6d --- /dev/null +++ b/capplet/settings/mail-autoconfig/freenet.de @@ -0,0 +1,39 @@ + + + + + freenet.de + + Freenet Mail + Freenet + + + mx.freenet.de + + 993 + SSL + secure + %EMAILADDRESS% + + + + mx.freenet.de + + 465 + SSL + secure + %EMAILADDRESS% + true + false + + + + + + diff --git a/capplet/settings/mail-autoconfig/fuga.plala.or.jp b/capplet/settings/mail-autoconfig/fuga.plala.or.jp new file mode 100644 index 0000000000..f41116addd --- /dev/null +++ b/capplet/settings/mail-autoconfig/fuga.plala.or.jp @@ -0,0 +1,24 @@ + + + + fuga.plala.or.jp + ぷらら + ぷらら + + fuga.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + fuga.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/gmail.com b/capplet/settings/mail-autoconfig/gmail.com new file mode 100644 index 0000000000..f73f7e0c7f --- /dev/null +++ b/capplet/settings/mail-autoconfig/gmail.com @@ -0,0 +1,32 @@ + + + + + gmail.com + googlemail.com + + Google Mail + GMail + + + imap.googlemail.com + 993 + SSL + %EMAILADDRESS% + plain + + + + smtp.googlemail.com + 465 + SSL + %EMAILADDRESS% + plain + true + false + + + You need to enable IMAP access + + + diff --git a/capplet/settings/mail-autoconfig/gmail.com imap b/capplet/settings/mail-autoconfig/gmail.com imap new file mode 100644 index 0000000000..f73f7e0c7f --- /dev/null +++ b/capplet/settings/mail-autoconfig/gmail.com imap @@ -0,0 +1,32 @@ + + + + + gmail.com + googlemail.com + + Google Mail + GMail + + + imap.googlemail.com + 993 + SSL + %EMAILADDRESS% + plain + + + + smtp.googlemail.com + 465 + SSL + %EMAILADDRESS% + plain + true + false + + + You need to enable IMAP access + + + diff --git a/capplet/settings/mail-autoconfig/gmail.com pop b/capplet/settings/mail-autoconfig/gmail.com pop new file mode 100644 index 0000000000..4b1a577561 --- /dev/null +++ b/capplet/settings/mail-autoconfig/gmail.com pop @@ -0,0 +1,35 @@ + + + + + gmail.com + googlemail.com + + Google Mail + GMail + + + pop.googlemail.com + 995 + SSL + %EMAILLOCALPART% + plain + + true + + + + + smtp.googlemail.com + 465 + SSL + %EMAILLOCALPART% + plain + true + false + + + You need to enable POP access + + + diff --git a/capplet/settings/mail-autoconfig/gmail.plala.or.jp b/capplet/settings/mail-autoconfig/gmail.plala.or.jp new file mode 100644 index 0000000000..d369859a43 --- /dev/null +++ b/capplet/settings/mail-autoconfig/gmail.plala.or.jp @@ -0,0 +1,24 @@ + + + + gmail.plala.or.jp + ぷらら + ぷらら + + gmail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + gmail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/gmx.com b/capplet/settings/mail-autoconfig/gmx.com new file mode 100644 index 0000000000..06782b48cc --- /dev/null +++ b/capplet/settings/mail-autoconfig/gmx.com @@ -0,0 +1,24 @@ + + + + gmx.com + GMX Freemail + GMX + + imap.gmx.com + 993 + SSL + %EMAILADDRESS% + plain + + + mail.gmx.com + 465 + SSL + %EMAILADDRESS% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/gmx.net b/capplet/settings/mail-autoconfig/gmx.net new file mode 100644 index 0000000000..3a93fb9839 --- /dev/null +++ b/capplet/settings/mail-autoconfig/gmx.net @@ -0,0 +1,39 @@ + + + + + gmx.de + gmx.net + gmx.ch + gmx.at + gmx.li + gmx.fr + gmx.it + gmx.co.uk + + + GMX Freemail + GMX + + + pop.gmx.net + 995 + SSL + %EMAILADDRESS% + plain + + + + mail.gmx.net + 465 + SSL + %EMAILADDRESS% + plain + true + false + + + + + + diff --git a/capplet/settings/mail-autoconfig/go.tvm.ne.jp b/capplet/settings/mail-autoconfig/go.tvm.ne.jp new file mode 100644 index 0000000000..ccbb238eae --- /dev/null +++ b/capplet/settings/mail-autoconfig/go.tvm.ne.jp @@ -0,0 +1,24 @@ + + + + go.tvm.ne.jp + テレビ松本ケーブルインターネットサービス + TVM-Net + + go.tvm.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + go.tvm.ne.jp + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/goo.jp b/capplet/settings/mail-autoconfig/goo.jp new file mode 100644 index 0000000000..6ddc1eadd4 --- /dev/null +++ b/capplet/settings/mail-autoconfig/goo.jp @@ -0,0 +1,24 @@ + + + + goo.jp + goo メールアドバンス + goo + + pop.mail.goo.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + smtp.mail.goo.ne.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/googlemail.com b/capplet/settings/mail-autoconfig/googlemail.com new file mode 100644 index 0000000000..f73f7e0c7f --- /dev/null +++ b/capplet/settings/mail-autoconfig/googlemail.com @@ -0,0 +1,32 @@ + + + + + gmail.com + googlemail.com + + Google Mail + GMail + + + imap.googlemail.com + 993 + SSL + %EMAILADDRESS% + plain + + + + smtp.googlemail.com + 465 + SSL + %EMAILADDRESS% + plain + true + false + + + You need to enable IMAP access + + + diff --git a/capplet/settings/mail-autoconfig/grape.plala.or.jp b/capplet/settings/mail-autoconfig/grape.plala.or.jp new file mode 100644 index 0000000000..09fb378504 --- /dev/null +++ b/capplet/settings/mail-autoconfig/grape.plala.or.jp @@ -0,0 +1,24 @@ + + + + grape.plala.or.jp + ぷらら + ぷらら + + grape.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + grape.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/gray.plala.or.jp b/capplet/settings/mail-autoconfig/gray.plala.or.jp new file mode 100644 index 0000000000..efeb3547f0 --- /dev/null +++ b/capplet/settings/mail-autoconfig/gray.plala.or.jp @@ -0,0 +1,24 @@ + + + + gray.plala.or.jp + ぷらら + ぷらら + + gray.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + gray.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/hal.ne.jp b/capplet/settings/mail-autoconfig/hal.ne.jp new file mode 100644 index 0000000000..ad8e336c03 --- /dev/null +++ b/capplet/settings/mail-autoconfig/hal.ne.jp @@ -0,0 +1,24 @@ + + + + hal.ne.jp + ハルインターネット + HAL + + mail.hal.ne.jp + 110 + plain + %EMAILADDRESS% + plain + + + mail.hal.ne.jp + 587 + plain + %EMAILLOCALPART% + secure + true + false + + + diff --git a/capplet/settings/mail-autoconfig/hana.or.jp b/capplet/settings/mail-autoconfig/hana.or.jp new file mode 100644 index 0000000000..b2dc624348 --- /dev/null +++ b/capplet/settings/mail-autoconfig/hana.or.jp @@ -0,0 +1,24 @@ + + + + hana.or.jp + きたうら花ねっと + 花ねっと + + mail.hana.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + mail.hana.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/hotmail.co.jp b/capplet/settings/mail-autoconfig/hotmail.co.jp new file mode 100644 index 0000000000..35beb3fe57 --- /dev/null +++ b/capplet/settings/mail-autoconfig/hotmail.co.jp @@ -0,0 +1,40 @@ + + + + + hotmail.com + hotmail.co.uk + hotmail.co.jp + hotmail.de + hotmail.fr + hotmail.it + live.com + live.co.uk + live.co.jp + live.de + live.fr + live.it + + Microsoft Live Hotmail + Hotmail + + + pop3.live.com + 995 + SSL + %EMAILADDRESS% + plain + + + + smtp.live.com + 587 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/hotmail.co.uk b/capplet/settings/mail-autoconfig/hotmail.co.uk new file mode 100644 index 0000000000..b0007493df --- /dev/null +++ b/capplet/settings/mail-autoconfig/hotmail.co.uk @@ -0,0 +1,41 @@ + + + + + hotmail.com + hotmail.co.uk + hotmail.co.jp + hotmail.de + hotmail.fr + hotmail.it + live.com + live.co.uk + live.co.jp + live.de + live.fr + live.it + msn.com + + Microsoft Live Hotmail + Hotmail + + + pop3.live.com + 995 + SSL + %EMAILADDRESS% + plain + + + + smtp.live.com + 587 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/hotmail.com b/capplet/settings/mail-autoconfig/hotmail.com new file mode 100644 index 0000000000..b0007493df --- /dev/null +++ b/capplet/settings/mail-autoconfig/hotmail.com @@ -0,0 +1,41 @@ + + + + + hotmail.com + hotmail.co.uk + hotmail.co.jp + hotmail.de + hotmail.fr + hotmail.it + live.com + live.co.uk + live.co.jp + live.de + live.fr + live.it + msn.com + + Microsoft Live Hotmail + Hotmail + + + pop3.live.com + 995 + SSL + %EMAILADDRESS% + plain + + + + smtp.live.com + 587 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/hotmail.de b/capplet/settings/mail-autoconfig/hotmail.de new file mode 100644 index 0000000000..b0007493df --- /dev/null +++ b/capplet/settings/mail-autoconfig/hotmail.de @@ -0,0 +1,41 @@ + + + + + hotmail.com + hotmail.co.uk + hotmail.co.jp + hotmail.de + hotmail.fr + hotmail.it + live.com + live.co.uk + live.co.jp + live.de + live.fr + live.it + msn.com + + Microsoft Live Hotmail + Hotmail + + + pop3.live.com + 995 + SSL + %EMAILADDRESS% + plain + + + + smtp.live.com + 587 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/hotmail.fr b/capplet/settings/mail-autoconfig/hotmail.fr new file mode 100644 index 0000000000..b0007493df --- /dev/null +++ b/capplet/settings/mail-autoconfig/hotmail.fr @@ -0,0 +1,41 @@ + + + + + hotmail.com + hotmail.co.uk + hotmail.co.jp + hotmail.de + hotmail.fr + hotmail.it + live.com + live.co.uk + live.co.jp + live.de + live.fr + live.it + msn.com + + Microsoft Live Hotmail + Hotmail + + + pop3.live.com + 995 + SSL + %EMAILADDRESS% + plain + + + + smtp.live.com + 587 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/hotmail.it b/capplet/settings/mail-autoconfig/hotmail.it new file mode 100644 index 0000000000..b0007493df --- /dev/null +++ b/capplet/settings/mail-autoconfig/hotmail.it @@ -0,0 +1,41 @@ + + + + + hotmail.com + hotmail.co.uk + hotmail.co.jp + hotmail.de + hotmail.fr + hotmail.it + live.com + live.co.uk + live.co.jp + live.de + live.fr + live.it + msn.com + + Microsoft Live Hotmail + Hotmail + + + pop3.live.com + 995 + SSL + %EMAILADDRESS% + plain + + + + smtp.live.com + 587 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/ic-net.or.jp b/capplet/settings/mail-autoconfig/ic-net.or.jp new file mode 100644 index 0000000000..8a89a3ec01 --- /dev/null +++ b/capplet/settings/mail-autoconfig/ic-net.or.jp @@ -0,0 +1,24 @@ + + + + ic-net.or.jp + IC-NET + IC-NET + + mail.ic-net.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + smtp.ic-net.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/iiyama-catv.ne.jp b/capplet/settings/mail-autoconfig/iiyama-catv.ne.jp new file mode 100644 index 0000000000..85f1a2725d --- /dev/null +++ b/capplet/settings/mail-autoconfig/iiyama-catv.ne.jp @@ -0,0 +1,23 @@ + + + + iiyama-catv.ne.jp + ケーブルテレビiネット飯山 + iネット飯山 + + mail.iiyama-catv.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + smtp.iiyama-catv.ne.jp + 25 + plain + none + true + false + + + diff --git a/capplet/settings/mail-autoconfig/imail.plala.or.jp b/capplet/settings/mail-autoconfig/imail.plala.or.jp new file mode 100644 index 0000000000..d4c8897d22 --- /dev/null +++ b/capplet/settings/mail-autoconfig/imail.plala.or.jp @@ -0,0 +1,24 @@ + + + + imail.plala.or.jp + ぷらら + ぷらら + + imail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + imail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/inbox.lt b/capplet/settings/mail-autoconfig/inbox.lt new file mode 100644 index 0000000000..c5f07659d0 --- /dev/null +++ b/capplet/settings/mail-autoconfig/inbox.lt @@ -0,0 +1,28 @@ + + + + inbox.lt + Inbox.lt + Inbox.lt + + mail.inbox.lt + 995 + SSL + %EMAILLOCALPART% + plain + + true + 999 + + + + mail.inbox.lt + 587 + STARTTLS + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/inbox.lv b/capplet/settings/mail-autoconfig/inbox.lv new file mode 100644 index 0000000000..ac3b317315 --- /dev/null +++ b/capplet/settings/mail-autoconfig/inbox.lv @@ -0,0 +1,28 @@ + + + + inbox.lv + Inbox.lv + Inbox.lv + + mail.inbox.lv + 995 + SSL + %EMAILLOCALPART% + plain + + true + 999 + + + + mail.inbox.lv + 587 + STARTTLS + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/indigo.plala.or.jp b/capplet/settings/mail-autoconfig/indigo.plala.or.jp new file mode 100644 index 0000000000..2d21e2d69e --- /dev/null +++ b/capplet/settings/mail-autoconfig/indigo.plala.or.jp @@ -0,0 +1,24 @@ + + + + indigo.plala.or.jp + ぷらら + ぷらら + + indigo.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + indigo.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/inet-shibata.or.jp b/capplet/settings/mail-autoconfig/inet-shibata.or.jp new file mode 100644 index 0000000000..8e09a319c0 --- /dev/null +++ b/capplet/settings/mail-autoconfig/inet-shibata.or.jp @@ -0,0 +1,24 @@ + + + + inet-shibata.or.jp + インターネット新発田 + INET-SHIBATA + + po.inet-shibata.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + po.inet-shibata.or.jp + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/ivory.plala.or.jp b/capplet/settings/mail-autoconfig/ivory.plala.or.jp new file mode 100644 index 0000000000..a3a0b40c79 --- /dev/null +++ b/capplet/settings/mail-autoconfig/ivory.plala.or.jp @@ -0,0 +1,24 @@ + + + + ivory.plala.or.jp + ぷらら + ぷらら + + ivory.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + ivory.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/iwafune.ne.jp b/capplet/settings/mail-autoconfig/iwafune.ne.jp new file mode 100644 index 0000000000..d45552f08b --- /dev/null +++ b/capplet/settings/mail-autoconfig/iwafune.ne.jp @@ -0,0 +1,24 @@ + + + + iwafune.ne.jp + インターネットいわふね + IWAFUNE + + po.iwafune.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + po.iwafune.ne.jp + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/jade.plala.or.jp b/capplet/settings/mail-autoconfig/jade.plala.or.jp new file mode 100644 index 0000000000..998ff0ce43 --- /dev/null +++ b/capplet/settings/mail-autoconfig/jade.plala.or.jp @@ -0,0 +1,24 @@ + + + + jade.plala.or.jp + ぷらら + ぷらら + + jade.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + jade.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/janis.or.jp b/capplet/settings/mail-autoconfig/janis.or.jp new file mode 100644 index 0000000000..2092e32aaf --- /dev/null +++ b/capplet/settings/mail-autoconfig/janis.or.jp @@ -0,0 +1,44 @@ + + + + janis.or.jp + azm.janis.or.jp + ckm.janis.or.jp + dhk.janis.or.jp + dia.janis.or.jp + grn.janis.or.jp + ina.janis.or.jp + kis.janis.or.jp + mhl.janis.or.jp + mid.janis.or.jp + mis.janis.or.jp + miy.janis.or.jp + ngn.janis.or.jp + nkn.janis.or.jp + osk.janis.or.jp + sas.janis.or.jp + sko.janis.or.jp + swk.janis.or.jp + tgk.janis.or.jp + tyt.janis.or.jp + ued.janis.or.jp + ytg.janis.or.jp + JANIS + JANIS + + mail.%EMAILDOMAIN% + 110 + plain + %EMAILLOCALPART% + plain + + + smtp.%EMAILDOMAIN% + 25 + plain + none + true + false + + + diff --git a/capplet/settings/mail-autoconfig/jet.ne.jp b/capplet/settings/mail-autoconfig/jet.ne.jp new file mode 100644 index 0000000000..dc2c794159 --- /dev/null +++ b/capplet/settings/mail-autoconfig/jet.ne.jp @@ -0,0 +1,24 @@ + + + + jet.ne.jp + JETINTERNET + JET + + pop.jet.ne.jp + 110 + plain + %EMAILLOCALPART% + secure + + + smtp.jet.ne.jp + 587 + plain + %EMAILLOCALPART% + secure + true + false + + + diff --git a/capplet/settings/mail-autoconfig/jet.ne.jp imap b/capplet/settings/mail-autoconfig/jet.ne.jp imap new file mode 100644 index 0000000000..2a8bdebbda --- /dev/null +++ b/capplet/settings/mail-autoconfig/jet.ne.jp imap @@ -0,0 +1,24 @@ + + + + jet.ne.jp + JETINTERNET + JET + + imap.jet.ne.jp + 993 + SSL + %EMAILLOCALPART% + secure + + + smtp.jet.ne.jp + 587 + plain + %EMAILLOCALPART% + secure + true + false + + + diff --git a/capplet/settings/mail-autoconfig/jet.ne.jp pop b/capplet/settings/mail-autoconfig/jet.ne.jp pop new file mode 100644 index 0000000000..dc2c794159 --- /dev/null +++ b/capplet/settings/mail-autoconfig/jet.ne.jp pop @@ -0,0 +1,24 @@ + + + + jet.ne.jp + JETINTERNET + JET + + pop.jet.ne.jp + 110 + plain + %EMAILLOCALPART% + secure + + + smtp.jet.ne.jp + 587 + plain + %EMAILLOCALPART% + secure + true + false + + + diff --git a/capplet/settings/mail-autoconfig/ji.jet.ne.jp b/capplet/settings/mail-autoconfig/ji.jet.ne.jp new file mode 100644 index 0000000000..7c2dfa5b6a --- /dev/null +++ b/capplet/settings/mail-autoconfig/ji.jet.ne.jp @@ -0,0 +1,24 @@ + + + + jet.ne.jp + JETINTERNET + JET + + pop02.jet.ne.jp + 110 + plain + %EMAILLOCALPART% + secure + + + smtp02.jet.ne.jp + 587 + plain + %EMAILLOCALPART% + secure + true + false + + + diff --git a/capplet/settings/mail-autoconfig/jmail.plala.or.jp b/capplet/settings/mail-autoconfig/jmail.plala.or.jp new file mode 100644 index 0000000000..a8c80b2026 --- /dev/null +++ b/capplet/settings/mail-autoconfig/jmail.plala.or.jp @@ -0,0 +1,24 @@ + + + + jmail.plala.or.jp + ぷらら + ぷらら + + jmail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + jmail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/k1.wind.jp b/capplet/settings/mail-autoconfig/k1.wind.jp new file mode 100644 index 0000000000..80bd91ee82 --- /dev/null +++ b/capplet/settings/mail-autoconfig/k1.wind.jp @@ -0,0 +1,32 @@ + + + + kl.wind.ne.jp + kl.wind.jp + kl.wind.co.jp + kl.gunmanet.or.jp + kl.gunmanet.ne.jp + k1.wind.ne.jp + k1.wind.jp + k1.gunmanet.or.jp + k1.gunmanet.ne.jp + 群馬インターネット + wind + + kl.wind.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + kl.wind.ne.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/khaki.plala.or.jp b/capplet/settings/mail-autoconfig/khaki.plala.or.jp new file mode 100644 index 0000000000..09b562ce68 --- /dev/null +++ b/capplet/settings/mail-autoconfig/khaki.plala.or.jp @@ -0,0 +1,24 @@ + + + + khaki.plala.or.jp + ぷらら + ぷらら + + khaki.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + khaki.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/kmail.plala.or.jp b/capplet/settings/mail-autoconfig/kmail.plala.or.jp new file mode 100644 index 0000000000..7e88d5f88d --- /dev/null +++ b/capplet/settings/mail-autoconfig/kmail.plala.or.jp @@ -0,0 +1,24 @@ + + + + kmail.plala.or.jp + ぷらら + ぷらら + + kmail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + kmail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/kokuyou.ne.jp b/capplet/settings/mail-autoconfig/kokuyou.ne.jp new file mode 100644 index 0000000000..1a3e2a6830 --- /dev/null +++ b/capplet/settings/mail-autoconfig/kokuyou.ne.jp @@ -0,0 +1,23 @@ + + + + kokuyou.ne.jp + 長和町黒耀の里ゆいねっと + ゆいねっと + + mail.kokuyou.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + smtp.kokuyou.ne.jp + 25 + plain + none + true + false + + + diff --git a/capplet/settings/mail-autoconfig/lapis.plala.or.jp b/capplet/settings/mail-autoconfig/lapis.plala.or.jp new file mode 100644 index 0000000000..eb54651cb0 --- /dev/null +++ b/capplet/settings/mail-autoconfig/lapis.plala.or.jp @@ -0,0 +1,24 @@ + + + + lapis.plala.or.jp + ぷらら + ぷらら + + lapis.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + lapis.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/laposte.net b/capplet/settings/mail-autoconfig/laposte.net new file mode 100644 index 0000000000..e0b1bd45aa --- /dev/null +++ b/capplet/settings/mail-autoconfig/laposte.net @@ -0,0 +1,29 @@ + + + + + laposte.net + + LaPoste.net + LaPoste + + + imap.laposte.net + 143 + plain + %EMAILLOCALPART% + plain + + + + smtp.laposte.net + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/lemon.plala.or.jp b/capplet/settings/mail-autoconfig/lemon.plala.or.jp new file mode 100644 index 0000000000..26846d8f5c --- /dev/null +++ b/capplet/settings/mail-autoconfig/lemon.plala.or.jp @@ -0,0 +1,24 @@ + + + + lemon.plala.or.jp + ぷらら + ぷらら + + lemon.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + lemon.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/lilac.plala.or.jp b/capplet/settings/mail-autoconfig/lilac.plala.or.jp new file mode 100644 index 0000000000..1283c0246e --- /dev/null +++ b/capplet/settings/mail-autoconfig/lilac.plala.or.jp @@ -0,0 +1,24 @@ + + + + lilac.plala.or.jp + ぷらら + ぷらら + + lilac.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + lilac.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/lime.plala.or.jp b/capplet/settings/mail-autoconfig/lime.plala.or.jp new file mode 100644 index 0000000000..94e092548b --- /dev/null +++ b/capplet/settings/mail-autoconfig/lime.plala.or.jp @@ -0,0 +1,24 @@ + + + + lime.plala.or.jp + ぷらら + ぷらら + + lime.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + lime.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/live.co.jp b/capplet/settings/mail-autoconfig/live.co.jp new file mode 100644 index 0000000000..35beb3fe57 --- /dev/null +++ b/capplet/settings/mail-autoconfig/live.co.jp @@ -0,0 +1,40 @@ + + + + + hotmail.com + hotmail.co.uk + hotmail.co.jp + hotmail.de + hotmail.fr + hotmail.it + live.com + live.co.uk + live.co.jp + live.de + live.fr + live.it + + Microsoft Live Hotmail + Hotmail + + + pop3.live.com + 995 + SSL + %EMAILADDRESS% + plain + + + + smtp.live.com + 587 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/live.co.uk b/capplet/settings/mail-autoconfig/live.co.uk new file mode 100644 index 0000000000..b0007493df --- /dev/null +++ b/capplet/settings/mail-autoconfig/live.co.uk @@ -0,0 +1,41 @@ + + + + + hotmail.com + hotmail.co.uk + hotmail.co.jp + hotmail.de + hotmail.fr + hotmail.it + live.com + live.co.uk + live.co.jp + live.de + live.fr + live.it + msn.com + + Microsoft Live Hotmail + Hotmail + + + pop3.live.com + 995 + SSL + %EMAILADDRESS% + plain + + + + smtp.live.com + 587 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/live.com b/capplet/settings/mail-autoconfig/live.com new file mode 100644 index 0000000000..b0007493df --- /dev/null +++ b/capplet/settings/mail-autoconfig/live.com @@ -0,0 +1,41 @@ + + + + + hotmail.com + hotmail.co.uk + hotmail.co.jp + hotmail.de + hotmail.fr + hotmail.it + live.com + live.co.uk + live.co.jp + live.de + live.fr + live.it + msn.com + + Microsoft Live Hotmail + Hotmail + + + pop3.live.com + 995 + SSL + %EMAILADDRESS% + plain + + + + smtp.live.com + 587 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/live.de b/capplet/settings/mail-autoconfig/live.de new file mode 100644 index 0000000000..b0007493df --- /dev/null +++ b/capplet/settings/mail-autoconfig/live.de @@ -0,0 +1,41 @@ + + + + + hotmail.com + hotmail.co.uk + hotmail.co.jp + hotmail.de + hotmail.fr + hotmail.it + live.com + live.co.uk + live.co.jp + live.de + live.fr + live.it + msn.com + + Microsoft Live Hotmail + Hotmail + + + pop3.live.com + 995 + SSL + %EMAILADDRESS% + plain + + + + smtp.live.com + 587 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/live.fr b/capplet/settings/mail-autoconfig/live.fr new file mode 100644 index 0000000000..b0007493df --- /dev/null +++ b/capplet/settings/mail-autoconfig/live.fr @@ -0,0 +1,41 @@ + + + + + hotmail.com + hotmail.co.uk + hotmail.co.jp + hotmail.de + hotmail.fr + hotmail.it + live.com + live.co.uk + live.co.jp + live.de + live.fr + live.it + msn.com + + Microsoft Live Hotmail + Hotmail + + + pop3.live.com + 995 + SSL + %EMAILADDRESS% + plain + + + + smtp.live.com + 587 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/live.it b/capplet/settings/mail-autoconfig/live.it new file mode 100644 index 0000000000..b0007493df --- /dev/null +++ b/capplet/settings/mail-autoconfig/live.it @@ -0,0 +1,41 @@ + + + + + hotmail.com + hotmail.co.uk + hotmail.co.jp + hotmail.de + hotmail.fr + hotmail.it + live.com + live.co.uk + live.co.jp + live.de + live.fr + live.it + msn.com + + Microsoft Live Hotmail + Hotmail + + + pop3.live.com + 995 + SSL + %EMAILADDRESS% + plain + + + + smtp.live.com + 587 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/ma100.tiki.ne.jp b/capplet/settings/mail-autoconfig/ma100.tiki.ne.jp new file mode 100644 index 0000000000..d87f89eda9 --- /dev/null +++ b/capplet/settings/mail-autoconfig/ma100.tiki.ne.jp @@ -0,0 +1,54 @@ + + + + mx1.tiki.ne.jp + mx2.et.tiki.ne.jp + mx2.tiki.ne.jp + mx2.wt.tiki.ne.jp + mx3.et.tiki.ne.jp + mx3.tiki.ne.jp + mx4.et.tiki.ne.jp + mx4.tiki.ne.jp + mx5.et.tiki.ne.jp + mx5.tiki.ne.jp + mx6.et.tiki.ne.jp + mx6.tiki.ne.jp + mx7.tiki.ne.jp + mx8.tiki.ne.jp + mx9.tiki.ne.jp + mx21.tiki.ne.jp + mx22.tiki.ne.jp + mx31.tiki.ne.jp + mx32.tiki.ne.jp + mx35.tiki.ne.jp + mx36.tiki.ne.jp + mx41.tiki.ne.jp + mx51.et.tiki.ne.jp + mx51.tiki.ne.jp + mx52.tiki.ne.jp + mx61.tiki.ne.jp + mx71.tiki.ne.jp + mx81.tiki.ne.jp + mx82.tiki.ne.jp + mx91.tiki.ne.jp + ma100.tiki.ne.jp + TikiTikiインターネット + TikiTiki + + %EMAILDOMAIN% + 110 + plain + %EMAILLOCALPART% + plain + + + smtp-auth.tiki.ne.jp + 587 + plain + %EMAILADDRESS% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/mac.com b/capplet/settings/mail-autoconfig/mac.com new file mode 100644 index 0000000000..094425578b --- /dev/null +++ b/capplet/settings/mail-autoconfig/mac.com @@ -0,0 +1,30 @@ + + + + + mac.com + me.com + + Apple MobileMe + Apple + + + mail.me.com + 993 + SSL + %EMAILLOCALPART% + plain + + + + smtp.me.com + 465 + SSL + %EMAILLOCALPART% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/mahoroba.ne.jp b/capplet/settings/mail-autoconfig/mahoroba.ne.jp new file mode 100644 index 0000000000..43679c1446 --- /dev/null +++ b/capplet/settings/mail-autoconfig/mahoroba.ne.jp @@ -0,0 +1,24 @@ + + + + mahoroba.ne.jp + インターネットまほろば + まほろば + + mail.mahoroba.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + mail.mahoroba.ne.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/mail.gunmanet.jp b/capplet/settings/mail-autoconfig/mail.gunmanet.jp new file mode 100644 index 0000000000..90bdf8ecf8 --- /dev/null +++ b/capplet/settings/mail-autoconfig/mail.gunmanet.jp @@ -0,0 +1,29 @@ + + + + mail.wind.ne.jp + mail.wind.jp + mail.wind.co.jp + mail.gunmanet.or.jp + mail.gunmanet.ne.jp + mail.gunmanet.jp + 群馬インターネット + wind + + mail.wind.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + mail.wind.ne.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/mail.iwafune.ne.jp b/capplet/settings/mail-autoconfig/mail.iwafune.ne.jp new file mode 100644 index 0000000000..c6340450b9 --- /dev/null +++ b/capplet/settings/mail-autoconfig/mail.iwafune.ne.jp @@ -0,0 +1,24 @@ + + + + mail.iwafune.ne.jp + インターネットいわふね + IWAFUNE + + mail.iwafune.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + mail.iwafune.ne.jp + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/maroon.plala.or.jp b/capplet/settings/mail-autoconfig/maroon.plala.or.jp new file mode 100644 index 0000000000..d2e00e2d0d --- /dev/null +++ b/capplet/settings/mail-autoconfig/maroon.plala.or.jp @@ -0,0 +1,24 @@ + + + + maroon.plala.or.jp + ぷらら + ぷらら + + maroon.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + maroon.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/me.com b/capplet/settings/mail-autoconfig/me.com new file mode 100644 index 0000000000..094425578b --- /dev/null +++ b/capplet/settings/mail-autoconfig/me.com @@ -0,0 +1,30 @@ + + + + + mac.com + me.com + + Apple MobileMe + Apple + + + mail.me.com + 993 + SSL + %EMAILLOCALPART% + plain + + + + smtp.me.com + 465 + SSL + %EMAILLOCALPART% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/minuet.plala.or.jp b/capplet/settings/mail-autoconfig/minuet.plala.or.jp new file mode 100644 index 0000000000..af72bf2644 --- /dev/null +++ b/capplet/settings/mail-autoconfig/minuet.plala.or.jp @@ -0,0 +1,24 @@ + + + + minuet.plala.or.jp + ぷらら + ぷらら + + minuet.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + minuet.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/ml.murakami.ne.jp b/capplet/settings/mail-autoconfig/ml.murakami.ne.jp new file mode 100644 index 0000000000..54d20ae5f9 --- /dev/null +++ b/capplet/settings/mail-autoconfig/ml.murakami.ne.jp @@ -0,0 +1,29 @@ + + + + + ml.murakami.ne.jp + + インターネットいわふね + IWAFUNE + + + ml.murakami.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + + ml.murakami.ne.jp + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/ml.shibata.ne.jp b/capplet/settings/mail-autoconfig/ml.shibata.ne.jp new file mode 100644 index 0000000000..a78346145b --- /dev/null +++ b/capplet/settings/mail-autoconfig/ml.shibata.ne.jp @@ -0,0 +1,25 @@ + + + + pop.shibata.ne.jp + ml.shibata.ne.jp + インターネット新発田 + INET-SHIBATA + + %EMAILDOMAIN% + 110 + plain + %EMAILLOCALPART% + plain + + + %EMAILDOMAIN% + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/mnet.ne.jp b/capplet/settings/mail-autoconfig/mnet.ne.jp new file mode 100644 index 0000000000..24a19b4795 --- /dev/null +++ b/capplet/settings/mail-autoconfig/mnet.ne.jp @@ -0,0 +1,24 @@ + + + + mnet.ne.jp + Mnet メール サービス + Mnetメール + + mail.mnet.ne.jp + 110 + plain + %EMAILADDRESS% + secure + + + mail.mnet.ne.jp + 587 + plain + %EMAILADDRESS% + secure + true + false + + + diff --git a/capplet/settings/mail-autoconfig/mopera.net b/capplet/settings/mail-autoconfig/mopera.net new file mode 100644 index 0000000000..9f416f21d9 --- /dev/null +++ b/capplet/settings/mail-autoconfig/mopera.net @@ -0,0 +1,24 @@ + + + + mopera.net + mopera U + mopera U + + mail.mopera.net + 110 + plain + %EMAILLOCALPART% + plain + + + mail.mopera.net + 587 + plain + %EMAILLOCALPART% + secure + true + false + + + diff --git a/capplet/settings/mail-autoconfig/msn.com b/capplet/settings/mail-autoconfig/msn.com new file mode 100644 index 0000000000..b0007493df --- /dev/null +++ b/capplet/settings/mail-autoconfig/msn.com @@ -0,0 +1,41 @@ + + + + + hotmail.com + hotmail.co.uk + hotmail.co.jp + hotmail.de + hotmail.fr + hotmail.it + live.com + live.co.uk + live.co.jp + live.de + live.fr + live.it + msn.com + + Microsoft Live Hotmail + Hotmail + + + pop3.live.com + 995 + SSL + %EMAILADDRESS% + plain + + + + smtp.live.com + 587 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/navy.plala.or.jp b/capplet/settings/mail-autoconfig/navy.plala.or.jp new file mode 100644 index 0000000000..3935216659 --- /dev/null +++ b/capplet/settings/mail-autoconfig/navy.plala.or.jp @@ -0,0 +1,24 @@ + + + + navy.plala.or.jp + ぷらら + ぷらら + + navy.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + navy.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/nifty.com b/capplet/settings/mail-autoconfig/nifty.com new file mode 100644 index 0000000000..5b38d6240e --- /dev/null +++ b/capplet/settings/mail-autoconfig/nifty.com @@ -0,0 +1,24 @@ + + + + nifty.com + @nifty + @nifty + + pop.nifty.com + 110 + plain + %EMAILLOCALPART% + plain + + + smtp.nifty.com + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/nsat.jp b/capplet/settings/mail-autoconfig/nsat.jp new file mode 100644 index 0000000000..32583b86d2 --- /dev/null +++ b/capplet/settings/mail-autoconfig/nsat.jp @@ -0,0 +1,24 @@ + + + + nsat.jp + ＢＢにいがた + NSAT + + mail.nsat.jp + 110 + plain + %EMAILADDRESS% + secure + + + mail.nsat.jp + 587 + plain + %EMAILADDRESS% + secure + true + false + + + diff --git a/capplet/settings/mail-autoconfig/olive.plala.or.jp b/capplet/settings/mail-autoconfig/olive.plala.or.jp new file mode 100644 index 0000000000..f85b0232ea --- /dev/null +++ b/capplet/settings/mail-autoconfig/olive.plala.or.jp @@ -0,0 +1,24 @@ + + + + olive.plala.or.jp + ぷらら + ぷらら + + olive.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + olive.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/online.de b/capplet/settings/mail-autoconfig/online.de new file mode 100644 index 0000000000..12c4b1e722 --- /dev/null +++ b/capplet/settings/mail-autoconfig/online.de @@ -0,0 +1,43 @@ + + + + + online.de + onlinehome.de + sofortstart.de + sofort-start.de + sofortsurf.de + sofort-surf.de + go4more.de + + 1&1 + 1&1 + + + imap.1und1.de + 993 + SSL + + plain + %EMAILADDRESS% + + + + smtp.1und1.de + 587 + STARTTLS + plain + %EMAILADDRESS% + true + false + + + + + diff --git a/capplet/settings/mail-autoconfig/opal.plala.or.jp b/capplet/settings/mail-autoconfig/opal.plala.or.jp new file mode 100644 index 0000000000..168f59fd01 --- /dev/null +++ b/capplet/settings/mail-autoconfig/opal.plala.or.jp @@ -0,0 +1,24 @@ + + + + opal.plala.or.jp + ぷらら + ぷらら + + opal.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + opal.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/orange.fr b/capplet/settings/mail-autoconfig/orange.fr new file mode 100644 index 0000000000..c40c39e1ce --- /dev/null +++ b/capplet/settings/mail-autoconfig/orange.fr @@ -0,0 +1,30 @@ + + + + + wanadoo.fr + orange.fr + + France Telecom / Orange + Orange + + + pop.orange.fr + 110 + plain + %EMAILLOCALPART% + plain + + + + smtp.orange.fr + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/orange.plala.or.jp b/capplet/settings/mail-autoconfig/orange.plala.or.jp new file mode 100644 index 0000000000..7baa803144 --- /dev/null +++ b/capplet/settings/mail-autoconfig/orange.plala.or.jp @@ -0,0 +1,24 @@ + + + + orange.plala.or.jp + ぷらら + ぷらら + + orange.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + orange.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/orchid.plala.or.jp b/capplet/settings/mail-autoconfig/orchid.plala.or.jp new file mode 100644 index 0000000000..b5c8bc2130 --- /dev/null +++ b/capplet/settings/mail-autoconfig/orchid.plala.or.jp @@ -0,0 +1,24 @@ + + + + orchid.plala.or.jp + ぷらら + ぷらら + + orchid.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + orchid.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/pal.kijimadaira.jp b/capplet/settings/mail-autoconfig/pal.kijimadaira.jp new file mode 100644 index 0000000000..1b91b71189 --- /dev/null +++ b/capplet/settings/mail-autoconfig/pal.kijimadaira.jp @@ -0,0 +1,23 @@ + + + + pal.kijimadaira.jp + 木島平村FTTH + 木島平村FTTH + + mail.pal.kijimadaira.jp + 110 + plain + %EMAILLOCALPART% + plain + + + smtp.pal.kijimadaira.jp + 25 + plain + none + true + false + + + diff --git a/capplet/settings/mail-autoconfig/palette.plala.or.jp b/capplet/settings/mail-autoconfig/palette.plala.or.jp new file mode 100644 index 0000000000..1a64ad6643 --- /dev/null +++ b/capplet/settings/mail-autoconfig/palette.plala.or.jp @@ -0,0 +1,24 @@ + + + + palette.plala.or.jp + ぷらら + ぷらら + + palette.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + palette.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/parabox.or.jp b/capplet/settings/mail-autoconfig/parabox.or.jp new file mode 100644 index 0000000000..0c99974741 --- /dev/null +++ b/capplet/settings/mail-autoconfig/parabox.or.jp @@ -0,0 +1,24 @@ + + + + parabox.or.jp + パラボックス + PARABOX + + pop3.parabox.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + smtp.parabox.or.jp + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/peach.plala.or.jp b/capplet/settings/mail-autoconfig/peach.plala.or.jp new file mode 100644 index 0000000000..34c7a3df41 --- /dev/null +++ b/capplet/settings/mail-autoconfig/peach.plala.or.jp @@ -0,0 +1,24 @@ + + + + peach.plala.or.jp + ぷらら + ぷらら + + peach.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + peach.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/peoplepc.com b/capplet/settings/mail-autoconfig/peoplepc.com new file mode 100644 index 0000000000..b9ec01d797 --- /dev/null +++ b/capplet/settings/mail-autoconfig/peoplepc.com @@ -0,0 +1,29 @@ + + + + + peoplepc.com + + PeoplePC + PeoplePC + + + imap.peoplepc.com + 143 + plain + %EMAILADDRESS% + secure + + + + smtpauth.peoplepc.com + 587 + plain + %EMAILADDRESS% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/plum.plala.or.jp b/capplet/settings/mail-autoconfig/plum.plala.or.jp new file mode 100644 index 0000000000..5696afd5ba --- /dev/null +++ b/capplet/settings/mail-autoconfig/plum.plala.or.jp @@ -0,0 +1,24 @@ + + + + plum.plala.or.jp + ぷらら + ぷらら + + plum.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + plum.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/po.dcn.ne.jp b/capplet/settings/mail-autoconfig/po.dcn.ne.jp new file mode 100644 index 0000000000..e91d2affc7 --- /dev/null +++ b/capplet/settings/mail-autoconfig/po.dcn.ne.jp @@ -0,0 +1,23 @@ + + + + po.dcn.ne.jp + DCNインターネットサービス + DCN + + po.dcn.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + po.dcn.ne.jp + 25 + plain + none + true + false + + + diff --git a/capplet/settings/mail-autoconfig/po.wind.jp b/capplet/settings/mail-autoconfig/po.wind.jp new file mode 100644 index 0000000000..96b2d0f81b --- /dev/null +++ b/capplet/settings/mail-autoconfig/po.wind.jp @@ -0,0 +1,28 @@ + + + + po.wind.ne.jp + po.wind.jp + po.wind.co.jp + po.gunmanet.or.jp + po.gunmanet.ne.jp + 群馬インターネット + wind + + po.wind.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + po.wind.ne.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/polka.plala.or.jp b/capplet/settings/mail-autoconfig/polka.plala.or.jp new file mode 100644 index 0000000000..087065eb7f --- /dev/null +++ b/capplet/settings/mail-autoconfig/polka.plala.or.jp @@ -0,0 +1,24 @@ + + + + polka.plala.or.jp + ぷらら + ぷらら + + polka.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + polka.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/pop.shibata.ne.jp b/capplet/settings/mail-autoconfig/pop.shibata.ne.jp new file mode 100644 index 0000000000..a78346145b --- /dev/null +++ b/capplet/settings/mail-autoconfig/pop.shibata.ne.jp @@ -0,0 +1,25 @@ + + + + pop.shibata.ne.jp + ml.shibata.ne.jp + インターネット新発田 + INET-SHIBATA + + %EMAILDOMAIN% + 110 + plain + %EMAILLOCALPART% + plain + + + %EMAILDOMAIN% + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/purple.plala.or.jp b/capplet/settings/mail-autoconfig/purple.plala.or.jp new file mode 100644 index 0000000000..393d2ac841 --- /dev/null +++ b/capplet/settings/mail-autoconfig/purple.plala.or.jp @@ -0,0 +1,24 @@ + + + + purple.plala.or.jp + ぷらら + ぷらら + + purple.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + purple.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/rainbow.plala.or.jp b/capplet/settings/mail-autoconfig/rainbow.plala.or.jp new file mode 100644 index 0000000000..3718ed4868 --- /dev/null +++ b/capplet/settings/mail-autoconfig/rainbow.plala.or.jp @@ -0,0 +1,24 @@ + + + + rainbow.plala.or.jp + ぷらら + ぷらら + + rainbow.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + rainbow.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/red.plala.or.jp b/capplet/settings/mail-autoconfig/red.plala.or.jp new file mode 100644 index 0000000000..a42e8893ff --- /dev/null +++ b/capplet/settings/mail-autoconfig/red.plala.or.jp @@ -0,0 +1,24 @@ + + + + red.plala.or.jp + ぷらら + ぷらら + + red.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + red.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/rmail.plala.or.jp b/capplet/settings/mail-autoconfig/rmail.plala.or.jp new file mode 100644 index 0000000000..7ecc703e01 --- /dev/null +++ b/capplet/settings/mail-autoconfig/rmail.plala.or.jp @@ -0,0 +1,24 @@ + + + + rmail.plala.or.jp + ぷらら + ぷらら + + rmail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + rmail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/rondo.plala.or.jp b/capplet/settings/mail-autoconfig/rondo.plala.or.jp new file mode 100644 index 0000000000..13616d3e41 --- /dev/null +++ b/capplet/settings/mail-autoconfig/rondo.plala.or.jp @@ -0,0 +1,24 @@ + + + + rondo.plala.or.jp + ぷらら + ぷらら + + rondo.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + rondo.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/rose.plala.or.jp b/capplet/settings/mail-autoconfig/rose.plala.or.jp new file mode 100644 index 0000000000..034f32cab4 --- /dev/null +++ b/capplet/settings/mail-autoconfig/rose.plala.or.jp @@ -0,0 +1,24 @@ + + + + rose.plala.or.jp + ぷらら + ぷらら + + rose.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + rose.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/rouge.plala.or.jp b/capplet/settings/mail-autoconfig/rouge.plala.or.jp new file mode 100644 index 0000000000..cbbb43ce4d --- /dev/null +++ b/capplet/settings/mail-autoconfig/rouge.plala.or.jp @@ -0,0 +1,24 @@ + + + + rouge.plala.or.jp + ぷらら + ぷらら + + rouge.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + rouge.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/ruby.plala.or.jp b/capplet/settings/mail-autoconfig/ruby.plala.or.jp new file mode 100644 index 0000000000..427be4b3cf --- /dev/null +++ b/capplet/settings/mail-autoconfig/ruby.plala.or.jp @@ -0,0 +1,24 @@ + + + + ruby.plala.or.jp + ぷらら + ぷらら + + ruby.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + ruby.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/sakunet.ne.jp b/capplet/settings/mail-autoconfig/sakunet.ne.jp new file mode 100644 index 0000000000..695b7c70c2 --- /dev/null +++ b/capplet/settings/mail-autoconfig/sakunet.ne.jp @@ -0,0 +1,23 @@ + + + + sakunet.ne.jp + 佐久ケーブルテレビ + Saku-Net + + mail.sakunet.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + smtp.sakunet.ne.jp + 25 + plain + none + true + false + + + diff --git a/capplet/settings/mail-autoconfig/sea.plala.or.jp b/capplet/settings/mail-autoconfig/sea.plala.or.jp new file mode 100644 index 0000000000..ddde2c1767 --- /dev/null +++ b/capplet/settings/mail-autoconfig/sea.plala.or.jp @@ -0,0 +1,24 @@ + + + + sea.plala.or.jp + ぷらら + ぷらら + + sea.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + sea.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/sepia.plala.or.jp b/capplet/settings/mail-autoconfig/sepia.plala.or.jp new file mode 100644 index 0000000000..1dce9e1cf4 --- /dev/null +++ b/capplet/settings/mail-autoconfig/sepia.plala.or.jp @@ -0,0 +1,24 @@ + + + + sepia.plala.or.jp + ぷらら + ぷらら + + sepia.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + sepia.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/serenade.plala.or.jp b/capplet/settings/mail-autoconfig/serenade.plala.or.jp new file mode 100644 index 0000000000..83bf35b7ba --- /dev/null +++ b/capplet/settings/mail-autoconfig/serenade.plala.or.jp @@ -0,0 +1,24 @@ + + + + serenade.plala.or.jp + ぷらら + ぷらら + + serenade.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + serenade.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/silk.plala.or.jp b/capplet/settings/mail-autoconfig/silk.plala.or.jp new file mode 100644 index 0000000000..1aa4b81964 --- /dev/null +++ b/capplet/settings/mail-autoconfig/silk.plala.or.jp @@ -0,0 +1,24 @@ + + + + silk.plala.or.jp + ぷらら + ぷらら + + silk.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + silk.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/silver.plala.or.jp b/capplet/settings/mail-autoconfig/silver.plala.or.jp new file mode 100644 index 0000000000..8ff9fd9ec8 --- /dev/null +++ b/capplet/settings/mail-autoconfig/silver.plala.or.jp @@ -0,0 +1,24 @@ + + + + silver.plala.or.jp + ぷらら + ぷらら + + silver.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + silver.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/sky.plala.or.jp b/capplet/settings/mail-autoconfig/sky.plala.or.jp new file mode 100644 index 0000000000..9da6383b8c --- /dev/null +++ b/capplet/settings/mail-autoconfig/sky.plala.or.jp @@ -0,0 +1,24 @@ + + + + sky.plala.or.jp + ぷらら + ぷらら + + sky.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + sky.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/smail.plala.or.jp b/capplet/settings/mail-autoconfig/smail.plala.or.jp new file mode 100644 index 0000000000..1768bfd9bc --- /dev/null +++ b/capplet/settings/mail-autoconfig/smail.plala.or.jp @@ -0,0 +1,24 @@ + + + + smail.plala.or.jp + ぷらら + ぷらら + + smail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + smail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/snow.plala.or.jp b/capplet/settings/mail-autoconfig/snow.plala.or.jp new file mode 100644 index 0000000000..44267b99b1 --- /dev/null +++ b/capplet/settings/mail-autoconfig/snow.plala.or.jp @@ -0,0 +1,24 @@ + + + + snow.plala.or.jp + ぷらら + ぷらら + + snow.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + snow.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/so.wind.ne.jp b/capplet/settings/mail-autoconfig/so.wind.ne.jp new file mode 100644 index 0000000000..50fd47ef1c --- /dev/null +++ b/capplet/settings/mail-autoconfig/so.wind.ne.jp @@ -0,0 +1,25 @@ + + + + so.wind.ne.jp + so.wind.jp + 群馬インターネット + wind + + so.wind.ne.jp + 143 + plain + %EMAILLOCALPART% + plain + + + so.wind.ne.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/sonata.plala.or.jp b/capplet/settings/mail-autoconfig/sonata.plala.or.jp new file mode 100644 index 0000000000..3834428fbd --- /dev/null +++ b/capplet/settings/mail-autoconfig/sonata.plala.or.jp @@ -0,0 +1,24 @@ + + + + sonata.plala.or.jp + ぷらら + ぷらら + + sonata.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + sonata.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/suite.plala.or.jp b/capplet/settings/mail-autoconfig/suite.plala.or.jp new file mode 100644 index 0000000000..c8beac6b9c --- /dev/null +++ b/capplet/settings/mail-autoconfig/suite.plala.or.jp @@ -0,0 +1,24 @@ + + + + suite.plala.or.jp + ぷらら + ぷらら + + suite.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + suite.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/symphony.plala.or.jp b/capplet/settings/mail-autoconfig/symphony.plala.or.jp new file mode 100644 index 0000000000..311aa184ac --- /dev/null +++ b/capplet/settings/mail-autoconfig/symphony.plala.or.jp @@ -0,0 +1,24 @@ + + + + symphony.plala.or.jp + ぷらら + ぷらら + + symphony.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + symphony.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/t-online.de b/capplet/settings/mail-autoconfig/t-online.de new file mode 100644 index 0000000000..a80ac4c316 --- /dev/null +++ b/capplet/settings/mail-autoconfig/t-online.de @@ -0,0 +1,32 @@ + + + + + t-online.de + + T-Online email Paket + T-Online + + + popmail.t-online.de + 110 + plain + %EMAILADDRESS% + secure + + + + smtpmail.t-online.de + 25 + plain + %EMAILADDRESS% + plain + true + false + + + + + + + diff --git a/capplet/settings/mail-autoconfig/t-online.de free b/capplet/settings/mail-autoconfig/t-online.de free new file mode 100644 index 0000000000..a80ac4c316 --- /dev/null +++ b/capplet/settings/mail-autoconfig/t-online.de free @@ -0,0 +1,32 @@ + + + + + t-online.de + + T-Online email Paket + T-Online + + + popmail.t-online.de + 110 + plain + %EMAILADDRESS% + secure + + + + smtpmail.t-online.de + 25 + plain + %EMAILADDRESS% + plain + true + false + + + + + + + diff --git a/capplet/settings/mail-autoconfig/t-online.de imap ssl b/capplet/settings/mail-autoconfig/t-online.de imap ssl new file mode 100644 index 0000000000..e2e5fb1a76 --- /dev/null +++ b/capplet/settings/mail-autoconfig/t-online.de imap ssl @@ -0,0 +1,32 @@ + + + + + t-online.de + + T-Online email Paket + T-Online + + + secure-imap.t-online.de + 993 + SSL + %EMAILADDRESS% + secure + + + + securesmtp.googlemail.com + 25 + STARTTLS + %EMAILADDRESS% + secure + true + false + + + You need to enable POP access + + + + diff --git a/capplet/settings/mail-autoconfig/t-online.de pop ssl b/capplet/settings/mail-autoconfig/t-online.de pop ssl new file mode 100644 index 0000000000..264ad0582c --- /dev/null +++ b/capplet/settings/mail-autoconfig/t-online.de pop ssl @@ -0,0 +1,32 @@ + + + + + t-online.de + + T-Online email Paket + T-Online + + + securepop.t-online.de + 995 + SSL + %EMAILADDRESS% + plain + + + + securesmtp.t-online.de + 25 + STARTTLS + %EMAILADDRESS% + plain + true + false + + + + + + + diff --git a/capplet/settings/mail-autoconfig/taupe.plala.or.jp b/capplet/settings/mail-autoconfig/taupe.plala.or.jp new file mode 100644 index 0000000000..cec35b2df5 --- /dev/null +++ b/capplet/settings/mail-autoconfig/taupe.plala.or.jp @@ -0,0 +1,24 @@ + + + + taupe.plala.or.jp + ぷらら + ぷらら + + taupe.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + taupe.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/tiki.ne.jp b/capplet/settings/mail-autoconfig/tiki.ne.jp new file mode 100644 index 0000000000..9e54488ead --- /dev/null +++ b/capplet/settings/mail-autoconfig/tiki.ne.jp @@ -0,0 +1,24 @@ + + + + tiki.ne.jp + TikiTikiインターネット + TikiTiki + + mx.tiki.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + smtp-auth.tiki.ne.jp + 587 + plain + %EMAILADDRESS% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/tmail.plala.or.jp b/capplet/settings/mail-autoconfig/tmail.plala.or.jp new file mode 100644 index 0000000000..d138304dc9 --- /dev/null +++ b/capplet/settings/mail-autoconfig/tmail.plala.or.jp @@ -0,0 +1,24 @@ + + + + tmail.plala.or.jp + ぷらら + ぷらら + + tmail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + tmail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/toccata.plala.or.jp b/capplet/settings/mail-autoconfig/toccata.plala.or.jp new file mode 100644 index 0000000000..41281a7d6c --- /dev/null +++ b/capplet/settings/mail-autoconfig/toccata.plala.or.jp @@ -0,0 +1,24 @@ + + + + toccata.plala.or.jp + ぷらら + ぷらら + + toccata.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + toccata.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/topaz.plala.or.jp b/capplet/settings/mail-autoconfig/topaz.plala.or.jp new file mode 100644 index 0000000000..185f1796de --- /dev/null +++ b/capplet/settings/mail-autoconfig/topaz.plala.or.jp @@ -0,0 +1,24 @@ + + + + topaz.plala.or.jp + ぷらら + ぷらら + + topaz.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + topaz.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/trio.plala.or.jp b/capplet/settings/mail-autoconfig/trio.plala.or.jp new file mode 100644 index 0000000000..6d15fc17b4 --- /dev/null +++ b/capplet/settings/mail-autoconfig/trio.plala.or.jp @@ -0,0 +1,24 @@ + + + + trio.plala.or.jp + ぷらら + ぷらら + + trio.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + trio.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/umail.plala.or.jp b/capplet/settings/mail-autoconfig/umail.plala.or.jp new file mode 100644 index 0000000000..2b4a0694a0 --- /dev/null +++ b/capplet/settings/mail-autoconfig/umail.plala.or.jp @@ -0,0 +1,24 @@ + + + + umail.plala.or.jp + ぷらら + ぷらら + + umail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + umail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/verizon.net b/capplet/settings/mail-autoconfig/verizon.net new file mode 100644 index 0000000000..0c41d38243 --- /dev/null +++ b/capplet/settings/mail-autoconfig/verizon.net @@ -0,0 +1,29 @@ + + + + + verizon.net + + Verizon Online + Verizon + + + incoming.verizon.com + 110 + plain + %EMAILLOCALPART% + plain + + + + outgoing.verizon.net + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/violet.plala.or.jp b/capplet/settings/mail-autoconfig/violet.plala.or.jp new file mode 100644 index 0000000000..a1ce58b326 --- /dev/null +++ b/capplet/settings/mail-autoconfig/violet.plala.or.jp @@ -0,0 +1,24 @@ + + + + violet.plala.or.jp + ぷらら + ぷらら + + violet.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + violet.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/vm.aikis.or.jp b/capplet/settings/mail-autoconfig/vm.aikis.or.jp new file mode 100644 index 0000000000..9c3caa70ec --- /dev/null +++ b/capplet/settings/mail-autoconfig/vm.aikis.or.jp @@ -0,0 +1,24 @@ + + + + vm.aikis.or.jp + aikis + aikis + + mail.aikis.or.jp + 995 + SSL + %EMAILLOCALPART% + plain + + + mail.aikis.or.jp + 587 + STARTTLS + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/vmail.plala.or.jp b/capplet/settings/mail-autoconfig/vmail.plala.or.jp new file mode 100644 index 0000000000..66358ef6a8 --- /dev/null +++ b/capplet/settings/mail-autoconfig/vmail.plala.or.jp @@ -0,0 +1,24 @@ + + + + vmail.plala.or.jp + ぷらら + ぷらら + + vmail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + vmail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/vp.tiki.ne.jp b/capplet/settings/mail-autoconfig/vp.tiki.ne.jp new file mode 100644 index 0000000000..378a9d3b24 --- /dev/null +++ b/capplet/settings/mail-autoconfig/vp.tiki.ne.jp @@ -0,0 +1,24 @@ + + + + vp.tiki.ne.jp + TikiTikiインターネット + TikiTiki + + vp.tiki.ne.jp + 110 + plain + %EMAILLOCALPART% + plain + + + vs.tiki.ne.jp + 587 + plain + %EMAILADDRESS% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/waltz.plala.or.jp b/capplet/settings/mail-autoconfig/waltz.plala.or.jp new file mode 100644 index 0000000000..e7814cd235 --- /dev/null +++ b/capplet/settings/mail-autoconfig/waltz.plala.or.jp @@ -0,0 +1,24 @@ + + + + waltz.plala.or.jp + ぷらら + ぷらら + + waltz.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + waltz.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/wanadoo.fr b/capplet/settings/mail-autoconfig/wanadoo.fr new file mode 100644 index 0000000000..c40c39e1ce --- /dev/null +++ b/capplet/settings/mail-autoconfig/wanadoo.fr @@ -0,0 +1,30 @@ + + + + + wanadoo.fr + orange.fr + + France Telecom / Orange + Orange + + + pop.orange.fr + 110 + plain + %EMAILLOCALPART% + plain + + + + smtp.orange.fr + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/wanadoo.fr imap b/capplet/settings/mail-autoconfig/wanadoo.fr imap new file mode 100644 index 0000000000..5b138e48ce --- /dev/null +++ b/capplet/settings/mail-autoconfig/wanadoo.fr imap @@ -0,0 +1,30 @@ + + + + + wanadoo.fr + orange.fr + + France Telecom / Orange + Orange + + + imap.orange.fr + 143 + plain + %EMAILLOCALPART% + plain + + + + smtp.orange.fr + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/wanadoo.fr pop b/capplet/settings/mail-autoconfig/wanadoo.fr pop new file mode 100644 index 0000000000..c40c39e1ce --- /dev/null +++ b/capplet/settings/mail-autoconfig/wanadoo.fr pop @@ -0,0 +1,30 @@ + + + + + wanadoo.fr + orange.fr + + France Telecom / Orange + Orange + + + pop.orange.fr + 110 + plain + %EMAILLOCALPART% + plain + + + + smtp.orange.fr + 25 + plain + %EMAILLOCALPART% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/wave.plala.or.jp b/capplet/settings/mail-autoconfig/wave.plala.or.jp new file mode 100644 index 0000000000..611ab2a6b8 --- /dev/null +++ b/capplet/settings/mail-autoconfig/wave.plala.or.jp @@ -0,0 +1,24 @@ + + + + wave.plala.or.jp + ぷらら + ぷらら + + wave.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + wave.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/web.de b/capplet/settings/mail-autoconfig/web.de new file mode 100644 index 0000000000..d3b357f16d --- /dev/null +++ b/capplet/settings/mail-autoconfig/web.de @@ -0,0 +1,29 @@ + + + + + web.de + + WEB.DE Freemail + Web.de + + + imap.web.de + 993 + SSL + %EMAILLOCALPART% + plain + + + + smtp.web.de + 587 + STARTTLS + %EMAILLOCALPART% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/white.plala.or.jp b/capplet/settings/mail-autoconfig/white.plala.or.jp new file mode 100644 index 0000000000..34f9a8af3f --- /dev/null +++ b/capplet/settings/mail-autoconfig/white.plala.or.jp @@ -0,0 +1,24 @@ + + + + white.plala.or.jp + ぷらら + ぷらら + + white.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + white.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/wine.plala.or.jp b/capplet/settings/mail-autoconfig/wine.plala.or.jp new file mode 100644 index 0000000000..62f66db872 --- /dev/null +++ b/capplet/settings/mail-autoconfig/wine.plala.or.jp @@ -0,0 +1,24 @@ + + + + wine.plala.or.jp + ぷらら + ぷらら + + wine.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + wine.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/wmail.plala.or.jp b/capplet/settings/mail-autoconfig/wmail.plala.or.jp new file mode 100644 index 0000000000..375c3010eb --- /dev/null +++ b/capplet/settings/mail-autoconfig/wmail.plala.or.jp @@ -0,0 +1,24 @@ + + + + wmail.plala.or.jp + ぷらら + ぷらら + + wmail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + wmail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/xmail.plala.or.jp b/capplet/settings/mail-autoconfig/xmail.plala.or.jp new file mode 100644 index 0000000000..b8d7187ff5 --- /dev/null +++ b/capplet/settings/mail-autoconfig/xmail.plala.or.jp @@ -0,0 +1,24 @@ + + + + xmail.plala.or.jp + ぷらら + ぷらら + + xmail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + xmail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/xp.wind.jp b/capplet/settings/mail-autoconfig/xp.wind.jp new file mode 100644 index 0000000000..bed7569308 --- /dev/null +++ b/capplet/settings/mail-autoconfig/xp.wind.jp @@ -0,0 +1,24 @@ + + + + xp.wind.jp + 群馬インターネット + wind + + xp.wind.jp + 110 + plain + %EMAILLOCALPART% + plain + + + xp.wind.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/xpost.plala.or.jp b/capplet/settings/mail-autoconfig/xpost.plala.or.jp new file mode 100644 index 0000000000..7d175fd750 --- /dev/null +++ b/capplet/settings/mail-autoconfig/xpost.plala.or.jp @@ -0,0 +1,24 @@ + + + + xpost.plala.or.jp + ぷらら + ぷらら + + xpost.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + xpost.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/xs4all.nl b/capplet/settings/mail-autoconfig/xs4all.nl new file mode 100644 index 0000000000..b5c4289322 --- /dev/null +++ b/capplet/settings/mail-autoconfig/xs4all.nl @@ -0,0 +1,29 @@ + + + + + xs4all.nl + + XS4All + XS4All + + + pops.xs4all.nl + 995 + SSL + %EMAILLOCALPART% + plain + + + + smtps.xs4all.nl + 465 + SSL + %EMAILLOCALPART% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/yahoo.com b/capplet/settings/mail-autoconfig/yahoo.com new file mode 100644 index 0000000000..92e6d7a70a --- /dev/null +++ b/capplet/settings/mail-autoconfig/yahoo.com @@ -0,0 +1,36 @@ + + + + + yahoo.com + yahoo.de + yahoo.it + yahoo.fr + yahoo.co.uk + yahoo.com.br + ymail.com + rocketmail.com + + Yahoo! Mail + Yahoo + + + pop.mail.yahoo.com + 995 + SSL + %EMAILLOCALPART% + plain + + + + smtp.mail.yahoo.com + 465 + SSL + %EMAILLOCALPART% + plain + true + false + + + + diff --git a/capplet/settings/mail-autoconfig/ybb.ne.jp b/capplet/settings/mail-autoconfig/ybb.ne.jp new file mode 100644 index 0000000000..935a59ba95 --- /dev/null +++ b/capplet/settings/mail-autoconfig/ybb.ne.jp @@ -0,0 +1,24 @@ + + + + ybb.ne.jp + Yahoo! BB + Yahoo! BB + + ybbpop.mail.yahoo.co.jp + 995 + SSL + %EMAILLOCALPART% + plain + + + ybbsmtp.mail.yahoo.co.jp + 465 + SSL + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/yellow.plala.or.jp b/capplet/settings/mail-autoconfig/yellow.plala.or.jp new file mode 100644 index 0000000000..4b71b37f72 --- /dev/null +++ b/capplet/settings/mail-autoconfig/yellow.plala.or.jp @@ -0,0 +1,24 @@ + + + + yellow.plala.or.jp + ぷらら + ぷらら + + yellow.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + yellow.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/ymail.plala.or.jp b/capplet/settings/mail-autoconfig/ymail.plala.or.jp new file mode 100644 index 0000000000..0f367d6b4e --- /dev/null +++ b/capplet/settings/mail-autoconfig/ymail.plala.or.jp @@ -0,0 +1,24 @@ + + + + ymail.plala.or.jp + ぷらら + ぷらら + + ymail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + ymail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/ypost.plala.or.jp b/capplet/settings/mail-autoconfig/ypost.plala.or.jp new file mode 100644 index 0000000000..9149c8d496 --- /dev/null +++ b/capplet/settings/mail-autoconfig/ypost.plala.or.jp @@ -0,0 +1,24 @@ + + + + ypost.plala.or.jp + ぷらら + ぷらら + + ypost.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + ypost.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + diff --git a/capplet/settings/mail-autoconfig/zmail.plala.or.jp b/capplet/settings/mail-autoconfig/zmail.plala.or.jp new file mode 100644 index 0000000000..02e73a9842 --- /dev/null +++ b/capplet/settings/mail-autoconfig/zmail.plala.or.jp @@ -0,0 +1,24 @@ + + + + zmail.plala.or.jp + ぷらら + ぷらら + + zmail.mail.plala.or.jp + 110 + plain + %EMAILLOCALPART% + plain + + + zmail.mail.plala.or.jp + 587 + plain + %EMAILLOCALPART% + plain + true + false + + + -- cgit From d05cf0cc219efd3eddc56e07b583c070779de17c Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 16 Mar 2010 17:25:54 -0600 Subject: Read the mail autoconfig files from the right path Signed-off-by: Federico Mena Quintero --- capplet/settings/mail-guess-servers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'capplet') diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index f956058262..06ac34351f 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -264,7 +264,7 @@ guess_when_online (EmailProvider *provider) static char * get_filename_for_offline_autoconfig (const char *domain) { - return NULL; /* FIXME */ + return g_build_filename (PACKAGE_DATA_DIR, "evolution/mail-autoconfig", domain, NULL); } static gboolean -- cgit From 045e4cffdd2c29dabb86705587415103228e1310 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 17 Mar 2010 18:47:57 +0000 Subject: Fix compiler warnings Oh, yes, I hate xmlChar. Signed-off-by: Federico Mena Quintero Conflicts: capplet/settings/mail-guess-servers.c --- capplet/settings/mail-guess-servers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'capplet') diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index 06ac34351f..d186c422e8 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -272,7 +272,7 @@ guess_when_offline (EmailProvider *provider) { char *filename; char *contents; - gssize length; + gsize length; gboolean success; if (!provider->domain || provider->domain[0] == 0) -- cgit From 5074cca8b11e320f4316d2f177f6220551e34e4f Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 17 Mar 2010 13:05:20 -0600 Subject: Fix Makefile.am thinko Signed-off-by: Federico Mena Quintero --- capplet/settings/mail-autoconfig/Makefile.am | 2 -- 1 file changed, 2 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-autoconfig/Makefile.am b/capplet/settings/mail-autoconfig/Makefile.am index 2375fcf134..e72d3fd713 100644 --- a/capplet/settings/mail-autoconfig/Makefile.am +++ b/capplet/settings/mail-autoconfig/Makefile.am @@ -50,8 +50,6 @@ autoconfig_DATA = \ freenet.de \ fuga.plala.or.jp \ gmail.com \ - gmail.com \ - gmail.com \ gmail.plala.or.jp \ gmx.com \ gmx.net \ -- cgit From 6cf5297b72585ac32d40743216fbf561caba7cf3 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 17 Mar 2010 15:24:16 -0600 Subject: Get the online status from the EShell Signed-off-by: Federico Mena Quintero --- capplet/settings/mail-guess-servers.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index d186c422e8..c6a5604533 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -42,6 +42,8 @@ #include #include +#include + #include "mail-guess-servers.h" static gchar * @@ -218,9 +220,21 @@ parse_soup_message (SoupMessage *msg, EmailProvider *provider) } static gboolean -is_offline (void) +is_online (void) { - return FALSE; /* FIXME */ + EShell *shell; + + shell = e_shell_get_default (); + if (!shell) { + /* FIXME: do we always have a shell? What do we do if one + * hasn't been created yet? e_shell_get_default() won't create + * a shell; it will just return one that has been created + * before. + */ + return FALSE; + } + + return e_shell_get_online (shell); } static gboolean -- cgit From 9cbf441430a637ac239f4b1490380cdb92543dbf Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 17 Mar 2010 15:24:32 -0600 Subject: Fallback to the offline case if we can't contact the server anyway Signed-off-by: Federico Mena Quintero --- capplet/settings/mail-guess-servers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index c6a5604533..9ae62119a3 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -310,10 +310,10 @@ out: gboolean mail_guess_servers(EmailProvider *provider) { - if (is_offline ()) - return guess_when_offline (provider); + if (is_online () && guess_when_online (provider)) + return TRUE; else - return guess_when_online (provider); + return guess_when_offline (provider); } #ifdef TEST -- cgit From a569d6d63b975b3734a73a9dd4ca7cebb8bf9f4a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 17 Mar 2010 15:58:28 -0600 Subject: Ahem, use the right installation paths Signed-off-by: Federico Mena Quintero --- capplet/settings/mail-autoconfig/Makefile.am | 2 +- capplet/settings/mail-guess-servers.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-autoconfig/Makefile.am b/capplet/settings/mail-autoconfig/Makefile.am index e72d3fd713..451101d364 100644 --- a/capplet/settings/mail-autoconfig/Makefile.am +++ b/capplet/settings/mail-autoconfig/Makefile.am @@ -179,7 +179,7 @@ autoconfig_DATA = \ ypost.plala.or.jp \ zmail.plala.or.jp -autoconfigdir = $(pkgdatadir)/evolution/mail-autoconfig +autoconfigdir = $(privdatadir)/mail-autoconfig EXTRA_DIST = \ $(autoconfig_DATA) \ diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index 9ae62119a3..565616486a 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -278,7 +278,7 @@ guess_when_online (EmailProvider *provider) static char * get_filename_for_offline_autoconfig (const char *domain) { - return g_build_filename (PACKAGE_DATA_DIR, "evolution/mail-autoconfig", domain, NULL); + return g_build_filename (EVOLUTION_PRIVDATADIR, "mail-autoconfig", domain, NULL); } static gboolean -- cgit From 00217c7a2a7833babbd9b9e79c9ae4f358969d70 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 31 Mar 2010 17:42:14 -0400 Subject: Capplet cleanups. --- capplet/settings/mail-guess-servers.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index 565616486a..a9e477abd7 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -161,7 +161,7 @@ handle_outgoing (xmlNodePtr head, EmailProvider *provider) } static gboolean -parse_message (const char *msg, int length, EmailProvider *provider) +parse_message (const gchar *msg, gint length, EmailProvider *provider) { xmlDocPtr doc; xmlNodePtr node, top; @@ -266,7 +266,7 @@ guess_when_online (EmailProvider *provider) return FALSE; parse_soup_message (msg, provider); - + g_object_unref (msg); g_object_unref(session); g_free(url); @@ -275,8 +275,8 @@ guess_when_online (EmailProvider *provider) } -static char * -get_filename_for_offline_autoconfig (const char *domain) +static gchar * +get_filename_for_offline_autoconfig (const gchar *domain) { return g_build_filename (EVOLUTION_PRIVDATADIR, "mail-autoconfig", domain, NULL); } @@ -284,8 +284,8 @@ get_filename_for_offline_autoconfig (const char *domain) static gboolean guess_when_offline (EmailProvider *provider) { - char *filename; - char *contents; + gchar *filename; + gchar *contents; gsize length; gboolean success; @@ -298,7 +298,7 @@ guess_when_offline (EmailProvider *provider) if (!g_file_get_contents (filename, &contents, &length, NULL)) /* NULL-GError */ goto out; - success = parse_message (contents, (int) length, provider); + success = parse_message (contents, (gint) length, provider); out: g_free (filename); -- cgit From 74e6e7c71db8f30b1c140275d2fccf4f7bef0c04 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 8 Apr 2010 10:16:18 -0400 Subject: Remove gtk_notebook_set_tab_label_packing(). --- capplet/settings/mail-view.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c index 84214888a9..a344d59251 100644 --- a/capplet/settings/mail-view.c +++ b/capplet/settings/mail-view.c @@ -319,7 +319,6 @@ mail_view_add_folder (MailView *mv, gpointer data, gboolean block) g_signal_connect (mfv, "view-close", G_CALLBACK(mv_close_mcv), mv); if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position); - gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)mfv, FALSE, FALSE, 0); g_signal_connect (mfv, "message-shown", G_CALLBACK(mv_message_shown), mv); g_signal_connect (mfv, "message-new", G_CALLBACK(mv_message_new), mv); g_signal_connect (mfv, "search-set", G_CALLBACK(mv_search_set), mv); @@ -359,7 +358,6 @@ mail_view_add_composer (MailView *mv, gpointer data, gboolean block) gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE); if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position); - gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)mcv, FALSE, FALSE, 0); if (!block) mail_composer_view_activate (mcv, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); @@ -387,7 +385,6 @@ mail_view_add_message (MailView *mv, gpointer data, gboolean block) gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE); if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position+1); - gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)mcv, FALSE, FALSE, 0); if (!block) mail_conv_view_activate (mcv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); -- cgit From 3a5c89132b5f235e19f14a05f852af4d374c3f11 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 12 Apr 2010 14:51:52 +0100 Subject: switch autoconfig to use the api.gnome.org API --- capplet/settings/mail-guess-servers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'capplet') diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index a9e477abd7..6f42680f11 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -246,7 +246,7 @@ guess_when_online (EmailProvider *provider) SoupMessage *msg; SoupSession *session; - url = g_strdup_printf("%s/%s", "https://live.mozillamessaging.com/autoconfig", provider->domain); + url = g_strdup_printf("%s/%s", "http://api.gnome.org/evolution/autoconfig", provider->domain); parsed = soup_uri_new (url); soup_uri_free (parsed); -- cgit From 8505a33d996442ba045333883518d744263ead23 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 19 Apr 2010 17:13:14 +0100 Subject: add proxy support to auto-configuration --- capplet/settings/mail-guess-servers.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index 6f42680f11..f94fbb90e6 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -42,6 +42,8 @@ #include #include +#include + #include #include "mail-guess-servers.h" @@ -242,10 +244,14 @@ guess_when_online (EmailProvider *provider) { const gchar *cafile = NULL; gchar *url; - SoupURI *proxy = NULL, *parsed; + EProxy *proxy; + SoupURI *parsed; SoupMessage *msg; SoupSession *session; + proxy = e_proxy_new (); + e_proxy_setup_proxy (proxy); + url = g_strdup_printf("%s/%s", "http://api.gnome.org/evolution/autoconfig", provider->domain); parsed = soup_uri_new (url); soup_uri_free (parsed); @@ -255,10 +261,11 @@ guess_when_online (EmailProvider *provider) SOUP_SESSION_USER_AGENT, "get ", NULL); - if (proxy) { - g_object_set (G_OBJECT (session), - SOUP_SESSION_PROXY_URI, proxy, - NULL); + if (e_proxy_require_proxy_for_uri (proxy, url)) { + SoupURI *proxy_uri = e_proxy_peek_uri_for (proxy, url); +/* fprintf (stderr, "URL '%s' requires a proxy: '%s'\n", + url, soup_uri_to_string (proxy_uri, FALSE)); */ + g_object_set (session, SOUP_SESSION_PROXY_URI, proxy_uri, NULL); } msg = get_url (session, url); @@ -267,6 +274,7 @@ guess_when_online (EmailProvider *provider) parse_soup_message (msg, provider); + g_object_unref (proxy); g_object_unref (msg); g_object_unref(session); g_free(url); -- cgit From 33fc38811d408db702c4fee7fa2ba61bf7826dd1 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Tue, 20 Apr 2010 10:52:01 +0530 Subject: Add Password field to the account setup and prestore password. --- capplet/settings/mail-account-view.c | 38 +++++++++++++++++++++++++++++++++++- capplet/settings/mail-account-view.h | 1 + 2 files changed, 38 insertions(+), 1 deletion(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index e97abdc6dc..07f4a7570e 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -30,6 +30,7 @@ #include "mail-view.h" #include "e-util/e-config.h" #include "mail/mail-config.h" +#include "mail/mail-session.h" #include "mail-guess-servers.h" struct _MailAccountViewPrivate { @@ -47,6 +48,7 @@ enum { ERROR_NO_FULLNAME = 1, ERROR_NO_EMAIL = 2, ERROR_INVALID_EMAIL = 3, + ERROR_NO_PASSWORD = 4, }; struct _dialog_errors { @@ -56,6 +58,7 @@ struct _dialog_errors { { ERROR_NO_FULLNAME, N_("Please enter your full name.") }, { ERROR_NO_EMAIL, N_("Please enter your email address.") }, { ERROR_INVALID_EMAIL, N_("The email address you have entered is invalid.") }, + { ERROR_NO_PASSWORD, N_("Please enter your password.") } }; static guint signals[LAST_SIGNAL] = { 0 }; @@ -136,11 +139,15 @@ validate_identity (MailAccountView *view) gchar *user = (gchar *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_NAME); gchar *email = (gchar *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_ADDRESS); gchar *tmp; + const gchar *pwd = gtk_entry_get_text ((GtkEntry *)view->password); if (!user || !*user) return ERROR_NO_FULLNAME; if (!email || !*email) return ERROR_NO_EMAIL; + if (!pwd || !*pwd) + return ERROR_NO_PASSWORD; + tmp = strchr(email, '@'); if (!tmp || tmp[1] == 0) return ERROR_INVALID_EMAIL; @@ -378,6 +385,19 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) g_free(uri); camel_url_free(url); } + + if (!mav->original) { + EAccount *account = em_account_editor_get_modified_account(mav->edit); + CamelURL *aurl; + char *surl; + /* Save the password ahead of time */ + aurl = camel_url_new (account->source->url, NULL); + surl = camel_url_to_string(aurl, CAMEL_URL_HIDE_ALL); + mail_session_add_password (surl, gtk_entry_get_text((GtkEntry *)mav->password)); + + camel_url_free(aurl); + g_free(surl); + } em_account_editor_commit (mav->edit); g_signal_emit (mav, signals[VIEW_CLOSE], 0); return; @@ -616,8 +636,24 @@ mail_account_view_construct (MailAccountView *view) em_account_editor_check (view->edit, mail_account_pages[0].path); view->pages[0]->done = TRUE; - if (e_shell_get_express_mode (e_shell_get_default ())) + if (e_shell_get_express_mode (e_shell_get_default ())) { + GtkWidget *table = em_account_editor_get_widget (view->edit, "identity_required_table"); + GtkWidget *label, *pwd; gtk_widget_hide (em_account_editor_get_widget (view->edit, "identity_optional_frame")); + + + if (!view->original) { + label = gtk_label_new (_("Password:")); + pwd = gtk_entry_new (); + gtk_entry_set_visibility ((GtkEntry *)pwd, FALSE); + gtk_widget_show(label); + gtk_widget_show(pwd); + gtk_table_attach ((GtkTable *)table, label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); + gtk_table_attach ((GtkTable *)table, pwd, 1, 2, 2, 3, GTK_FILL|GTK_EXPAND, 0, 0, 0); + + view->password = pwd; + } + } } MailAccountView * diff --git a/capplet/settings/mail-account-view.h b/capplet/settings/mail-account-view.h index 618dce5361..7d5153172b 100644 --- a/capplet/settings/mail-account-view.h +++ b/capplet/settings/mail-account-view.h @@ -75,6 +75,7 @@ typedef struct _MailAccountView { GtkWidget *wpages[6]; gint current_page; struct _EMAccountEditor *edit; + GtkWidget *password; MailAccountViewPrivate *priv; } MailAccountView; -- cgit From e9c4388490925de25b029fa0d6437a34a6386c05 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 21 Apr 2010 16:52:25 +0100 Subject: Fix ergonomic details, and prettify (for small screens at least) --- capplet/settings/mail-account-view.c | 55 ++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 25 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 07f4a7570e..413f755d66 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -209,11 +209,17 @@ create_review (MailAccountView *view) gtk_table_attach ((GtkTable *)table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); label = gtk_label_new (NULL); - gtk_label_set_markup ((GtkLabel *)label, _("Receiving details:")); + gtk_label_set_markup ((GtkLabel *)label, _("Details:")); gtk_widget_show (label); PACK_BOXF(label); gtk_table_attach ((GtkTable *)table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + label = gtk_label_new (NULL); + gtk_label_set_markup ((GtkLabel *)label, _("Receiving")); + gtk_widget_show (label); + PACK_BOXF(label); + gtk_table_attach ((GtkTable *)table, box, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + label = gtk_label_new (_("Server type:")); gtk_widget_show (label); PACK_BOX(label); @@ -257,47 +263,31 @@ create_review (MailAccountView *view) return NULL; label = gtk_label_new (NULL); - gtk_label_set_markup ((GtkLabel *)label, _("Sending details:")); + gtk_label_set_markup ((GtkLabel *)label, _("Sending")); gtk_widget_show (label); PACK_BOXF(label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 8, 9, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 2, 3, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); - label = gtk_label_new (_("Server type:")); - gtk_widget_show (label); - PACK_BOX(label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 9, 10, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); entry = gtk_label_new (url->protocol); gtk_widget_show(entry); PACK_BOX(entry) - gtk_table_attach ((GtkTable *)table, box, 1, 2, 9, 10, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 2, 3, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); - label = gtk_label_new (_("Server address:")); - gtk_widget_show (label); - PACK_BOX(label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 10, 11, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); entry = gtk_label_new (url->host); gtk_widget_show(entry); PACK_BOX(entry); - gtk_table_attach ((GtkTable *)table, box, 1, 2, 10, 11, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 2, 3, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); - label = gtk_label_new (_("Username:")); - gtk_widget_show (label); - PACK_BOX(label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 11, 12, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); entry = gtk_label_new (url->user); gtk_widget_show(entry); PACK_BOX(entry); - gtk_table_attach ((GtkTable *)table, box, 1, 2, 11, 12, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 2, 3, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); - label = gtk_label_new (_("Use encryption:")); - gtk_widget_show (label); - PACK_BOX(label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); enc = (gchar *)camel_url_get_param(url, "use_ssl"); entry = gtk_label_new (enc ? enc : _("never")); gtk_widget_show(entry); PACK_BOX(entry); - gtk_table_attach ((GtkTable *)table, box, 1, 2, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 2, 3, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); /* label = gtk_label_new (_("Organization:")); @@ -529,6 +519,9 @@ mav_construct_page(MailAccountView *view, MAVPageType type) gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 0); } page->next = gtk_button_new (); + gtk_widget_set_can_default (page->next, TRUE); + g_signal_connect (page->next, "hierarchy-changed", + G_CALLBACK (gtk_widget_grab_default), NULL); gtk_container_add ((GtkContainer *)page->next, box); gtk_widget_show_all(page->next); g_signal_connect(page->next, "clicked", G_CALLBACK(mav_next_pressed), view); @@ -605,10 +598,17 @@ emae_check_servers (const gchar *email) return sdata; } +static void +next_page (GtkWidget *entry, MailAccountView *mav) +{ + mav_next_pressed (NULL, mav); +} + static void mail_account_view_construct (MailAccountView *view) { gint i; + EShell *shell; view->scroll = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy ((GtkScrolledWindow *)view->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -636,16 +636,18 @@ mail_account_view_construct (MailAccountView *view) em_account_editor_check (view->edit, mail_account_pages[0].path); view->pages[0]->done = TRUE; - if (e_shell_get_express_mode (e_shell_get_default ())) { + shell = e_shell_get_default (); + if (!shell || e_shell_get_express_mode (shell)) { GtkWidget *table = em_account_editor_get_widget (view->edit, "identity_required_table"); GtkWidget *label, *pwd; gtk_widget_hide (em_account_editor_get_widget (view->edit, "identity_optional_frame")); - if (!view->original) { label = gtk_label_new (_("Password:")); pwd = gtk_entry_new (); gtk_entry_set_visibility ((GtkEntry *)pwd, FALSE); +/* gtk_entry_set_activates_default ((GtkEntry *)pwd, TRUE); */ + g_signal_connect (pwd, "activate", G_CALLBACK (next_page), view); gtk_widget_show(label); gtk_widget_show(pwd); gtk_table_attach ((GtkTable *)table, label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); @@ -654,6 +656,9 @@ mail_account_view_construct (MailAccountView *view) view->password = pwd; } } + + /* assume the full name is known from the system */ + gtk_widget_grab_focus (em_account_editor_get_widget (view->edit, "identity_address")); } MailAccountView * -- cgit From ae650132caebf75728020f95fd48c7cb9c32c047 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Thu, 22 Apr 2010 12:18:45 +0530 Subject: Create Google Calendar and Contacts account optionally while creating gmail accounts. --- capplet/settings/mail-account-view.c | 214 ++++++++++++++++++++++++++++++++++- 1 file changed, 210 insertions(+), 4 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 413f755d66..96ce317287 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -26,6 +26,9 @@ #include #include "mail-account-view.h" +#include +#include +#include #include #include "mail-view.h" #include "e-util/e-config.h" @@ -35,6 +38,16 @@ struct _MailAccountViewPrivate { GtkWidget *tab_str; + + GtkWidget *gcalendar; + GtkWidget *gcontacts; + GtkWidget *gmail_info_label; + + gboolean is_gmail; + gboolean do_gcontacts; + gboolean do_gcalendar; + + char *username; }; G_DEFINE_TYPE (MailAccountView, mail_account_view, GTK_TYPE_VBOX) @@ -67,12 +80,16 @@ mail_account_view_init (MailAccountView *shell) { shell->priv = g_new0(MailAccountViewPrivate, 1); + shell->priv->is_gmail = FALSE; + shell->priv->username = NULL; } static void mail_account_view_finalize (GObject *object) { - /*MailAccountView *shell = (MailAccountView *)object;*/ + MailAccountView *shell = (MailAccountView *)object; + + g_free(shell->priv->username); G_OBJECT_CLASS (mail_account_view_parent_class)->finalize (object); } @@ -169,6 +186,146 @@ save_account (MailAccountView *view) #define PACK_BOX(w) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 12); gtk_widget_show(box); #define PACK_BOXF(w) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 0); gtk_widget_show(box); +#define CALENDAR_CALDAV_URI "caldav://%s@www.google.com/calendar/dav/%s/events" +#define CALENDAR_LOCATION "://www.google.com/calendar/feeds/" +#define CALENDAR_DEFAULT_PATH "/private/full" +#define SELECTED_CALENDARS "/apps/evolution/calendar/display/selected_calendars" + +static gboolean +is_email (const gchar *address) +{ + /* This is supposed to check if the address's domain could be + an FQDN but alas, it's not worth the pain and suffering. */ + const gchar *at; + + at = strchr (address, '@'); + /* make sure we have an '@' and that it's not the first or last gchar */ + if (!at || at == address || *(at + 1) == '\0') + return FALSE; + + return TRUE; +} + +static gchar * +sanitize_user_mail (const gchar *user) +{ + if (!user) + return NULL; + + if (strstr (user, "%40") != NULL) { + return g_strdup (user); + } else if (!is_email (user)) { + return g_strconcat (user, "%40gmail.com", NULL); + } else { + gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (user) + 2)); + gchar *at = strchr (user, '@'); + + strncpy (tmp, user, at - user); + strcat (tmp, "%40"); + strcat (tmp, at + 1); + + return tmp; + } +} + +static void +setup_google_accounts (MailAccountView *mav) +{ + GConfClient *gconf = gconf_client_get_default (); + + mav->priv->do_gcontacts = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->gcontacts); + mav->priv->do_gcalendar = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->gcalendar); + + if (mav->priv->do_gcalendar) { + ESourceList *slist; + ESourceGroup *sgrp; + ESource *calendar; + char *sanitize_uname, *abs_uri, *rel_uri; + GSList *ids, *temp; + + slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); + sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); + + /* FIXME: Not sure if we should localize 'Calendar' */ + calendar = e_source_new ("Calendar", ""); + e_source_set_property (calendar, "ssl", "1"); + e_source_set_property (calendar, "refresh", "30"); + e_source_set_property (calendar, "auth", "1"); + e_source_set_property (calendar, "offline_sync", "1"); + e_source_set_property (calendar, "username", mav->priv->username); + e_source_set_property (calendar, "setup-username", mav->priv->username); + e_source_set_property (calendar, "default", "true"); + e_source_set_readonly (calendar, FALSE); + + sanitize_uname = sanitize_user_mail (mav->priv->username); + + abs_uri = g_strdup_printf (CALENDAR_CALDAV_URI, sanitize_uname, mav->priv->username); + e_source_set_absolute_uri (calendar, abs_uri); + + e_passwords_add_password (abs_uri, gtk_entry_get_text((GtkEntry *)mav->password)); + e_passwords_remember_password ("Calendar", abs_uri); + rel_uri = g_strconcat ("https", CALENDAR_LOCATION, sanitize_uname, CALENDAR_DEFAULT_PATH, NULL); + e_source_set_relative_uri (calendar, rel_uri); + + e_source_group_add_source (sgrp, calendar, -1); + e_source_list_sync (slist, NULL); + + ids = gconf_client_get_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL); + ids = g_slist_append (ids, g_strdup (e_source_peek_uid (calendar))); + gconf_client_set_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, ids, NULL); + temp = ids; + + for (; temp != NULL; temp = g_slist_next (temp)) + g_free (temp->data); + g_slist_free (ids); + + g_free(abs_uri); + g_free(rel_uri); + g_free(sanitize_uname); + g_object_unref(slist); + g_object_unref(sgrp); + g_object_unref(calendar); + } + + if (mav->priv->do_gcontacts) { + ESourceList *slist; + ESourceGroup *sgrp; + ESource *abook; + char *rel_uri;; + + slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" ); + + sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); + + /* FIXME: Not sure if we should localize 'Contacts' */ + abook = e_source_new ("Contacts", ""); + e_source_set_property (abook, "default", "true"); + e_source_set_property (abook, "offline_sync", "1"); + e_source_set_property (abook, "auth", "plain/password"); + e_source_set_property (abook, "use-ssl", "true"); + e_source_set_property (abook, "remember_password", "true"); + e_source_set_property (abook, "refresh-interval", "86400"); + e_source_set_property (abook, "completion", "true"); + e_source_set_property (abook, "username", mav->priv->username); + e_source_set_relative_uri (abook, mav->priv->username); + + rel_uri = g_strdup_printf("google://%s/", mav->priv->username); + e_passwords_add_password (rel_uri, gtk_entry_get_text((GtkEntry *)mav->password)); + e_passwords_remember_password ("Addressbook", rel_uri); + e_source_group_add_source (sgrp, abook, -1); + e_source_list_sync (slist, NULL); + + g_free(rel_uri); + g_object_unref(slist); + g_object_unref(sgrp); + g_object_unref(abook); + + + } + + g_object_unref (gconf); +} + static GtkWidget * create_review (MailAccountView *view) { @@ -257,6 +414,7 @@ create_review (MailAccountView *view) PACK_BOX(entry); gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + view->priv->username = g_strdup(url->user); camel_url_free(url); uri =(gchar *) e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_TRANSPORT_URL); if (!uri || (url = camel_url_new(uri, NULL)) == NULL) @@ -383,11 +541,15 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) /* Save the password ahead of time */ aurl = camel_url_new (account->source->url, NULL); surl = camel_url_to_string(aurl, CAMEL_URL_HIDE_ALL); - mail_session_add_password (surl, gtk_entry_get_text((GtkEntry *)mav->password)); - + e_passwords_add_password (surl, gtk_entry_get_text((GtkEntry *)mav->password)); + e_passwords_remember_password ("Mail", surl); camel_url_free(aurl); g_free(surl); } + + if (mav->priv->is_gmail && !mav->original) + setup_google_accounts (mav); + em_account_editor_commit (mav->edit); g_signal_emit (mav, signals[VIEW_CLOSE], 0); return; @@ -403,7 +565,8 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) if (mav->current_page == MAV_LAST - 1) { MAVPage *page = mav->pages[mav->current_page]; GtkWidget *tmp; - + EAccount *account = em_account_editor_get_modified_account(mav->edit); + if (page->main) gtk_widget_destroy (page->main); @@ -413,6 +576,49 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) gtk_box_pack_start((GtkBox *)page->main, tmp, FALSE, FALSE, 0); gtk_widget_show(tmp); gtk_box_pack_start((GtkBox *)page->box, page->main, FALSE, FALSE, 3); + + if (mav->priv->is_gmail) { + gtk_widget_destroy (mav->priv->gcontacts); + gtk_widget_destroy (mav->priv->gcalendar); + gtk_widget_destroy (mav->priv->gmail_info_label); + } + + if (mav->original == NULL && (g_strrstr(account->source->url, "gmail") || + g_strrstr(account->source->url, "googlemail"))) { + /* Google accounts*/ + GtkWidget *tmp; + mav->priv->is_gmail = TRUE; + printf("Google account: %s\n", account->source->url); + mav->priv->gcontacts = gtk_check_button_new_with_label (_("Setup Google contacts with Evolution")); + mav->priv->gcalendar = gtk_check_button_new_with_label (_("Setup Google calendar with Evolution")); + + gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->gcontacts, TRUE); + gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->gcalendar, TRUE); + + mav->priv->gmail_info_label = gtk_label_new (_("You need to enable IMAP access.")); + gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE); + + gtk_widget_show (mav->priv->gcontacts); + gtk_widget_show (mav->priv->gcalendar); + gtk_widget_show (mav->priv->gmail_info_label); + + tmp = gtk_label_new (NULL); + gtk_label_set_markup ((GtkLabel *)tmp, _("Google account settings:")); + gtk_widget_show(tmp); + +#define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 3); } + + PACK_IN_BOX(page->box,tmp,12); + PACK_IN_BOX(page->box,mav->priv->gcontacts,24); + PACK_IN_BOX(page->box,mav->priv->gcalendar,24); +#undef PACK_IN_BOX +#define PACK_IN_BOX(wid,child1,child2,num1,num2) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child1, FALSE, FALSE, num1); gtk_box_pack_start ((GtkBox *)tbox, child2, FALSE, FALSE, num2); gtk_widget_show_all (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 3); } + + PACK_IN_BOX(page->box,mav->priv->gmail_info_label,gtk_link_button_new("https://mail.google.com/mail/?ui=2&shva=1#settings/fwdandpop"), 24, 0); + + } else + mav->priv->is_gmail = FALSE; + } gtk_widget_show (mav->pages[mav->current_page]->box); -- cgit From ce1bcb611b9fec105cc1d05ff8e2846b02545908 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 22 Apr 2010 13:38:38 -0500 Subject: Reduce spacings in the mail capplet's Review page This makes the page fit in 1024x600 without having a vertical scrollbar. There was an extra 3 pixels between each row, added explicitly as ypadding when each widget was attached to its parent table. Now we just use the inter-row spacing from the table itself. Also, use a macro for each item's indentation instead of having the same magic value all over the place. Signed-off-by: Federico Mena Quintero --- capplet/settings/mail-account-view.c | 46 +++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 96ce317287..c44bd2ac71 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -326,6 +326,8 @@ setup_google_accounts (MailAccountView *mav) g_object_unref (gconf); } +#define INDENTATION 10 + static GtkWidget * create_review (MailAccountView *view) { @@ -345,74 +347,74 @@ create_review (MailAccountView *view) gtk_label_set_markup ((GtkLabel *)label, _("Personal details:")); gtk_widget_show (label); PACK_BOXF(label) - gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Name:")); gtk_widget_show (label); PACK_BOX(label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new(e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_NAME)); gtk_widget_show(entry); PACK_BOX(entry) - gtk_table_attach ((GtkTable *)table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Email address:")); gtk_widget_show (label); PACK_BOX(label) - gtk_table_attach ((GtkTable *)table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_ADDRESS)); gtk_widget_show(entry); PACK_BOX(entry) - gtk_table_attach ((GtkTable *)table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (NULL); gtk_label_set_markup ((GtkLabel *)label, _("Details:")); gtk_widget_show (label); PACK_BOXF(label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (NULL); gtk_label_set_markup ((GtkLabel *)label, _("Receiving")); gtk_widget_show (label); PACK_BOXF(label); - gtk_table_attach ((GtkTable *)table, box, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Server type:")); gtk_widget_show (label); PACK_BOX(label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->protocol); gtk_widget_show(entry); PACK_BOX(entry) - gtk_table_attach ((GtkTable *)table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Server address:")); gtk_widget_show (label); PACK_BOX(label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->host); gtk_widget_show(entry); PACK_BOX(entry); - gtk_table_attach ((GtkTable *)table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Username:")); gtk_widget_show (label); PACK_BOX(label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->user); gtk_widget_show(entry); PACK_BOX(entry); - gtk_table_attach ((GtkTable *)table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Use encryption:")); gtk_widget_show (label); PACK_BOX(label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); enc = (gchar *)camel_url_get_param(url, "use_ssl"); entry = gtk_label_new (enc ? enc : _("never")); gtk_widget_show(entry); PACK_BOX(entry); - gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); view->priv->username = g_strdup(url->user); camel_url_free(url); @@ -424,36 +426,36 @@ create_review (MailAccountView *view) gtk_label_set_markup ((GtkLabel *)label, _("Sending")); gtk_widget_show (label); PACK_BOXF(label); - gtk_table_attach ((GtkTable *)table, box, 2, 3, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 2, 3, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->protocol); gtk_widget_show(entry); PACK_BOX(entry) - gtk_table_attach ((GtkTable *)table, box, 2, 3, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 2, 3, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->host); gtk_widget_show(entry); PACK_BOX(entry); - gtk_table_attach ((GtkTable *)table, box, 2, 3, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 2, 3, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->user); gtk_widget_show(entry); PACK_BOX(entry); - gtk_table_attach ((GtkTable *)table, box, 2, 3, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 2, 3, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); enc = (gchar *)camel_url_get_param(url, "use_ssl"); entry = gtk_label_new (enc ? enc : _("never")); gtk_widget_show(entry); PACK_BOX(entry); - gtk_table_attach ((GtkTable *)table, box, 2, 3, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach ((GtkTable *)table, box, 2, 3, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); /* label = gtk_label_new (_("Organization:")); gtk_widget_show (label); entry = gtk_entry_new (); gtk_widget_show(entry); - gtk_table_attach (table, label, 0, 1, 3, 4, GTK_SHRINK, GTK_SHRINK, 10, 3); - gtk_table_attach (table, entry, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + gtk_table_attach (table, label, 0, 1, 3, 4, GTK_SHRINK, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach (table, entry, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); */ gtk_widget_show(table); -- cgit From 346a481edc9afb01f063f6ccb0e13fb6a043d22f Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 22 Apr 2010 14:54:56 -0500 Subject: Remove more ad-hoc spacings Signed-off-by: Federico Mena Quintero --- capplet/settings/mail-account-view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index c44bd2ac71..f4b31beada 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -608,13 +608,13 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) gtk_label_set_markup ((GtkLabel *)tmp, _("Google account settings:")); gtk_widget_show(tmp); -#define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 3); } +#define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } PACK_IN_BOX(page->box,tmp,12); PACK_IN_BOX(page->box,mav->priv->gcontacts,24); PACK_IN_BOX(page->box,mav->priv->gcalendar,24); #undef PACK_IN_BOX -#define PACK_IN_BOX(wid,child1,child2,num1,num2) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child1, FALSE, FALSE, num1); gtk_box_pack_start ((GtkBox *)tbox, child2, FALSE, FALSE, num2); gtk_widget_show_all (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 3); } +#define PACK_IN_BOX(wid,child1,child2,num1,num2) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child1, FALSE, FALSE, num1); gtk_box_pack_start ((GtkBox *)tbox, child2, FALSE, FALSE, num2); gtk_widget_show_all (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } PACK_IN_BOX(page->box,mav->priv->gmail_info_label,gtk_link_button_new("https://mail.google.com/mail/?ui=2&shva=1#settings/fwdandpop"), 24, 0); -- cgit From 64b2fe23c4733a10181b213a380cd361518d008b Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Mon, 26 Apr 2010 12:16:22 +0530 Subject: Create Google group at instances when it is not created by default --- capplet/settings/mail-account-view.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index f4b31beada..e343927336 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -245,6 +245,11 @@ setup_google_accounts (MailAccountView *mav) slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); + if (!sgrp) { + sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE); + } + + printf("Setting up Google Calendar: list:%p GoogleGrp: %p\n", slist, sgrp); /* FIXME: Not sure if we should localize 'Calendar' */ calendar = e_source_new ("Calendar", ""); @@ -285,7 +290,8 @@ setup_google_accounts (MailAccountView *mav) g_object_unref(slist); g_object_unref(sgrp); g_object_unref(calendar); - } + } else + printf("Not setting up Google Calendar\n"); if (mav->priv->do_gcontacts) { ESourceList *slist; -- cgit From b2121b1cf705447bdb3ac1708105b014cb6a8f3b Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Mon, 26 Apr 2010 15:18:32 +0530 Subject: Add yahoo calendars support. --- capplet/settings/mail-account-view.c | 187 ++++++++++++++++++++++++++++++++--- 1 file changed, 173 insertions(+), 14 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index e343927336..e25d144409 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -39,15 +39,18 @@ struct _MailAccountViewPrivate { GtkWidget *tab_str; - GtkWidget *gcalendar; + GtkWidget *calendar; GtkWidget *gcontacts; GtkWidget *gmail_info_label; gboolean is_gmail; + gboolean is_yahoo; gboolean do_gcontacts; - gboolean do_gcalendar; + gboolean do_calendar; char *username; + + GtkWidget *yahoo_cal_entry; }; G_DEFINE_TYPE (MailAccountView, mail_account_view, GTK_TYPE_VBOX) @@ -81,6 +84,7 @@ mail_account_view_init (MailAccountView *shell) shell->priv = g_new0(MailAccountViewPrivate, 1); shell->priv->is_gmail = FALSE; + shell->priv->is_yahoo = FALSE; shell->priv->username = NULL; } @@ -187,10 +191,10 @@ save_account (MailAccountView *view) #define PACK_BOXF(w) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 0); gtk_widget_show(box); #define CALENDAR_CALDAV_URI "caldav://%s@www.google.com/calendar/dav/%s/events" -#define CALENDAR_LOCATION "://www.google.com/calendar/feeds/" +#define GMAIL_CALENDAR_LOCATION "://www.google.com/calendar/feeds/" #define CALENDAR_DEFAULT_PATH "/private/full" #define SELECTED_CALENDARS "/apps/evolution/calendar/display/selected_calendars" - +#define YAHOO_CALENDAR_LOCATION "%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s" static gboolean is_email (const gchar *address) { @@ -228,15 +232,121 @@ sanitize_user_mail (const gchar *user) } } +static void +setup_yahoo_account (MailAccountView *mav) +{ + GConfClient *gconf = gconf_client_get_default (); + + mav->priv->do_gcontacts = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->gcontacts); + mav->priv->do_calendar = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->calendar); + + if (mav->priv->do_calendar) { + ESourceList *slist; + ESourceGroup *sgrp; + ESource *calendar; + char *sanitize_uname, *abs_uri, *rel_uri; + GSList *ids, *temp; + const char *email = e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_ID_ADDRESS); + + slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); + sgrp = e_source_list_peek_group_by_base_uri (slist, "caldav://"); + if (!sgrp) { + sgrp = e_source_list_ensure_group (slist, _("CalDAV"), "caldav://", TRUE); + } + + printf("Setting up Yahoo Calendar: list:%p CalDAVGrp: %p\n", slist, sgrp); + + /* FIXME: Not sure if we should localize 'Calendar' */ + calendar = e_source_new ("Yahoo", ""); + e_source_set_property (calendar, "ssl", "1"); + e_source_set_property (calendar, "refresh", "30"); + e_source_set_property (calendar, "refresh-type", "0"); + e_source_set_property (calendar, "auth", "1"); + e_source_set_property (calendar, "offline_sync", "1"); + e_source_set_property (calendar, "username", email); + e_source_set_property (calendar, "default", "true"); + e_source_set_property (calendar, "alarm", "true"); + + e_source_set_readonly (calendar, FALSE); + + sanitize_uname = sanitize_user_mail (email); + + abs_uri = g_strdup_printf ("caldav://%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s/", sanitize_uname, email, gtk_entry_get_text((GtkEntry *)mav->priv->yahoo_cal_entry)); + e_passwords_add_password (abs_uri, gtk_entry_get_text((GtkEntry *)mav->password)); + e_passwords_remember_password ("Calendar", abs_uri); + + rel_uri = g_strdup_printf (YAHOO_CALENDAR_LOCATION, sanitize_uname, email, gtk_entry_get_text((GtkEntry *)mav->priv->yahoo_cal_entry)); + e_source_set_relative_uri (calendar, rel_uri); + + e_source_group_add_source (sgrp, calendar, -1); + e_source_list_sync (slist, NULL); + + ids = gconf_client_get_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL); + ids = g_slist_append (ids, g_strdup (e_source_peek_uid (calendar))); + gconf_client_set_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, ids, NULL); + temp = ids; + + for (; temp != NULL; temp = g_slist_next (temp)) + g_free (temp->data); + g_slist_free (ids); + + g_free(abs_uri); + g_free(rel_uri); + g_free(sanitize_uname); + g_object_unref(slist); + g_object_unref(sgrp); + g_object_unref(calendar); + } else + printf("Not setting up Yahoo Calendar\n"); + + if (mav->priv->do_gcontacts) { + ESourceList *slist; + ESourceGroup *sgrp; + ESource *abook; + char *rel_uri;; + + slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" ); + + sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); + + /* FIXME: Not sure if we should localize 'Contacts' */ + abook = e_source_new ("Contacts", ""); + e_source_set_property (abook, "default", "true"); + e_source_set_property (abook, "offline_sync", "1"); + e_source_set_property (abook, "auth", "plain/password"); + e_source_set_property (abook, "use-ssl", "true"); + e_source_set_property (abook, "remember_password", "true"); + e_source_set_property (abook, "refresh-interval", "86400"); + e_source_set_property (abook, "completion", "true"); + e_source_set_property (abook, "username", mav->priv->username); + e_source_set_relative_uri (abook, mav->priv->username); + + rel_uri = g_strdup_printf("google://%s/", mav->priv->username); + e_passwords_add_password (rel_uri, gtk_entry_get_text((GtkEntry *)mav->password)); + e_passwords_remember_password ("Addressbook", rel_uri); + e_source_group_add_source (sgrp, abook, -1); + e_source_list_sync (slist, NULL); + + g_free(rel_uri); + g_object_unref(slist); + g_object_unref(sgrp); + g_object_unref(abook); + + + } + + g_object_unref (gconf); +} + static void setup_google_accounts (MailAccountView *mav) { GConfClient *gconf = gconf_client_get_default (); mav->priv->do_gcontacts = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->gcontacts); - mav->priv->do_gcalendar = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->gcalendar); + mav->priv->do_calendar = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->calendar); - if (mav->priv->do_gcalendar) { + if (mav->priv->do_calendar) { ESourceList *slist; ESourceGroup *sgrp; ESource *calendar; @@ -269,7 +379,7 @@ setup_google_accounts (MailAccountView *mav) e_passwords_add_password (abs_uri, gtk_entry_get_text((GtkEntry *)mav->password)); e_passwords_remember_password ("Calendar", abs_uri); - rel_uri = g_strconcat ("https", CALENDAR_LOCATION, sanitize_uname, CALENDAR_DEFAULT_PATH, NULL); + rel_uri = g_strconcat ("https", GMAIL_CALENDAR_LOCATION, sanitize_uname, CALENDAR_DEFAULT_PATH, NULL); e_source_set_relative_uri (calendar, rel_uri); e_source_group_add_source (sgrp, calendar, -1); @@ -557,6 +667,8 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) if (mav->priv->is_gmail && !mav->original) setup_google_accounts (mav); + else if (mav->priv->is_yahoo && !mav->original) + setup_yahoo_account (mav); em_account_editor_commit (mav->edit); g_signal_emit (mav, signals[VIEW_CLOSE], 0); @@ -587,8 +699,12 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) if (mav->priv->is_gmail) { gtk_widget_destroy (mav->priv->gcontacts); - gtk_widget_destroy (mav->priv->gcalendar); + gtk_widget_destroy (mav->priv->calendar); + gtk_widget_destroy (mav->priv->gmail_info_label); + } else if (mav->priv->is_yahoo) { + gtk_widget_destroy (mav->priv->calendar); gtk_widget_destroy (mav->priv->gmail_info_label); + gtk_widget_destroy (mav->priv->yahoo_cal_entry); } if (mav->original == NULL && (g_strrstr(account->source->url, "gmail") || @@ -596,18 +712,18 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) /* Google accounts*/ GtkWidget *tmp; mav->priv->is_gmail = TRUE; - printf("Google account: %s\n", account->source->url); + mav->priv->gcontacts = gtk_check_button_new_with_label (_("Setup Google contacts with Evolution")); - mav->priv->gcalendar = gtk_check_button_new_with_label (_("Setup Google calendar with Evolution")); + mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Google calendar with Evolution")); gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->gcontacts, TRUE); - gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->gcalendar, TRUE); + gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE); mav->priv->gmail_info_label = gtk_label_new (_("You need to enable IMAP access.")); gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE); gtk_widget_show (mav->priv->gcontacts); - gtk_widget_show (mav->priv->gcalendar); + gtk_widget_show (mav->priv->calendar); gtk_widget_show (mav->priv->gmail_info_label); tmp = gtk_label_new (NULL); @@ -618,14 +734,57 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) PACK_IN_BOX(page->box,tmp,12); PACK_IN_BOX(page->box,mav->priv->gcontacts,24); - PACK_IN_BOX(page->box,mav->priv->gcalendar,24); + PACK_IN_BOX(page->box,mav->priv->calendar,24); #undef PACK_IN_BOX #define PACK_IN_BOX(wid,child1,child2,num1,num2) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child1, FALSE, FALSE, num1); gtk_box_pack_start ((GtkBox *)tbox, child2, FALSE, FALSE, num2); gtk_widget_show_all (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } PACK_IN_BOX(page->box,mav->priv->gmail_info_label,gtk_link_button_new("https://mail.google.com/mail/?ui=2&shva=1#settings/fwdandpop"), 24, 0); +#undef PACK_IN_BOX + } else if (mav->original == NULL && + (g_strrstr(account->source->url, "yahoo.") || + g_strrstr(account->source->url, "ymail.") || + g_strrstr(account->source->url, "rocketmail."))) { + /* Yahoo accounts*/ + GtkWidget *tmp; + char *cal_name; + GtkWidget *tmpbox; + + mav->priv->is_yahoo = TRUE; + printf("Google account: %s\n", account->source->url); + mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Yahoo calendar with Evolution")); + + gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE); + + mav->priv->gmail_info_label = gtk_label_new (_("Yahoo calendars are named as firstname_lastname. We have tried to form the calendar name. So please confirm and re-enter the calendar name if it is not correct.")); + gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE); + + gtk_widget_show (mav->priv->calendar); + gtk_widget_show (mav->priv->gmail_info_label); + + tmp = gtk_label_new (NULL); + gtk_label_set_markup ((GtkLabel *)tmp, _("Yahoo account settings:")); + gtk_widget_show(tmp); + +#define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } +#define PACK_IN_BOX_AND_TEXT(txt, child,num) { GtkWidget *txtlbl = gtk_label_new (txt); tmpbox = gtk_hbox_new (FALSE, 12); gtk_box_pack_start ((GtkBox *)tmpbox, txtlbl, FALSE, FALSE, num); gtk_box_pack_start ((GtkBox *)tmpbox, child, FALSE, FALSE, num); gtk_widget_show_all (tmpbox);} - } else + PACK_IN_BOX(page->box,tmp,12); + PACK_IN_BOX(page->box,mav->priv->calendar,24); + + mav->priv->yahoo_cal_entry = gtk_entry_new (); + gtk_widget_show (mav->priv->yahoo_cal_entry); + PACK_IN_BOX(page->box,mav->priv->gmail_info_label, 24); + PACK_IN_BOX_AND_TEXT(_("Yahoo Calendar name:"), mav->priv->yahoo_cal_entry, 0); + PACK_IN_BOX(page->box, tmpbox, 24); + cal_name = g_strdup(e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_ID_NAME)); + cal_name = g_strdelimit(cal_name, " ", '_'); + gtk_entry_set_text ((GtkEntry *)mav->priv->yahoo_cal_entry, cal_name); + g_free (cal_name); +#undef PACK_IN_BOX + } else { mav->priv->is_gmail = FALSE; + mav->priv->is_yahoo = FALSE; + } } -- cgit From 7ef34bfaae3e776101ff086bfb18494869e39e55 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 26 Apr 2010 12:33:02 +0100 Subject: equivocate on mail recommendation --- capplet/settings/mail-account-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index e25d144409..1446923c5a 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -719,7 +719,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->gcontacts, TRUE); gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE); - mav->priv->gmail_info_label = gtk_label_new (_("You need to enable IMAP access.")); + mav->priv->gmail_info_label = gtk_label_new (_("You may need to enable IMAP access.")); gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE); gtk_widget_show (mav->priv->gcontacts); -- cgit From 4aa2552cb46f0daa67e135231f82f7d5403e2d19 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Fri, 7 May 2010 13:55:33 +0530 Subject: Don't ask for password while editing accounts. --- capplet/settings/mail-account-view.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 1446923c5a..a6751b9a1b 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -166,6 +166,8 @@ validate_identity (MailAccountView *view) return ERROR_NO_FULLNAME; if (!email || !*email) return ERROR_NO_EMAIL; + if (view->original) /* We don't query/store pwd on edit. */ + return 0; if (!pwd || !*pwd) return ERROR_NO_PASSWORD; -- cgit From 96538878911586a9e9ca26b81e1916c04e538980 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 May 2010 10:15:32 -0400 Subject: Coding style and whitespace cleanup. --- capplet/settings/anjal-mail-view.c | 2 +- capplet/settings/mail-account-view.c | 86 +++++++++++++++++------------------ capplet/settings/mail-guess-servers.c | 4 +- 3 files changed, 45 insertions(+), 47 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/anjal-mail-view.c b/capplet/settings/anjal-mail-view.c index 99ff93a065..9f96bcd6ef 100644 --- a/capplet/settings/anjal-mail-view.c +++ b/capplet/settings/anjal-mail-view.c @@ -56,7 +56,7 @@ anjal_mail_view_finalize (GObject *object) G_OBJECT_CLASS (anjal_mail_view_parent_class)->finalize (object); } -static void +static void view_set_folder_uri (AnjalMailView *mail_view, const gchar *uri) { } diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index a6751b9a1b..cd47ae5223 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -48,7 +48,7 @@ struct _MailAccountViewPrivate { gboolean do_gcontacts; gboolean do_calendar; - char *username; + gchar *username; GtkWidget *yahoo_cal_entry; }; @@ -246,10 +246,10 @@ setup_yahoo_account (MailAccountView *mav) ESourceList *slist; ESourceGroup *sgrp; ESource *calendar; - char *sanitize_uname, *abs_uri, *rel_uri; + gchar *sanitize_uname, *abs_uri, *rel_uri; GSList *ids, *temp; - const char *email = e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_ID_ADDRESS); - + const gchar *email = e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_ID_ADDRESS); + slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); sgrp = e_source_list_peek_group_by_base_uri (slist, "caldav://"); if (!sgrp) { @@ -259,20 +259,20 @@ setup_yahoo_account (MailAccountView *mav) printf("Setting up Yahoo Calendar: list:%p CalDAVGrp: %p\n", slist, sgrp); /* FIXME: Not sure if we should localize 'Calendar' */ - calendar = e_source_new ("Yahoo", ""); + calendar = e_source_new ("Yahoo", ""); e_source_set_property (calendar, "ssl", "1"); e_source_set_property (calendar, "refresh", "30"); - e_source_set_property (calendar, "refresh-type", "0"); + e_source_set_property (calendar, "refresh-type", "0"); e_source_set_property (calendar, "auth", "1"); e_source_set_property (calendar, "offline_sync", "1"); e_source_set_property (calendar, "username", email); e_source_set_property (calendar, "default", "true"); e_source_set_property (calendar, "alarm", "true"); - + e_source_set_readonly (calendar, FALSE); - + sanitize_uname = sanitize_user_mail (email); - + abs_uri = g_strdup_printf ("caldav://%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s/", sanitize_uname, email, gtk_entry_get_text((GtkEntry *)mav->priv->yahoo_cal_entry)); e_passwords_add_password (abs_uri, gtk_entry_get_text((GtkEntry *)mav->password)); e_passwords_remember_password ("Calendar", abs_uri); @@ -290,7 +290,7 @@ setup_yahoo_account (MailAccountView *mav) for (; temp != NULL; temp = g_slist_next (temp)) g_free (temp->data); - g_slist_free (ids); + g_slist_free (ids); g_free(abs_uri); g_free(rel_uri); @@ -305,14 +305,14 @@ setup_yahoo_account (MailAccountView *mav) ESourceList *slist; ESourceGroup *sgrp; ESource *abook; - char *rel_uri;; + gchar *rel_uri;; slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" ); - + sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); - + /* FIXME: Not sure if we should localize 'Contacts' */ - abook = e_source_new ("Contacts", ""); + abook = e_source_new ("Contacts", ""); e_source_set_property (abook, "default", "true"); e_source_set_property (abook, "offline_sync", "1"); e_source_set_property (abook, "auth", "plain/password"); @@ -322,7 +322,7 @@ setup_yahoo_account (MailAccountView *mav) e_source_set_property (abook, "completion", "true"); e_source_set_property (abook, "username", mav->priv->username); e_source_set_relative_uri (abook, mav->priv->username); - + rel_uri = g_strdup_printf("google://%s/", mav->priv->username); e_passwords_add_password (rel_uri, gtk_entry_get_text((GtkEntry *)mav->password)); e_passwords_remember_password ("Addressbook", rel_uri); @@ -334,7 +334,6 @@ setup_yahoo_account (MailAccountView *mav) g_object_unref(sgrp); g_object_unref(abook); - } g_object_unref (gconf); @@ -352,9 +351,9 @@ setup_google_accounts (MailAccountView *mav) ESourceList *slist; ESourceGroup *sgrp; ESource *calendar; - char *sanitize_uname, *abs_uri, *rel_uri; + gchar *sanitize_uname, *abs_uri, *rel_uri; GSList *ids, *temp; - + slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); if (!sgrp) { @@ -364,13 +363,13 @@ setup_google_accounts (MailAccountView *mav) printf("Setting up Google Calendar: list:%p GoogleGrp: %p\n", slist, sgrp); /* FIXME: Not sure if we should localize 'Calendar' */ - calendar = e_source_new ("Calendar", ""); + calendar = e_source_new ("Calendar", ""); e_source_set_property (calendar, "ssl", "1"); e_source_set_property (calendar, "refresh", "30"); e_source_set_property (calendar, "auth", "1"); e_source_set_property (calendar, "offline_sync", "1"); e_source_set_property (calendar, "username", mav->priv->username); - e_source_set_property (calendar, "setup-username", mav->priv->username); + e_source_set_property (calendar, "setup-username", mav->priv->username); e_source_set_property (calendar, "default", "true"); e_source_set_readonly (calendar, FALSE); @@ -378,7 +377,7 @@ setup_google_accounts (MailAccountView *mav) abs_uri = g_strdup_printf (CALENDAR_CALDAV_URI, sanitize_uname, mav->priv->username); e_source_set_absolute_uri (calendar, abs_uri); - + e_passwords_add_password (abs_uri, gtk_entry_get_text((GtkEntry *)mav->password)); e_passwords_remember_password ("Calendar", abs_uri); rel_uri = g_strconcat ("https", GMAIL_CALENDAR_LOCATION, sanitize_uname, CALENDAR_DEFAULT_PATH, NULL); @@ -394,7 +393,7 @@ setup_google_accounts (MailAccountView *mav) for (; temp != NULL; temp = g_slist_next (temp)) g_free (temp->data); - g_slist_free (ids); + g_slist_free (ids); g_free(abs_uri); g_free(rel_uri); @@ -409,14 +408,14 @@ setup_google_accounts (MailAccountView *mav) ESourceList *slist; ESourceGroup *sgrp; ESource *abook; - char *rel_uri;; + gchar *rel_uri;; slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" ); - + sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); - + /* FIXME: Not sure if we should localize 'Contacts' */ - abook = e_source_new ("Contacts", ""); + abook = e_source_new ("Contacts", ""); e_source_set_property (abook, "default", "true"); e_source_set_property (abook, "offline_sync", "1"); e_source_set_property (abook, "auth", "plain/password"); @@ -426,7 +425,7 @@ setup_google_accounts (MailAccountView *mav) e_source_set_property (abook, "completion", "true"); e_source_set_property (abook, "username", mav->priv->username); e_source_set_relative_uri (abook, mav->priv->username); - + rel_uri = g_strdup_printf("google://%s/", mav->priv->username); e_passwords_add_password (rel_uri, gtk_entry_get_text((GtkEntry *)mav->password)); e_passwords_remember_password ("Addressbook", rel_uri); @@ -438,7 +437,6 @@ setup_google_accounts (MailAccountView *mav) g_object_unref(sgrp); g_object_unref(abook); - } g_object_unref (gconf); @@ -657,7 +655,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) if (!mav->original) { EAccount *account = em_account_editor_get_modified_account(mav->edit); CamelURL *aurl; - char *surl; + gchar *surl; /* Save the password ahead of time */ aurl = camel_url_new (account->source->url, NULL); surl = camel_url_to_string(aurl, CAMEL_URL_HIDE_ALL); @@ -667,7 +665,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) g_free(surl); } - if (mav->priv->is_gmail && !mav->original) + if (mav->priv->is_gmail && !mav->original) setup_google_accounts (mav); else if (mav->priv->is_yahoo && !mav->original) setup_yahoo_account (mav); @@ -688,7 +686,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) MAVPage *page = mav->pages[mav->current_page]; GtkWidget *tmp; EAccount *account = em_account_editor_get_modified_account(mav->edit); - + if (page->main) gtk_widget_destroy (page->main); @@ -698,7 +696,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) gtk_box_pack_start((GtkBox *)page->main, tmp, FALSE, FALSE, 0); gtk_widget_show(tmp); gtk_box_pack_start((GtkBox *)page->box, page->main, FALSE, FALSE, 3); - + if (mav->priv->is_gmail) { gtk_widget_destroy (mav->priv->gcontacts); gtk_widget_destroy (mav->priv->calendar); @@ -717,19 +715,19 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) mav->priv->gcontacts = gtk_check_button_new_with_label (_("Setup Google contacts with Evolution")); mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Google calendar with Evolution")); - + gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->gcontacts, TRUE); gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE); mav->priv->gmail_info_label = gtk_label_new (_("You may need to enable IMAP access.")); gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE); - + gtk_widget_show (mav->priv->gcontacts); gtk_widget_show (mav->priv->calendar); gtk_widget_show (mav->priv->gmail_info_label); - + tmp = gtk_label_new (NULL); - gtk_label_set_markup ((GtkLabel *)tmp, _("Google account settings:")); + gtk_label_set_markup ((GtkLabel *)tmp, _("Google account settings:")); gtk_widget_show(tmp); #define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } @@ -742,29 +740,29 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) PACK_IN_BOX(page->box,mav->priv->gmail_info_label,gtk_link_button_new("https://mail.google.com/mail/?ui=2&shva=1#settings/fwdandpop"), 24, 0); #undef PACK_IN_BOX - } else if (mav->original == NULL && + } else if (mav->original == NULL && (g_strrstr(account->source->url, "yahoo.") || g_strrstr(account->source->url, "ymail.") || g_strrstr(account->source->url, "rocketmail."))) { /* Yahoo accounts*/ GtkWidget *tmp; - char *cal_name; + gchar *cal_name; GtkWidget *tmpbox; mav->priv->is_yahoo = TRUE; printf("Google account: %s\n", account->source->url); mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Yahoo calendar with Evolution")); - + gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE); mav->priv->gmail_info_label = gtk_label_new (_("Yahoo calendars are named as firstname_lastname. We have tried to form the calendar name. So please confirm and re-enter the calendar name if it is not correct.")); gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE); - + gtk_widget_show (mav->priv->calendar); gtk_widget_show (mav->priv->gmail_info_label); - + tmp = gtk_label_new (NULL); - gtk_label_set_markup ((GtkLabel *)tmp, _("Yahoo account settings:")); + gtk_label_set_markup ((GtkLabel *)tmp, _("Yahoo account settings:")); gtk_widget_show(tmp); #define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } @@ -1013,7 +1011,7 @@ mail_account_view_construct (MailAccountView *view) shell = e_shell_get_default (); if (!shell || e_shell_get_express_mode (shell)) { - GtkWidget *table = em_account_editor_get_widget (view->edit, "identity_required_table"); + GtkWidget *table = em_account_editor_get_widget (view->edit, "identity_required_table"); GtkWidget *label, *pwd; gtk_widget_hide (em_account_editor_get_widget (view->edit, "identity_optional_frame")); @@ -1027,7 +1025,7 @@ mail_account_view_construct (MailAccountView *view) gtk_widget_show(pwd); gtk_table_attach ((GtkTable *)table, label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); gtk_table_attach ((GtkTable *)table, pwd, 1, 2, 2, 3, GTK_FILL|GTK_EXPAND, 0, 0, 0); - + view->password = pwd; } } diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index f94fbb90e6..0a5f07d75b 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -131,7 +131,7 @@ handle_incoming (xmlNodePtr head, EmailProvider *provider) } else if (strcmp ((gchar *)node->name, "username") == 0) { provider->recv_username = xml_to_gchar(xmlNodeGetContent(node), provider); } else if (strcmp ((gchar *)node->name, "authentication") == 0) { - provider->recv_auth = xml_to_gchar(xmlNodeGetContent(node), provider); + provider->recv_auth = xml_to_gchar(xmlNodeGetContent(node), provider); } node = node->next; @@ -155,7 +155,7 @@ handle_outgoing (xmlNodePtr head, EmailProvider *provider) } else if (strcmp ((gchar *)node->name, "username") == 0) { provider->send_username = xml_to_gchar(xmlNodeGetContent(node), provider); } else if (strcmp ((gchar *)node->name, "authentication") == 0) { - provider->send_auth = xml_to_gchar(xmlNodeGetContent(node), provider); + provider->send_auth = xml_to_gchar(xmlNodeGetContent(node), provider); } node = node->next; -- cgit