aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2009-01-27 02:49:51 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2009-01-27 02:49:51 +0800
commitbc80332460c353e391cd620f2cc51f7b56eef4de (patch)
tree37881bffee0b32bad8c3eaaf8640f206fdfc4ccf /mail
parent8bfadde575e8a49da66bf7ba17e89963aa84bbf5 (diff)
downloadgsoc2013-evolution-bc80332460c353e391cd620f2cc51f7b56eef4de.tar.gz
gsoc2013-evolution-bc80332460c353e391cd620f2cc51f7b56eef4de.tar.zst
gsoc2013-evolution-bc80332460c353e391cd620f2cc51f7b56eef4de.zip
Miscellaneous stuff.
svn path=/branches/kill-bonobo/; revision=37134
Diffstat (limited to 'mail')
-rw-r--r--mail/e-mail-reader-utils.c9
-rw-r--r--mail/e-mail-reader.c8
-rw-r--r--mail/e-mail-shell-module.c8
-rw-r--r--mail/em-account-editor.c4
-rw-r--r--mail/em-mailer-prefs.c2
-rw-r--r--mail/em-network-prefs.c2
-rw-r--r--mail/mail-component-factory.c125
-rw-r--r--mail/mail-config.c7
-rw-r--r--mail/mail-folder-cache.c1
-rw-r--r--mail/mail-mt.c1
-rw-r--r--mail/mail-session.c7
-rw-r--r--mail/mail-session.h3
12 files changed, 16 insertions, 161 deletions
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 419581683d..b0c3edff2d 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -87,9 +87,8 @@ e_mail_reader_confirm_delete (EMailReader *reader)
folder = message_list->folder;
- g_object_get (
- shell_settings, "mail-prompt-delete-in-vfolder",
- &prompt_delete_in_vfolder, NULL);
+ prompt_delete_in_vfolder = e_shell_settings_get_boolean (
+ shell_settings, "mail-prompt-delete-in-vfolder");
if (!CAMEL_IS_VEE_STORE (folder->parent_store))
return TRUE;
@@ -114,11 +113,11 @@ e_mail_reader_confirm_delete (EMailReader *reader)
response = gtk_dialog_run (GTK_DIALOG (dialog));
if (response == GTK_RESPONSE_OK)
- g_object_set (
+ e_shell_settings_set_boolean (
shell_settings,
"mail-prompt-delete-in-vfolder",
gtk_toggle_button_get_active (
- GTK_TOGGLE_BUTTON (check_button)), NULL);
+ GTK_TOGGLE_BUTTON (check_button)));
gtk_widget_destroy (dialog);
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index f32d389bb6..1d39309361 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1846,10 +1846,10 @@ mail_reader_message_loaded_cb (CamelFolder *folder,
e_shell_event (shell, "mail-icon", "evolution-mail");
/* Determine whether to mark the message as read. */
- g_object_get (
- shell_settings,
- "mail-mark-seen", &mark_read,
- "mail-mark-seen-timeout", &timeout_interval, NULL);
+ mark_read = e_shell_settings_get_boolean (
+ shell_settings, "mail-mark-seen");
+ timeout_interval = e_shell_settings_get_int (
+ shell_settings, "mail-mark-seen-timeout");
g_object_set_data_full (
G_OBJECT (reader), "mark-read-uid",
diff --git a/mail/e-mail-shell-module.c b/mail/e-mail-shell-module.c
index 58be6a094d..e8893bbbdc 100644
--- a/mail/e-mail-shell-module.c
+++ b/mail/e-mail-shell-module.c
@@ -819,10 +819,12 @@ e_shell_module_init (GTypeModule *type_module)
{
EShell *shell;
EShellModule *shell_module;
+ EShellSettings *shell_settings;
gboolean enable_search_folders;
shell_module = E_SHELL_MODULE (type_module);
shell = e_shell_module_get_shell (shell_module);
+ shell_settings = e_shell_get_shell_settings (shell);
e_shell_module_set_info (
shell_module, &module_info,
@@ -892,10 +894,8 @@ e_shell_module_init (GTypeModule *type_module)
e_mail_shell_module_init_settings (shell);
mail_shell_module_init_preferences (shell);
- g_object_get (
- e_shell_get_shell_settings (shell),
- "mail-enable-search-folders",
- &enable_search_folders, NULL);
+ enable_search_folders = e_shell_settings_get_boolean (
+ shell_settings, "mail-enable-search-folders");
if (enable_search_folders)
vfolder_load_storage ();
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 3174deaed9..965d4807c6 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -670,8 +670,8 @@ emae_signature_new(GtkWidget *w, EMAccountEditor *emae)
shell_settings = e_shell_get_shell_settings (shell);
parent = gtk_widget_get_toplevel (w);
- g_object_get (
- shell_settings, "composer-format-html", &html_mode, NULL);
+ html_mode = e_shell_settings_get_boolean (
+ shell_settings, "composer-format-html");
em_composer_prefs_new_signature (GTK_WINDOW (parent), html_mode);
}
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index e0044ed082..984dbad429 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -25,6 +25,7 @@
#endif
#include <string.h>
+#include <glib/gi18n-lib.h>
#include "em-mailer-prefs.h"
#include "em-format.h"
@@ -33,7 +34,6 @@
#include <gtkhtml/gtkhtml-properties.h>
#include <libxml/tree.h>
#include "misc/e-charset-picker.h"
-#include <bonobo/bonobo-generic-factory.h>
#include <glade/glade.h>
diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c
index b5ca55d451..eeed589cb8 100644
--- a/mail/em-network-prefs.c
+++ b/mail/em-network-prefs.c
@@ -32,8 +32,6 @@
#include "em-network-prefs.h"
-#include <bonobo/bonobo-generic-factory.h>
-
#include <gdk/gdkkeysyms.h>
#include <gconf/gconf-client.h>
#include <glade/glade.h>
diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c
deleted file mode 100644
index a3de3be8b9..0000000000
--- a/mail/mail-component-factory.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- * Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "mail-component.h"
-#include "em-account-prefs.h"
-#include "em-mailer-prefs.h"
-#include "em-composer-prefs.h"
-#include "em-network-prefs.h"
-
-#include "mail-config-factory.h"
-#include "mail-config.h"
-#include "mail-mt.h"
-
-#include "em-popup.h"
-#include "em-menu.h"
-#include "em-event.h"
-#include "em-config.h"
-#include "em-format-hook.h"
-#include "em-junk-hook.h"
-#include "em-format-html-display.h"
-
-#include "importers/mail-importer.h"
-#include "e-util/e-import.h"
-
-#include <bonobo-activation/bonobo-activation.h>
-#include <bonobo/bonobo-shlib-factory.h>
-
-#include <string.h>
-
-/* TODO: clean up these definitions */
-
-#define FACTORY_ID "OAFIID:GNOME_Evolution_Mail_Factory:" BASE_VERSION
-#define COMPONENT_ID "OAFIID:GNOME_Evolution_Mail_Component:" BASE_VERSION
-#define FOLDER_INFO_ID "OAFIID:GNOME_Evolution_FolderInfo:" BASE_VERSION
-
-static BonoboObject *
-factory(BonoboGenericFactory *factory, const char *component_id, void *closure)
-{
- BonoboObject *o;
-
- if (strcmp (component_id, COMPONENT_ID) == 0) {
- MailComponent *component = mail_component_peek ();
-
- bonobo_object_ref (BONOBO_OBJECT (component));
- return BONOBO_OBJECT (component);
- } else if (strcmp (component_id, EM_ACCOUNT_PREFS_CONTROL_ID) == 0
- || strcmp (component_id, EM_MAILER_PREFS_CONTROL_ID) == 0
- || strcmp (component_id, EM_COMPOSER_PREFS_CONTROL_ID) == 0
- || strcmp (component_id, EM_NETWORK_PREFS_CONTROL_ID) == 0) {
- return mail_config_control_factory_cb (factory, component_id, CORBA_OBJECT_NIL);
- }
-
- o = mail_importer_factory_cb(factory, component_id, NULL);
- if (o == NULL)
- g_warning (FACTORY_ID ": Don't know what to do with %s", component_id);
-
- return o;
-}
-
-static Bonobo_Unknown
-make_factory (PortableServer_POA poa, const char *iid, gpointer impl_ptr, CORBA_Environment *ev)
-{
- static int init = 0;
-
- if (!init) {
- EImportClass *klass;
-
- init = 1;
-
- mail_config_init();
- mail_msg_init();
-
-// e_plugin_hook_register_type(em_popup_hook_get_type());
-// e_plugin_hook_register_type(em_menu_hook_get_type());
-// e_plugin_hook_register_type(em_config_hook_get_type());
-//
-// em_format_hook_register_type(em_format_get_type());
-// em_format_hook_register_type(em_format_html_get_type());
-// em_format_hook_register_type(em_format_html_display_get_type());
-// em_junk_hook_register_type(emj_get_type());
-//
-// e_plugin_hook_register_type(em_format_hook_get_type());
-// e_plugin_hook_register_type(em_event_hook_get_type());
-// e_plugin_hook_register_type(em_junk_hook_get_type());
-//
-// klass = g_type_class_ref(e_import_get_type());
-// e_import_class_add_importer(klass, mbox_importer_peek(), NULL, NULL);
-// e_import_class_add_importer(klass, elm_importer_peek(), NULL, NULL);
-// e_import_class_add_importer(klass, pine_importer_peek(), NULL, NULL);
- }
-
- return bonobo_shlib_factory_std (FACTORY_ID, poa, impl_ptr, factory, NULL, ev);
-}
-
-static BonoboActivationPluginObject plugin_list[] = {
- { FACTORY_ID, make_factory},
- { NULL }
-};
-
-const BonoboActivationPlugin Bonobo_Plugin_info = {
- plugin_list, "Evolution Mail component factory"
-};
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 29e74cfe00..cb36ee6d60 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -37,6 +37,7 @@
#include <gtk/gtk.h>
#include <glib/gstdio.h>
+#include <glib/gi18n-lib.h>
#ifndef G_OS_WIN32
#include <sys/wait.h>
@@ -48,12 +49,6 @@
#include <libxml/tree.h>
#include <libxml/parser.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-context.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <bonobo/bonobo-exception.h>
-
#include <libedataserver/e-data-server-util.h>
#include <e-util/e-util.h>
#include <misc/e-gui-utils.h>
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 06335a515b..8282625f7d 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -39,7 +39,6 @@
#include <libgnome/gnome-sound.h>
#include <glib/gi18n.h>
-#include <bonobo/bonobo-exception.h>
#include <camel/camel-store.h>
#include <camel/camel-folder.h>
#include <camel/camel-vtrash-folder.h>
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 1853c49ce8..f4780c96bb 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -1071,6 +1071,5 @@ set_stop (int sensitive)
if (last == sensitive)
return;
- /*bonobo_ui_component_set_prop (uic, "/commands/MailStop", "sensitive", sensitive ? "1" : "0", NULL);*/
last = sensitive;
}
diff --git a/mail/mail-session.c b/mail/mail-session.c
index e4af8e1c29..6529cde8f1 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -784,13 +784,6 @@ mail_session_set_interactive (gboolean interactive)
}
void
-mail_session_forget_passwords (BonoboUIComponent *uih, void *user_data,
- const char *path)
-{
- e_passwords_forget_passwords ();
-}
-
-void
mail_session_flush_filter_log (void)
{
MailSession *ms = (MailSession *) session;
diff --git a/mail/mail-session.h b/mail/mail-session.h
index a885081327..5998c9b91c 100644
--- a/mail/mail-session.h
+++ b/mail/mail-session.h
@@ -24,7 +24,6 @@
#define MAIL_SESSION_H
#include <glib.h>
-#include <bonobo/bonobo-ui-component.h>
#include <camel/camel-session.h>
#include <shell/e-shell-module.h>
@@ -43,8 +42,6 @@ gboolean mail_session_accept_dialog (const char *prompt, const char *key,
gboolean async);
char *mail_session_get_password (const char *url);
void mail_session_add_password (const char *url, const char *passwd);
-void mail_session_forget_passwords (BonoboUIComponent *uih, void *user_data,
- const char *path);
void mail_session_remember_password (const char *url);
void mail_session_forget_password (const char *key);