aboutsummaryrefslogtreecommitdiffstats
path: root/mail/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/main.c')
-rw-r--r--mail/main.c35
1 files changed, 17 insertions, 18 deletions
diff --git a/mail/main.c b/mail/main.c
index 8be41242c8..7158fc3bbb 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -22,15 +22,14 @@
#include <liboaf/liboaf.h>
#include <libgnomevfs/gnome-vfs.h>
-#ifdef GTKHTML_HAVE_GCONF
#include <gconf/gconf.h>
-#endif
#include <gal/widgets/e-gui-utils.h>
#include <gal/widgets/e-cursors.h>
#include <gal/widgets/e-unicode.h>
#include "e-util/e-passwords.h"
+#include "e-util/e-proxy.h"
#include "component-factory.h"
#include "composer/evolution-composer.h"
@@ -113,9 +112,9 @@ main (int argc, char *argv [])
gnome_segv_handler = osa.sa_handler;
g_static_mutex_lock (&segv_mutex);
}
-
+
orb = oaf_init (argc, argv);
-
+
if (bonobo_init (orb, CORBA_OBJECT_NIL,
CORBA_OBJECT_NIL) == FALSE) {
g_error ("Mail component could not initialize Bonobo.\n"
@@ -123,22 +122,22 @@ main (int argc, char *argv [])
"RootPOA, it probably means\nyou compiled "
"Bonobo against GOAD instead of OAF.");
}
-
+
gtk_widget_push_visual (gdk_rgb_get_visual ());
gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-#ifdef GTKHTML_HAVE_GCONF
+
gconf_init (argc, argv, NULL);
-#endif
-
+
glade_gnome_init ();
-
+
gnome_vfs_init ();
e_cursors_init ();
-
+
+ e_proxy_init ();
+
e_passwords_init ("Mail");
-
+
mail_config_init ();
mail_msg_init ();
@@ -146,23 +145,23 @@ main (int argc, char *argv [])
component_factory_init ();
evolution_composer_factory_init (composer_send_cb, composer_save_draft_cb);
-
+
if (gdk_threads_mutex) {
g_mutex_free (gdk_threads_mutex);
gdk_threads_mutex = NULL;
}
-
+
g_print ("Evolution Mail ready and running.\n");
-
+
GDK_THREADS_ENTER ();
bonobo_main ();
-
+
mail_msg_cleanup();
-
+
GDK_THREADS_LEAVE ();
mail_config_write_on_exit ();
-
+
e_passwords_shutdown ();
gnome_sound_shutdown ();