From 41f0d7117eb958bd4a153c27e3cd0a58e14f4d75 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 5 Nov 2011 01:21:10 -0400 Subject: Adapt to CamelOperation API changes. --- plugins/pst-import/pst-importer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 7ef82d450e..d4054b573e 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -798,7 +798,6 @@ static void pst_import_folders (PstImporter *m, pst_desc_tree *topitem) { - CamelOperation *co = CAMEL_OPERATION (m->cancellable); GHashTable *node_to_folderuri; /* pointers of hierarchy nodes, to them associated folder uris */ pst_desc_tree *d_ptr; @@ -809,7 +808,7 @@ pst_import_folders (PstImporter *m, g_hash_table_insert (node_to_folderuri, topitem, g_strdup (m->folder_uri)); /* Walk through folder tree */ - while (d_ptr != NULL && (camel_operation_cancel_check (co) == FALSE)) { + while (d_ptr != NULL && (g_cancellable_is_cancelled (m->cancellable) == FALSE)) { gchar *previous_folder = NULL; m->position++; -- cgit v1.2.3 From bed7c0f05a4b4d60d35fd5e8ca1ade1e8225aae2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 3 Nov 2011 23:36:30 -0400 Subject: EMAccountEditor: Start using CamelNetworkSettings. Instead of stuffing host/port/user/etc into CamelURLs. To enforce this in 3rd party extensions, remove EAccounts from EMConfigTargetAccount and rename it EMConfigTargetSettings with the following struct members: const gchar *email_address; const gchar *storage_protocol; CamelSettings *storage_settings; const gchar *transport_protocol; CamelSettings *transport_settings; --- plugins/backup-restore/backup-restore.c | 8 +++--- .../org-gnome-backup-restore.eplug.xml | 2 +- plugins/imap-features/imap-headers.c | 32 ++++++++++------------ .../org-gnome-imap-features.eplug.xml | 2 +- 4 files changed, 21 insertions(+), 23 deletions(-) (limited to 'plugins') diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index acef0ae223..1a389703e9 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -52,9 +52,9 @@ gboolean e_plugin_ui_init (GtkUIManager *ui_manager, GtkWidget * backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data); void backup_restore_commit (EPlugin *ep, - EMConfigTargetAccount *target); + EMConfigTargetSettings *target); void backup_restore_abort (EPlugin *ep, - EMConfigTargetAccount *target); + EMConfigTargetSettings *target); typedef enum _br_flags { BR_OK = 1 << 0, @@ -434,7 +434,7 @@ backup_restore_page (EPlugin *ep, void backup_restore_commit (EPlugin *ep, - EMConfigTargetAccount *target) + EMConfigTargetSettings *target) { GObject *assistant; gchar *file; @@ -456,7 +456,7 @@ backup_restore_commit (EPlugin *ep, void backup_restore_abort (EPlugin *ep, - EMConfigTargetAccount *target) + EMConfigTargetSettings *target) { /* Nothing really */ } diff --git a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml index 653ad6299f..4899b2dd8a 100644 --- a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml +++ b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml @@ -23,7 +23,7 @@ - + diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index a496106372..f09f880b36 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -78,18 +78,17 @@ void imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data) { - EMConfigTargetAccount *target_account; + EMConfigTargetSettings *target; CamelFetchHeadersType fetch_headers; - CamelSettings *settings; - EAccount *modified_account; gboolean use_imap = g_getenv ("USE_IMAP") != NULL; + const gchar *protocol; - target_account = (EMConfigTargetAccount *) data->config->target; - modified_account = target_account->modified_account; - settings = target_account->settings; + target = (EMConfigTargetSettings *) data->config->target; + protocol = target->storage_protocol; + + if (g_strcmp0 (protocol, "imap") == 0 || + (use_imap && g_strcmp0 (protocol, "groupwise") == 0)) { - if (g_str_has_prefix (modified_account->source->url, "imap://") || - (use_imap && g_str_has_prefix (modified_account->source->url, "groupwise://"))) { GtkTreeModel *model; GtkTreeIter iter; gint n_children; @@ -123,7 +122,7 @@ imap_headers_commit (EPlugin *efp, fetch_headers = CAMEL_FETCH_HEADERS_BASIC_AND_MAILING_LIST; g_object_set ( - settings, + target->storage_settings, "fetch-headers", fetch_headers, "fetch-headers-extra", strv, NULL); @@ -249,9 +248,7 @@ GtkWidget * org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data) { - EMConfigTargetAccount *target_account; - CamelSettings *settings; - EAccount *account; + EMConfigTargetSettings *target; GtkWidget *vbox; GtkBuilder *builder; GtkWidget *button; @@ -262,19 +259,20 @@ org_gnome_imap_headers (EPlugin *epl, CamelFetchHeadersType fetch_headers = 0; gchar **extra_headers = NULL; gboolean use_imap = g_getenv ("USE_IMAP") != NULL; + const gchar *protocol; guint ii, length = 0; ui = g_new0 (EPImapFeaturesData, 1); - target_account = (EMConfigTargetAccount *) data->config->target; - account = target_account->modified_account; - settings = target_account->settings; + target = (EMConfigTargetSettings *) data->config->target; + protocol = target->storage_protocol; - if (!g_str_has_prefix (account->source->url, "imap://") && !(use_imap && g_str_has_prefix (account->source->url, "groupwise://"))) + if (g_strcmp0 (protocol, "imap") != 0 && + !(use_imap && g_strcmp0 (protocol, "groupwise") == 0)) return NULL; g_object_get ( - settings, + target->storage_settings, "fetch-headers", &fetch_headers, "fetch-headers-extra", &extra_headers, NULL); diff --git a/plugins/imap-features/org-gnome-imap-features.eplug.xml b/plugins/imap-features/org-gnome-imap-features.eplug.xml index fdbfdc78ef..c4d27bddd0 100644 --- a/plugins/imap-features/org-gnome-imap-features.eplug.xml +++ b/plugins/imap-features/org-gnome-imap-features.eplug.xml @@ -8,7 +8,7 @@ + target="settings" commit = "imap_headers_commit" abort="imap_headers_abort"> -- cgit v1.2.3