aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/e-mail-attachment-handler.c46
-rw-r--r--modules/mail/e-mail-junk-hook.c1
-rw-r--r--modules/mail/e-mail-shell-backend.c37
-rw-r--r--modules/mail/e-mail-shell-backend.h2
-rw-r--r--modules/mail/e-mail-shell-content.c13
-rw-r--r--modules/mail/e-mail-shell-settings.c2
-rw-r--r--modules/mail/e-mail-shell-sidebar.c4
-rw-r--r--modules/mail/e-mail-shell-view-actions.c111
-rw-r--r--modules/mail/e-mail-shell-view-actions.h10
-rw-r--r--modules/mail/e-mail-shell-view-private.c46
-rw-r--r--modules/mail/e-mail-shell-view-private.h6
-rw-r--r--modules/mail/e-mail-shell-view.c16
-rw-r--r--modules/mail/em-account-prefs.c2
-rw-r--r--modules/mail/em-composer-prefs.c2
-rw-r--r--modules/mail/em-mailer-prefs.c13
-rw-r--r--modules/mail/em-network-prefs.c16
16 files changed, 127 insertions, 200 deletions
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 166522a827..55de059d12 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -22,8 +22,6 @@
#include "e-mail-attachment-handler.h"
#include <glib/gi18n.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-stream-mem.h>
#include "e-util/e-alert-dialog.h"
#include "mail/em-composer-utils.h"
@@ -71,7 +69,7 @@ mail_attachment_handler_forward (GtkAction *action,
attachment = E_ATTACHMENT (selected->data);
mime_part = e_attachment_get_mime_part (attachment);
- wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+ wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
em_utils_forward_message (CAMEL_MIME_MESSAGE (wrapper), NULL);
@@ -93,7 +91,7 @@ mail_attachment_handler_reply_all (GtkAction *action,
attachment = E_ATTACHMENT (selected->data);
mime_part = e_attachment_get_mime_part (attachment);
- wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+ wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
em_utils_reply_to_message (
NULL, NULL, CAMEL_MIME_MESSAGE (wrapper),
@@ -117,7 +115,7 @@ mail_attachment_handler_reply_sender (GtkAction *action,
attachment = E_ATTACHMENT (selected->data);
mime_part = e_attachment_get_mime_part (attachment);
- wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+ wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
em_utils_reply_to_message (
NULL, NULL, CAMEL_MIME_MESSAGE (wrapper),
@@ -207,8 +205,8 @@ mail_attachment_handler_message_rfc822 (EAttachmentView *view,
success = TRUE;
exit:
- camel_object_unref (message);
- camel_object_unref (stream);
+ g_object_unref (message);
+ g_object_unref (stream);
gtk_drag_finish (drag_context, success, FALSE, time);
}
@@ -296,7 +294,7 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
e_attachment_load_handle_error, parent);
g_object_unref (attachment);
- camel_object_unref (message);
+ g_object_unref (message);
goto exit;
}
@@ -311,25 +309,25 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
message = camel_folder_get_message (
folder, uids->pdata[ii], &ex);
if (message == NULL) {
- camel_object_unref (multipart);
+ g_object_unref (multipart);
goto exit;
}
mime_part = camel_mime_part_new ();
wrapper = CAMEL_DATA_WRAPPER (message);
camel_mime_part_set_disposition (mime_part, "inline");
- camel_medium_set_content_object (
+ camel_medium_set_content (
CAMEL_MEDIUM (mime_part), wrapper);
camel_mime_part_set_content_type (mime_part, "message/rfc822");
camel_multipart_add_part (multipart, mime_part);
- camel_object_unref (mime_part);
+ g_object_unref (mime_part);
- camel_object_unref (message);
+ g_object_unref (message);
}
mime_part = camel_mime_part_new ();
wrapper = CAMEL_DATA_WRAPPER (multipart);
- camel_medium_set_content_object (CAMEL_MEDIUM (mime_part), wrapper);
+ camel_medium_set_content (CAMEL_MEDIUM (mime_part), wrapper);
/* Translators: This is only for multiple messages. */
description = g_strdup_printf (_("%d attached messages"), uids->len);
@@ -344,36 +342,26 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
e_attachment_load_handle_error, parent);
g_object_unref (attachment);
- camel_object_unref (mime_part);
- camel_object_unref (multipart);
+ g_object_unref (mime_part);
+ g_object_unref (multipart);
exit:
if (camel_exception_is_set (&ex)) {
- gchar *folder_name;
+ const gchar *folder_name = data;
if (folder != NULL)
- camel_object_get (
- folder, NULL, CAMEL_FOLDER_NAME,
- &folder_name, NULL);
- else
- folder_name = g_strdup (data);
+ folder_name = camel_folder_get_name (folder);
e_alert_run_dialog_for_args (
parent, "mail-composer:attach-nomessages",
folder_name, camel_exception_get_description (&ex),
NULL);
- if (folder != NULL)
- camel_object_free (
- folder, CAMEL_FOLDER_NAME, folder_name);
- else
- g_free (folder_name);
-
camel_exception_clear (&ex);
}
if (folder != NULL)
- camel_object_unref (folder);
+ g_object_unref (folder);
g_ptr_array_free (uids, TRUE);
@@ -401,7 +389,7 @@ mail_attachment_handler_update_actions (EAttachmentView *view)
if (!CAMEL_IS_MIME_PART (mime_part))
goto exit;
- wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+ wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
visible = CAMEL_IS_MIME_MESSAGE (wrapper);
diff --git a/modules/mail/e-mail-junk-hook.c b/modules/mail/e-mail-junk-hook.c
index f17290f99d..ae87df1b30 100644
--- a/modules/mail/e-mail-junk-hook.c
+++ b/modules/mail/e-mail-junk-hook.c
@@ -22,7 +22,6 @@
#include "e-mail-junk-hook.h"
#include <glib/gi18n.h>
-#include <camel/camel-junk-plugin.h>
#include "e-util/e-alert-dialog.h"
#include "shell/e-shell.h"
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index b3eb0a97c1..5c16a34b21 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -22,10 +22,6 @@
#include "e-mail-shell-backend.h"
#include <glib/gi18n.h>
-#include <camel/camel-disco-store.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-session.h>
-#include <camel/camel-url.h>
#include "e-util/e-account-utils.h"
#include "e-util/e-binding.h"
@@ -35,6 +31,7 @@
#include "shell/e-shell-window.h"
#include "composer/e-msg-composer.h"
#include "widgets/misc/e-preferences-window.h"
+#include "widgets/misc/e-web-view.h"
#include "e-mail-shell-settings.h"
#include "e-mail-shell-sidebar.h"
@@ -74,6 +71,9 @@ struct _EMailShellBackendPrivate {
static gpointer parent_class;
static GType mail_shell_backend_type;
+static void mbox_create_preview_cb (GObject *preview, GtkWidget **preview_widget);
+static void mbox_fill_preview_cb (GObject *preview, CamelMimeMessage *msg);
+
static void
mail_shell_backend_init_importers (void)
{
@@ -84,6 +84,7 @@ mail_shell_backend_init_importers (void)
importer = mbox_importer_peek ();
e_import_class_add_importer (import_class, importer, NULL, NULL);
+ mbox_importer_set_preview_funcs (mbox_create_preview_cb, mbox_fill_preview_cb);
importer = elm_importer_peek ();
e_import_class_add_importer (import_class, importer, NULL, NULL);
@@ -774,3 +775,31 @@ e_mail_labels_get_filter_options (void)
return g_slist_reverse (list);
}
+
+/* utility functions for mbox importer */
+static void
+mbox_create_preview_cb (GObject *preview, GtkWidget **preview_widget)
+{
+ EMFormatHTMLDisplay *format;
+
+ g_return_if_fail (preview != NULL);
+ g_return_if_fail (preview_widget != NULL);
+
+ format = em_format_html_display_new ();
+ g_object_set_data_full (preview, "mbox-imp-formatter", format, g_object_unref);
+ *preview_widget = GTK_WIDGET (EM_FORMAT_HTML (format)->html);
+}
+
+static void
+mbox_fill_preview_cb (GObject *preview, CamelMimeMessage *msg)
+{
+ EMFormatHTMLDisplay *format;
+
+ g_return_if_fail (preview != NULL);
+ g_return_if_fail (msg != NULL);
+
+ format = g_object_get_data (preview, "mbox-imp-formatter");
+ g_return_if_fail (format != NULL);
+
+ em_format_format (EM_FORMAT (format), NULL, NULL, msg);
+}
diff --git a/modules/mail/e-mail-shell-backend.h b/modules/mail/e-mail-shell-backend.h
index 36f4064e68..031efab150 100644
--- a/modules/mail/e-mail-shell-backend.h
+++ b/modules/mail/e-mail-shell-backend.h
@@ -24,8 +24,6 @@
#include <mail/e-mail-backend.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
#include <e-util/e-signature-list.h>
#include <libedataserver/e-account-list.h>
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index aa2718dcec..ecd592f32b 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -22,7 +22,6 @@
#include "e-mail-shell-content.h"
#include <glib/gi18n.h>
-#include <camel/camel-store.h>
#include <libedataserver/e-data-server-util.h>
#include "e-util/e-util-private.h"
@@ -452,10 +451,6 @@ mail_shell_content_constructed (GObject *object)
key = "/apps/evolution/mail/display/paned_size";
gconf_bridge_bind_property (bridge, key, object, "vposition");
- object = G_OBJECT (shell_content);
- key = "/apps/evolution/mail/display/show_deleted";
- gconf_bridge_bind_property (bridge, key, object, "show-deleted");
-
/* Message list customizations. */
reader = E_MAIL_READER (shell_content);
@@ -688,8 +683,8 @@ mail_shell_content_class_init (EMailShellContentClass *class)
PROP_GROUP_BY_THREADS,
g_param_spec_boolean (
"group-by-threads",
- _("Group by Threads"),
- _("Whether to group messages by threads"),
+ "Group by Threads",
+ "Whether to group messages by threads",
FALSE,
G_PARAM_READWRITE));
@@ -698,8 +693,8 @@ mail_shell_content_class_init (EMailShellContentClass *class)
PROP_PREVIEW_VISIBLE,
g_param_spec_boolean (
"preview-visible",
- _("Preview is Visible"),
- _("Whether the preview pane is visible"),
+ "Preview is Visible",
+ "Whether the preview pane is visible",
TRUE,
G_PARAM_READWRITE));
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index 48fd042d58..7303aeea5b 100644
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@ -58,7 +58,7 @@ e_mail_shell_settings_init (EShell *shell)
NULL,
G_PARAM_READWRITE));
- camel_object_ref (session);
+ g_object_ref (session);
e_shell_settings_set_pointer (
shell_settings, "mail-session", session);
diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c
index 9b3c2fedd0..ac736a0a67 100644
--- a/modules/mail/e-mail-shell-sidebar.c
+++ b/modules/mail/e-mail-shell-sidebar.c
@@ -196,11 +196,7 @@ guess_screen_width (EMailShellSidebar *sidebar)
GdkRectangle rect;
toplevel = gtk_widget_get_toplevel (widget);
-#if GTK_CHECK_VERSION(2,19,7)
if (toplevel && gtk_widget_get_realized (toplevel))
-#else
- if (toplevel && GTK_WIDGET_REALIZED (toplevel))
-#endif
monitor = gdk_screen_get_monitor_at_window (
screen, gtk_widget_get_window (toplevel));
else {
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index f534c2a276..3ba34e68c0 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -19,6 +19,7 @@
*
*/
+#include "mail/mail-folder-cache.h"
#include "e-mail-shell-view-private.h"
static void
@@ -232,7 +233,10 @@ action_mail_folder_mark_all_as_read_cb (GtkAction *action,
g_return_if_fail (folder != NULL);
key = "/apps/evolution/mail/prompts/mark_all_read";
- prompt = "mail:ask-mark-all-read";
+ if (mail_folder_cache_get_folder_has_children (mail_folder_cache_get_default (), folder, NULL))
+ prompt = "mail:ask-mark-all-read-sub";
+ else
+ prompt = "mail:ask-mark-all-read";
if (!em_utils_prompt_user (parent, key, prompt, NULL))
return;
@@ -410,53 +414,6 @@ action_mail_global_expunge_cb (GtkAction *action,
}
static void
-action_mail_hide_deleted_cb (GtkToggleAction *action,
- EMailShellView *mail_shell_view)
-{
- GtkWidget *message_list;
- EMailReader *reader;
- gboolean active;
-
- reader = E_MAIL_READER (mail_shell_view->priv->mail_shell_content);
- message_list = e_mail_reader_get_message_list (reader);
-
- active = gtk_toggle_action_get_active (action);
- message_list_set_hidedeleted (MESSAGE_LIST (message_list), active);
-}
-
-static void
-action_mail_hide_read_cb (GtkAction *action,
- EMailShellView *mail_shell_view)
-{
- GtkWidget *message_list;
- EMailReader *reader;
-
- reader = E_MAIL_READER (mail_shell_view->priv->mail_shell_content);
- message_list = e_mail_reader_get_message_list (reader);
-
- message_list_hide_add (
- MESSAGE_LIST (message_list),
- "(match-all (system-flag \"seen\"))",
- ML_HIDE_SAME, ML_HIDE_SAME);
-}
-
-static void
-action_mail_hide_selected_cb (GtkAction *action,
- EMailShellView *mail_shell_view)
-{
- GtkWidget *message_list;
- EMailReader *reader;
- GPtrArray *uids;
-
- reader = E_MAIL_READER (mail_shell_view->priv->mail_shell_content);
- message_list = e_mail_reader_get_message_list (reader);
- uids = e_mail_reader_get_selected_uids (reader);
-
- message_list_hide_uids (MESSAGE_LIST (message_list), uids);
- em_utils_uids_free (uids);
-}
-
-static void
action_mail_label_cb (GtkToggleAction *action,
EMailShellView *mail_shell_view)
{
@@ -611,16 +568,18 @@ action_mail_label_none_cb (GtkAction *action,
}
static void
-action_mail_show_hidden_cb (GtkAction *action,
- EMailShellView *mail_shell_view)
+action_mail_show_deleted_cb (GtkToggleAction *action,
+ EMailShellView *mail_shell_view)
{
GtkWidget *message_list;
EMailReader *reader;
+ gboolean active;
reader = E_MAIL_READER (mail_shell_view->priv->mail_shell_content);
message_list = e_mail_reader_get_message_list (reader);
- message_list_hide_clear (MESSAGE_LIST (message_list));
+ active = gtk_toggle_action_get_active (action);
+ message_list_set_hidedeleted (MESSAGE_LIST (message_list), !active);
}
static void
@@ -996,27 +955,6 @@ static GtkActionEntry mail_entries[] = {
NULL, /* XXX Add a tooltip! */
G_CALLBACK (action_mail_label_none_cb) },
- { "mail-hide-read",
- NULL,
- N_("Hide _Read Messages"),
- NULL,
- N_("Temporarily hide all messages that have already been read"),
- G_CALLBACK (action_mail_hide_read_cb) },
-
- { "mail-hide-selected",
- NULL,
- N_("Hide S_elected Messages"),
- NULL,
- N_("Temporarily hide the selected messages"),
- G_CALLBACK (action_mail_hide_selected_cb) },
-
- { "mail-show-hidden",
- NULL,
- N_("Show Hidde_n Messages"),
- NULL,
- N_("Show messages that have been temporarily hidden"),
- G_CALLBACK (action_mail_show_hidden_cb) },
-
{ "mail-smart-backward",
NULL,
NULL, /* No menu item; key press only */
@@ -1146,15 +1084,6 @@ static EPopupActionEntry mail_popup_entries[] = {
static GtkToggleActionEntry mail_toggle_entries[] = {
- { "mail-hide-deleted",
- NULL,
- N_("Hide _Deleted Messages"),
- NULL,
- N_("Hide deleted messages rather than displaying "
- "them with a line through them"),
- G_CALLBACK (action_mail_hide_deleted_cb),
- TRUE },
-
{ "mail-preview",
NULL,
N_("Show Message _Preview"),
@@ -1163,6 +1092,14 @@ static GtkToggleActionEntry mail_toggle_entries[] = {
NULL, /* Handled by property bindings */
TRUE },
+ { "mail-show-deleted",
+ NULL,
+ N_("Show _Deleted Messages"),
+ NULL,
+ N_("Show deleted messages with a line through them"),
+ G_CALLBACK (action_mail_show_deleted_cb),
+ FALSE },
+
{ "mail-threads-group-by",
NULL,
N_("_Group By Threads"),
@@ -1404,6 +1341,10 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view)
bridge = gconf_bridge_get ();
+ object = G_OBJECT (ACTION (MAIL_SHOW_DELETED));
+ key = "/apps/evolution/mail/display/show_deleted";
+ gconf_bridge_bind_property (bridge, key, object, "active");
+
object = G_OBJECT (ACTION (MAIL_VIEW_VERTICAL));
key = "/apps/evolution/mail/display/layout";
gconf_bridge_bind_property (bridge, key, object, "current-value");
@@ -1442,11 +1383,9 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view)
ACTION (MAIL_PREVIEW), "active",
ACTION (MAIL_VIEW_VERTICAL), "sensitive");
- /* XXX The boolean sense of the GConf key is the inverse of
- * the menu item, so we have to maintain two properties. */
- e_mutual_binding_new_with_negation (
- mail_shell_content, "show-deleted",
- ACTION (MAIL_HIDE_DELETED), "active");
+ e_mutual_binding_new (
+ ACTION (MAIL_SHOW_DELETED), "active",
+ mail_shell_content, "show-deleted");
/* Keep the sensitivity of "Create Search Folder from Search"
* in sync with "Save Search" so that its only selectable when
diff --git a/modules/mail/e-mail-shell-view-actions.h b/modules/mail/e-mail-shell-view-actions.h
index addd67452b..cc7552e27c 100644
--- a/modules/mail/e-mail-shell-view-actions.h
+++ b/modules/mail/e-mail-shell-view-actions.h
@@ -99,12 +99,6 @@
E_SHELL_WINDOW_ACTION ((window), "mail-forward-inline")
#define E_SHELL_WINDOW_ACTION_MAIL_FORWARD_QUOTED(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-forward-quoted")
-#define E_SHELL_WINDOW_ACTION_MAIL_HIDE_DELETED(window) \
- E_SHELL_WINDOW_ACTION ((window), "mail-hide-deleted")
-#define E_SHELL_WINDOW_ACTION_MAIL_HIDE_READ(window) \
- E_SHELL_WINDOW_ACTION ((window), "mail-hide-read")
-#define E_SHELL_WINDOW_ACTION_MAIL_HIDE_SELECTED(window) \
- E_SHELL_WINDOW_ACTION ((window), "mail-hide-selected")
#define E_SHELL_WINDOW_ACTION_MAIL_LABEL_NEW(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-label-new")
#define E_SHELL_WINDOW_ACTION_MAIL_LABEL_NONE(window) \
@@ -173,8 +167,8 @@
E_SHELL_WINDOW_ACTION ((window), "mail-select-all")
#define E_SHELL_WINDOW_ACTION_MAIL_SHOW_ALL_HEADERS(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-show-all-headers")
-#define E_SHELL_WINDOW_ACTION_MAIL_SHOW_HIDDEN(window) \
- E_SHELL_WINDOW_ACTION ((window), "mail-show-hidden")
+#define E_SHELL_WINDOW_ACTION_MAIL_SHOW_DELETED(window) \
+ E_SHELL_WINDOW_ACTION ((window), "mail-show-deleted")
#define E_SHELL_WINDOW_ACTION_MAIL_SHOW_SOURCE(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-show-source")
#define E_SHELL_WINDOW_ACTION_MAIL_SMART_BACKWARD(window) \
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index 2cc46da1b7..8a45c4b853 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -257,19 +257,6 @@ mail_shell_view_reader_changed_cb (EMailShellView *mail_shell_view,
}
static void
-mail_shell_view_reader_status_message_cb (EMailShellView *mail_shell_view,
- const gchar *status_message)
-{
- EShellView *shell_view;
- EShellTaskbar *shell_taskbar;
-
- shell_view = E_SHELL_VIEW (mail_shell_view);
- shell_taskbar = e_shell_view_get_shell_taskbar (shell_view);
-
- e_shell_taskbar_set_message (shell_taskbar, status_message);
-}
-
-static void
mail_shell_view_scroll_cb (EMailShellView *mail_shell_view,
GtkOrientation orientation,
GtkScrollType scroll_type,
@@ -426,6 +413,7 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view)
EShellContent *shell_content;
EShellSettings *shell_settings;
EShellSidebar *shell_sidebar;
+ EShellTaskbar *shell_taskbar;
EShellWindow *shell_window;
EShellSearchbar *searchbar;
EMFormatHTMLDisplay *html_display;
@@ -447,6 +435,7 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view)
shell_backend = e_shell_view_get_shell_backend (shell_view);
shell_content = e_shell_view_get_shell_content (shell_view);
shell_sidebar = e_shell_view_get_shell_sidebar (shell_view);
+ shell_taskbar = e_shell_view_get_shell_taskbar (shell_view);
shell_window = e_shell_view_get_shell_window (shell_view);
ui_manager = e_shell_window_get_ui_manager (shell_window);
@@ -574,8 +563,8 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view)
g_signal_connect_swapped (
web_view, "status-message",
- G_CALLBACK (mail_shell_view_reader_status_message_cb),
- mail_shell_view);
+ G_CALLBACK (e_shell_taskbar_set_message),
+ shell_taskbar);
/* Need to keep the handler ID so we can disconnect it in
* dispose(). The shell outlives us and we don't want it
@@ -636,12 +625,12 @@ e_mail_shell_view_private_dispose (EMailShellView *mail_shell_view)
DISPOSE (priv->search_rules[ii]);
if (priv->search_account_all != NULL) {
- camel_object_unref (priv->search_account_all);
+ g_object_unref (priv->search_account_all);
priv->search_account_all = NULL;
}
if (priv->search_account_current != NULL) {
- camel_object_unref (priv->search_account_current);
+ g_object_unref (priv->search_account_current);
priv->search_account_current = NULL;
}
@@ -832,12 +821,13 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view)
EShellView *shell_view;
EMailReader *reader;
CamelStore *local_store;
+ CamelStore *parent_store;
CamelFolder *folder;
GPtrArray *uids;
GString *buffer;
const gchar *display_name;
+ const gchar *folder_name;
const gchar *folder_uri;
- gchar *folder_name;
gchar *title;
guint32 num_deleted;
guint32 num_junked;
@@ -874,15 +864,14 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view)
return;
}
- camel_object_get (
- folder, NULL,
- CAMEL_FOLDER_NAME, &folder_name,
- CAMEL_FOLDER_DELETED, &num_deleted,
- CAMEL_FOLDER_JUNKED, &num_junked,
- CAMEL_FOLDER_JUNKED_NOT_DELETED, &num_junked_not_deleted,
- CAMEL_FOLDER_UNREAD, &num_unread,
- CAMEL_FOLDER_VISIBLE, &num_visible,
- NULL);
+ folder_name = camel_folder_get_name (folder);
+ parent_store = camel_folder_get_parent_store (folder);
+
+ num_deleted = folder->summary->deleted_count;
+ num_junked = folder->summary->junk_count;
+ num_junked_not_deleted = folder->summary->junk_not_deleted_count;
+ num_unread = folder->summary->unread_count;
+ num_visible = folder->summary->visible_count;
buffer = g_string_sized_new (256);
uids = e_mail_reader_get_selected_uids (reader);
@@ -953,7 +942,7 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view)
em_utils_uids_free (uids);
/* Choose a suitable folder name for displaying. */
- if (folder->parent_store == local_store && (
+ if (parent_store == local_store && (
strcmp (folder_name, "Drafts") == 0 ||
strcmp (folder_name, "Inbox") == 0 ||
strcmp (folder_name, "Outbox") == 0 ||
@@ -970,6 +959,5 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view)
e_shell_view_set_title (shell_view, title);
g_free (title);
- camel_object_free (folder, CAMEL_FOLDER_NAME, folder_name);
g_string_free (buffer, TRUE);
}
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index de237aff96..a8a86c5054 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -26,12 +26,6 @@
#include <glib/gi18n.h>
#include <gtkhtml/gtkhtml.h>
-#include <camel/camel-disco-store.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-operation.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-vtrash-folder.h>
#include <camel/camel-search-private.h> /* for camel_search_word */
#include "e-util/e-util.h"
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index c3429859f7..e69ae55220 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -62,12 +62,12 @@ search_results_exec (SearchResultsMsg *msg)
camel_operation_register (msg->cancel);
copied_list = g_list_copy (msg->folder_list);
- g_list_foreach (copied_list, (GFunc) camel_object_ref, NULL);
+ g_list_foreach (copied_list, (GFunc) g_object_ref, NULL);
camel_vee_folder_set_folders (
CAMEL_VEE_FOLDER (msg->folder), copied_list);
- g_list_foreach (copied_list, (GFunc) camel_object_unref, NULL);
+ g_list_foreach (copied_list, (GFunc) g_object_unref, NULL);
g_list_free (copied_list);
}
@@ -79,9 +79,9 @@ search_results_done (SearchResultsMsg *msg)
static void
search_results_free (SearchResultsMsg *msg)
{
- camel_object_unref (msg->folder);
+ g_object_unref (msg->folder);
- g_list_foreach (msg->folder_list, (GFunc) camel_object_unref, NULL);
+ g_list_foreach (msg->folder_list, (GFunc) g_object_unref, NULL);
g_list_free (msg->folder_list);
}
@@ -101,7 +101,7 @@ mail_shell_view_setup_search_results_folder (CamelFolder *folder,
SearchResultsMsg *msg;
gint id;
- camel_object_ref (folder);
+ g_object_ref (folder);
msg = mail_msg_new (&search_results_setup_info);
msg->folder = folder;
@@ -487,7 +487,7 @@ all_accounts:
text = e_shell_searchbar_get_search_text (searchbar);
if (text == NULL || *text == '\0') {
if (priv->search_account_all != NULL) {
- camel_object_unref (priv->search_account_all);
+ g_object_unref (priv->search_account_all);
priv->search_account_all = NULL;
}
@@ -614,7 +614,7 @@ current_account:
text = e_shell_searchbar_get_search_text (searchbar);
if (text == NULL || *text == '\0') {
if (priv->search_account_current != NULL) {
- camel_object_unref (priv->search_account_current);
+ g_object_unref (priv->search_account_current);
priv->search_account_current = NULL;
}
@@ -664,7 +664,7 @@ current_account:
/* Create a new search folder. */
- store = folder->parent_store;
+ store = camel_folder_get_parent_store (folder);
list = NULL; /* list of CamelFolders */
if (store->folders != NULL) {
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index df1cdeef27..0ac397fc72 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -30,8 +30,6 @@
#include <config.h>
#endif
-#include <camel/camel-url.h>
-
#include <glib/gi18n.h>
#include "e-util/e-alert-dialog.h"
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 49f2fda5b6..7c0f39ea31 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -38,8 +38,6 @@
#include "composer/e-msg-composer.h"
#include "shell/e-shell-utils.h"
-#include <camel/camel-iconv.h>
-
#include <glib/gi18n.h>
#include <glib/gstdio.h>
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index a885c72744..11795a92d8 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -30,7 +30,6 @@
#include "em-mailer-prefs.h"
#include "em-format/em-format.h"
-#include <camel/camel-iconv.h>
#include <gtkhtml/gtkhtml-properties.h>
#include <libxml/tree.h>
@@ -219,8 +218,15 @@ jh_add_cb (GtkWidget *widget, gpointer user_data)
{
EMMailerPrefs *prefs = (EMMailerPrefs *) user_data;
GtkWidget *dialog, *l1, *l2, *entry1, *entry2, *vbox, *hbox;
+ GtkWidget *content_area;
gint response;
- dialog = gtk_dialog_new_with_buttons (_("Add Custom Junk Header"), (GtkWindow *)gtk_widget_get_toplevel (widget), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
+
+ dialog = gtk_dialog_new_with_buttons (
+ _("Add Custom Junk Header"),
+ (GtkWindow *) gtk_widget_get_toplevel (widget),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
vbox = gtk_vbox_new (FALSE, 6);
hbox = gtk_hbox_new (FALSE, 0);
@@ -238,7 +244,8 @@ jh_add_cb (GtkWidget *widget, gpointer user_data)
gtk_box_pack_start ((GtkBox *)vbox, hbox, FALSE, FALSE, 6);
gtk_widget_show_all (vbox);
- gtk_container_add ((GtkContainer *)((GtkDialog *)dialog)->vbox, vbox);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ gtk_container_add (GTK_CONTAINER (content_area), vbox);
response = gtk_dialog_run ((GtkDialog *)dialog);
if (response == GTK_RESPONSE_ACCEPT) {
const gchar *name = gtk_entry_get_text ((GtkEntry *)entry1);
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index 6b419d0c2e..85a0a82ca3 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -283,12 +283,16 @@ emnp_free(EConfig *ec, GSList *items, gpointer data)
static void
emnp_set_markups (EMNetworkPrefs *prefs)
{
- gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->sys_proxy)->child), TRUE);
- gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->no_proxy)->child), TRUE);
- gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->manual_proxy)->child), TRUE);
-#if 0
- gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->auto_proxy)->child), TRUE);
-#endif
+ GtkWidget *child;
+
+ child = gtk_bin_get_child (GTK_BIN (prefs->sys_proxy));
+ gtk_label_set_use_markup (GTK_LABEL (child), TRUE);
+
+ child = gtk_bin_get_child (GTK_BIN (prefs->no_proxy));
+ gtk_label_set_use_markup (GTK_LABEL (child), TRUE);
+
+ child = gtk_bin_get_child (GTK_BIN (prefs->manual_proxy));
+ gtk_label_set_use_markup (GTK_LABEL (child), TRUE);
}
static void
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-03 16:05:54 +0800