* all:

  - compile fixes for maemo frontend

pmo-trunk-r658

diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index c39e931..11aefa3 100644 (file)
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Makefile.am
-# Time-stamp: <2007-01-09 17:08:25 (djcb)>
+# Time-stamp: <2007-01-17 16:00:38 (djcb)>
 #
 #
 # use Automake 'trick' ==> convenience static libraries, which
@@ -19,8 +19,6 @@ noinst_LTLIBRARIES=\
        libmodest-ui.la
 
 libmodest_ui_la_SOURCES=              \
-       modest-account-assistant.c    \
-       modest-account-assistant.h    \
        modest-account-view-window.c  \
        modest-account-view-window.h  \
        modest-edit-msg-window.c      \
@@ -31,6 +29,9 @@ libmodest_ui_la_SOURCES=              \
        modest-transport-widget.c     \
        modest-transport-widget.h     
 
+#      modest-account-assistant.c    
+#      modest-account-assistant.h    
+
 
 LDADD = \
        $(MODEST_GSTUFF_LIBS) \

diff --git a/src/maemo/modest-edit-msg-window.c b/src/maemo/modest-edit-msg-window.c
index 872a059..4b84b82 100644 (file)
--- a/src/maemo/modest-edit-msg-window.c
+++ b/src/maemo/modest-edit-msg-window.c
@@ -28,7 +28,7 @@
  */
 #include <glib/gi18n.h>
 #include <tny-account-store.h>
-#include "modest-edit-msg-window.h"
+#include <widgets/modest-edit-msg-window.h>
 #include "modest-icon-names.h"
 #include "modest-icon-factory.h"
 #include "modest-widget-memory.h"
@@ -134,7 +134,8 @@ save_settings (ModestEditMsgWindow *self)
        ModestConf *conf;
 
        priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(self);
-       conf = modest_tny_platform_factory_get_modest_conf_instance (priv->fact);
+       conf = modest_tny_platform_factory_get_conf_instance
+               (MODEST_TNY_PLATFORM_FACTORY(priv->fact));
 
        modest_widget_memory_save (conf, G_OBJECT(self), "modest-edit-msg-window");
 }
@@ -147,7 +148,8 @@ restore_settings (ModestEditMsgWindow *self)
        ModestConf *conf;
 
        priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(self);
-       conf = modest_tny_platform_factory_get_modest_conf_instance (priv->fact);
+       conf = modest_tny_platform_factory_get_conf_instance
+               (MODEST_TNY_PLATFORM_FACTORY(priv->fact));
 
        modest_widget_memory_restore (conf, G_OBJECT(self), "modest-edit-msg-window");
 }
@@ -377,9 +379,9 @@ on_delete_event (GtkWidget *widget, GdkEvent *event, ModestEditMsgWindow *self)
 }
 
 
-GtkWidget*
+ModestWindow*
 modest_edit_msg_window_new (ModestWidgetFactory *factory,
-                           GtkUIManager *ui_manager,
+                           TnyAccountStore *account_store,
                            ModestEditType type)
 {
        GObject *obj;
@@ -392,7 +394,7 @@ modest_edit_msg_window_new (ModestWidgetFactory *factory,
        priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj);
 
        priv->widget_factory = g_object_ref (factory);
-       priv->ui_manager = g_object_ref (ui_manager);
+       //priv->ui_manager = g_object_ref (ui_manager);
 
        /* Add accelerators */
        gtk_window_add_accel_group (GTK_WINDOW (obj), 
@@ -417,7 +419,7 @@ modest_edit_msg_window_new (ModestWidgetFactory *factory,
        g_signal_connect (G_OBJECT(obj), "delete-event",
                          G_CALLBACK(on_delete_event), obj);
 
-       return GTK_WIDGET (obj);
+       return (ModestWindow*)obj;
 }
 
 void

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 1d795c7..7dfc7e7 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -167,7 +167,6 @@ modest_main_window_finalize (GObject *obj)
 static ModestHeaderView*
 header_view_new (ModestMainWindow *self)
 {
-       int i;
        ModestHeaderView *header_view;
        ModestMainWindowPrivate *priv;
        
@@ -186,7 +185,8 @@ restore_sizes (ModestMainWindow *self)
        ModestMainWindowPrivate *priv;
        
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
-       conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
+       conf = modest_tny_platform_factory_get_conf_instance
+               (MODEST_TNY_PLATFORM_FACTORY(priv->factory));
 
        modest_widget_memory_restore (conf,G_OBJECT(self),
                                      "modest-main-window");
@@ -204,7 +204,8 @@ save_sizes (ModestMainWindow *self)
        ModestConf *conf;
        
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
-       conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
+       conf = modest_tny_platform_factory_get_conf_instance
+               (MODEST_TNY_PLATFORM_FACTORY(priv->factory));
        
        modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window");
        modest_widget_memory_save (conf, G_OBJECT(priv->main_paned),
@@ -241,9 +242,9 @@ on_delete_event (GtkWidget *widget, GdkEvent  *event, ModestMainWindow *self)
 }
 
 
-GtkWidget*
+ModestWindow*
 modest_main_window_new (ModestWidgetFactory *widget_factory,
-                       GtkUIManager *ui_manager)
+                       TnyAccountStore *account_store)
 {
        GObject *obj;
        ModestMainWindowPrivate *priv;
@@ -257,7 +258,7 @@ modest_main_window_new (ModestWidgetFactory *widget_factory,
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
 
        priv->widget_factory = g_object_ref (widget_factory);
-       priv->ui_manager = g_object_ref (ui_manager);
+       //priv->ui_manager = g_object_ref (ui_manager);
 
        /* Add accelerators */
        gtk_window_add_accel_group (GTK_WINDOW (obj), 

diff --git a/src/modest-ui.h b/src/modest-ui.h
index 92f0606..0d109ca 100644 (file)
--- a/src/modest-ui.h
+++ b/src/modest-ui.h
@@ -33,8 +33,8 @@
 #include <glib-object.h>
 #include <tny-account-store.h>
 #include <gtk/gtkactiongroup.h>
-#include "modest-window.h"
-#include "modest-edit-msg-window.h"
+#include <widgets/modest-window.h>
+#include <widgets/modest-edit-msg-window.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 024581e..eecc71a 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -424,7 +424,7 @@ update_model_empty (ModestFolderView *self)
        gtk_tree_store_append (store, &iter, NULL);
 
        gtk_tree_store_set (store, &iter, 0, _("(empty)"), -1);
-
+       
        gtk_tree_view_set_model (GTK_TREE_VIEW(self),
                                 GTK_TREE_MODEL(store));
        g_object_unref (store);