aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-04-25 22:16:00 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-04-25 22:16:00 +0800
commitfaf1c14c11f3e6026f786e9587715c10b13c723e (patch)
tree3dbf5816532cbea2510b4438c7c40d91fc426d3a /mail
parent86fdd3a1cba7c156cfa127322e258f5636b45a99 (diff)
downloadgsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.gz
gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.zst
gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.zip
Manual conflict resolution
Diffstat (limited to 'mail')
-rw-r--r--mail/e-mail-shell-module.c3
-rw-r--r--mail/e-mail-shell-view-actions.c8
-rw-r--r--mail/em-folder-selector.c4
-rw-r--r--mail/em-folder-utils.c1
-rw-r--r--mail/em-folder-utils.h5
-rw-r--r--mail/em-utils.c1
-rw-r--r--mail/mail-config.c98
-rw-r--r--mail/mail-folder-cache.c9
-rw-r--r--mail/mail-session.c6
-rw-r--r--mail/message-list.c3
10 files changed, 24 insertions, 114 deletions
diff --git a/mail/e-mail-shell-module.c b/mail/e-mail-shell-module.c
index 35bde6fed5..4a0fcf0b38 100644
--- a/mail/e-mail-shell-module.c
+++ b/mail/e-mail-shell-module.c
@@ -425,7 +425,8 @@ action_mail_folder_new_cb (GtkAction *action,
folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar);
exit:
- em_folder_utils_create_folder (NULL, folder_tree);
+ em_folder_utils_create_folder (
+ NULL, folder_tree, GTK_WINDOW (shell_window));
}
static void
diff --git a/mail/e-mail-shell-view-actions.c b/mail/e-mail-shell-view-actions.c
index f9235a6104..0355a966f2 100644
--- a/mail/e-mail-shell-view-actions.c
+++ b/mail/e-mail-shell-view-actions.c
@@ -246,16 +246,22 @@ static void
action_mail_folder_new_cb (GtkAction *action,
EMailShellView *mail_shell_view)
{
+ EShellView *shell_view;
+ EShellWindow *shell_window;
EMailShellSidebar *mail_shell_sidebar;
CamelFolderInfo *folder_info;
EMFolderTree *folder_tree;
+ shell_view = E_SHELL_VIEW (mail_shell_view);
+ shell_window = e_shell_view_get_shell_window (shell_view);
+
mail_shell_sidebar = mail_shell_view->priv->mail_shell_sidebar;
folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar);
folder_info = em_folder_tree_get_selected_folder_info (folder_tree);
g_return_if_fail (folder_info != NULL);
- em_folder_utils_create_folder (folder_info, folder_tree);
+ em_folder_utils_create_folder (
+ folder_info, folder_tree, GTK_WINDOW (shell_window));
camel_folder_info_free (folder_info);
}
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 32eac59d39..1f5140701a 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -123,7 +123,9 @@ emfs_response (GtkWidget *dialog, int response, EMFolderSelector *emfs)
return;
g_object_set_data ((GObject *)emfs->emft, "select", GUINT_TO_POINTER (1));
- em_folder_utils_create_folder (NULL, emfs->emft, GTK_WINDOW (dialog));
+
+ /* FIXME Pass a parent window. */
+ em_folder_utils_create_folder (NULL, emfs->emft, NULL);
g_signal_stop_emission_by_name (emfs, "response");
}
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 64e9dcf117..ff93c9b5a9 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -403,7 +403,6 @@ em_folder_utils_delete_folder (CamelFolder *folder)
{
CamelStore *local_store;
GtkWidget *dialog;
- char *uri;
int flags = 0;
local_store = e_mail_shell_module_get_local_store (mail_shell_module);
diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h
index e3161bdcc0..deed1407e9 100644
--- a/mail/em-folder-utils.h
+++ b/mail/em-folder-utils.h
@@ -24,7 +24,7 @@
#ifndef EM_FOLDER_UTILS_H
#define EM_FOLDER_UTILS_H
-#include <glib.h>
+#include <gtk/gtk.h>
#include <camel/camel-folder.h>
#include <camel/camel-store.h>
#include <mail/em-folder-tree.h>
@@ -47,7 +47,8 @@ void em_folder_utils_delete_folder (CamelFolder *folder);
void em_folder_utils_rename_folder (CamelFolder *folder);
void em_folder_utils_create_folder (CamelFolderInfo *folderinfo,
- EMFolderTree * emft);
+ EMFolderTree * emft,
+ GtkWindow *parent);
const gchar * em_folder_utils_get_icon_name (guint32 flags);
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 7e110877fa..2da8efaad2 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2086,7 +2086,6 @@ is_local (ESourceGroup *group)
return group &&
e_source_group_peek_base_uri (group) &&
g_str_has_prefix (e_source_group_peek_base_uri (group), "file://");
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:mail/em-utils.c
}
gboolean
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 1e0bfd2a70..be5b0164ee 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -210,22 +210,6 @@ gconf_outlook_filenames_changed (GConfClient *client, guint cnxn_id,
}
static void
-gconf_outlook_filenames_changed (GConfClient *client, guint cnxn_id,
- GConfEntry *entry, gpointer user_data)
-{
- extern int camel_header_param_encode_filenames_in_rfc_2047;
-
- g_return_if_fail (client != NULL);
-
- /* pass option to the camel */
- if (gconf_client_get_bool (client, "/apps/evolution/mail/composer/outlook_filenames", NULL)) {
- camel_header_param_encode_filenames_in_rfc_2047 = 1;
- } else {
- camel_header_param_encode_filenames_in_rfc_2047 = 0;
- }
-}
-
-static void
gconf_jh_check_changed (GConfClient *client, guint cnxn_id,
GConfEntry *entry, gpointer user_data)
{
@@ -673,28 +657,10 @@ mail_config_get_allowable_mime_types (void)
return (const char **) config->mime_types->pdata;
}
-static gboolean
-mail_config_account_url_equal (const CamelURL *u1,
- const CamelURL *u2)
-{
- /* For the purpose of matching a URL to an EAccount, only compare
- * the protocol, user, host and port and disregard the rest. */
-
- if (g_strcmp0 (u1->protocol, u2->protocol) != 0)
- return FALSE;
-
- if (g_strcmp0 (u1->user, u2->user) != 0)
- return FALSE;
-
- if (g_strcmp0 (u1->host, u2->host) != 0)
- return FALSE;
-
- return (u1->port == u2->port);
-}
-
static EAccount *
mc_get_account_by (const char *given_url, const char * (get_url_string)(EAccount *account))
{
+ EAccountList *account_list;
EAccount *account = NULL;
EIterator *iter;
CamelURL *url;
@@ -709,7 +675,8 @@ mc_get_account_by (const char *given_url, const char * (get_url_string)(EAccount
provider = camel_provider_get (given_url, NULL);
g_return_val_if_fail (provider != NULL && provider->url_equal != NULL, NULL);
- iter = e_list_get_iterator ((EList *) config->accounts);
+ account_list = e_get_account_list ();
+ iter = e_list_get_iterator ((EList *) account_list);
while (account == NULL && e_iterator_is_valid (iter)) {
CamelURL *account_url;
const char *account_url_string;
@@ -771,65 +738,6 @@ mail_config_get_account_by_transport_url (const char *transport_url)
return mc_get_account_by (transport_url, get_transport_url_string);
}
-int
-mail_config_has_proxies (EAccount *account)
-{
- return e_account_list_account_has_proxies (config->accounts, account);
-}
-
-void
-mail_config_remove_account_proxies (EAccount *account)
-{
- e_account_list_remove_account_proxies (config->accounts, account);
-}
-
-void
-mail_config_prune_proxies (void)
-{
- e_account_list_prune_proxies (config->accounts);
-}
-
-EAccountList *
-mail_config_get_accounts (void)
-{
- if (config == NULL)
- mail_config_init ();
-
- return config->accounts;
-}
-
-void
-mail_config_add_account (EAccount *account)
-{
- e_account_list_add(config->accounts, account);
- mail_config_save_accounts ();
-}
-
-void
-mail_config_remove_account (EAccount *account)
-{
- e_account_list_remove(config->accounts, account);
- mail_config_save_accounts ();
-}
-
-void
-mail_config_set_default_account (EAccount *account)
-{
- e_account_list_set_default(config->accounts, account);
-}
-
-EAccountIdentity *
-mail_config_get_default_identity (void)
-{
- EAccount *account;
-
- account = mail_config_get_default_account ();
- if (account)
- return account->id;
- else
- return NULL;
-}
-
EAccountService *
mail_config_get_default_transport (void)
{
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 5742be8e5d..46a62e4fc2 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -55,6 +55,7 @@
#include "mail-folder-cache.h"
#include "mail-ops.h"
#include "mail-session.h"
+#include "mail-tools.h"
#include "e-mail-shell-module.h"
/* For notifications of changes */
@@ -1091,26 +1092,26 @@ int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp)
return fi.fi != NULL;
}
-gboolean
+gboolean
mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags)
{
char *uri;
uri = mail_tools_folder_to_url (folder);
-
+
struct _find_info fi = { uri, NULL, NULL };
if (stores == NULL)
return FALSE;
- fi.url = camel_url_new(uri, NULL);
+ fi.url = camel_url_new (uri, NULL);
LOCK(info_lock);
g_hash_table_foreach(stores, (GHFunc)storeinfo_find_folder_info, &fi);
if (flags) {
if (fi.fi) {
*flags = fi.fi->flags;
- }
+ }
}
UNLOCK(info_lock);
diff --git a/mail/mail-session.c b/mail/mail-session.c
index b1776664fb..58b675828a 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -750,12 +750,6 @@ mail_session_shutdown (void)
camel_shutdown ();
}
-void
-mail_session_shutdown (void)
-{
- camel_shutdown ();
-}
-
gboolean
mail_session_get_interactive (void)
{
diff --git a/mail/message-list.c b/mail/message-list.c
index 5ae5ba2232..3386ff4d3b 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -4242,9 +4242,8 @@ regen_list_exec (struct _regen_list_msg *m)
if (!was_deleted || (was_deleted && !m->hidedel))
g_ptr_array_add (uids, (gpointer) camel_pstring_strdup (looking_for));
+ }
- if (!was_deleted || (was_deleted && !m->hidedel))
- g_ptr_array_add (uids, (gpointer) camel_pstring_strdup (looking_for));
}
}
}