* all:

	- updates for modest account mgr changes

pmo-trunk-r721

diff --git a/src/Makefile.am b/src/Makefile.am
index f5ac689..2c5f7b1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Makefile.am
-# Time-stamp: <2007-01-21 21:41:46 (djcb)>
+# Time-stamp: <2007-01-24 09:06:54 (djcb)>
 SUBDIRS=$(MODEST_PLATFORM) widgets
 DIST_SUBDIRS = widgets gtk maemo
 
@@ -32,6 +32,10 @@ bin_PROGRAMS=\
 modest_SOURCES=\
        modest-account-mgr.c\
        modest-account-mgr.h\
+       modest-account-mgr-helpers.h\
+       modest-account-mgr-helpers.c\
+       modest-account-mgr-priv.h\
+       modest-account-mgr-priv.c\
        modest-cache-mgr.c\
        modest-cache-mgr.h\
        modest-conf.c\

diff --git a/src/gtk/modest-edit-msg-window.c b/src/gtk/modest-edit-msg-window.c
index 19046a8..54b0a16 100644 (file)
--- a/src/gtk/modest-edit-msg-window.c
+++ b/src/gtk/modest-edit-msg-window.c
@@ -28,6 +28,10 @@
  */
 #include <glib/gi18n.h>
 #include <tny-account-store.h>
+
+#include <modest-account-mgr.h>
+#include <modest-account-mgr-helpers.h>
+
 #include "modest-edit-msg-window.h"
 #include "modest-edit-msg-window-ui.h"
 #include "modest-icon-names.h"
@@ -211,7 +215,6 @@ static void
 modest_edit_msg_window_finalize (GObject *obj)
 {
        G_OBJECT_CLASS(parent_class)->finalize (obj);
-
 }
 
 
@@ -263,8 +266,8 @@ modest_edit_msg_window_new (ModestWidgetFactory *factory,
 
        /* Load the UI definition */
        gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-edit-msg-window-ui.xml", &error);
-       if (error != NULL) {
-               g_warning ("Could not merge modest-edit-msg-window-ui.xml: %s", error->message);
+       if (error) {
+               g_printerr ("modest: could not merge modest-edit-msg-window-ui.xml: %s\n", error->message);
                g_error_free (error);
                error = NULL;
        }

diff --git a/src/maemo/modest-edit-msg-window.c b/src/maemo/modest-edit-msg-window.c
index d2d3058..d17a27e 100644 (file)
--- a/src/maemo/modest-edit-msg-window.c
+++ b/src/maemo/modest-edit-msg-window.c
@@ -28,6 +28,10 @@
  */
 #include <glib/gi18n.h>
 #include <tny-account-store.h>
+
+#include <modest-account-mgr.h>
+#include <modest-account-mgr-helpers.h>
+
 #include <widgets/modest-edit-msg-window.h>
 #include "modest-edit-msg-window-ui.h"
 #include "modest-icon-names.h"

diff --git a/src/modest-widget-factory.c b/src/modest-widget-factory.c
index 6a42374..cfac9b9 100644 (file)
--- a/src/modest-widget-factory.c
+++ b/src/modest-widget-factory.c
@@ -39,7 +39,10 @@
 #include "modest-widget-memory.h"
 #include <modest-protocol-info.h>
 #include "modest-tny-platform-factory.h"
-#include "modest-account-mgr.h"
+
+#include <modest-account-mgr.h>
+#include <modest-account-mgr-helpers.h>
+
 #include "modest-mail-operation.h"
 #include "widgets/modest-header-view-priv.h"