* all:

  - update for the other changes

pmo-trunk-r538

diff --git a/src/gtk/modest-edit-msg-window.c b/src/gtk/modest-edit-msg-window.c
index f70521a..4c7afcf 100644 (file)
--- a/src/gtk/modest-edit-msg-window.c
+++ b/src/gtk/modest-edit-msg-window.c
@@ -132,8 +132,7 @@ save_settings (ModestEditMsgWindow *self)
        priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(self);
        conf = modest_tny_platform_factory_get_modest_conf_instance (priv->fact);
 
-       modest_widget_memory_save_settings (conf, GTK_WIDGET(self),
-                                           "modest-edit-msg-window");
+       modest_widget_memory_save (conf, GTK_WIDGET(self), "modest-edit-msg-window");
 }
 
 
@@ -146,8 +145,7 @@ restore_settings (ModestEditMsgWindow *self)
        priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(self);
        conf = modest_tny_platform_factory_get_modest_conf_instance (priv->fact);
 
-       modest_widget_memory_restore_settings (conf, GTK_WIDGET(self),
-                                              "modest-edit-msg-window");
+       modest_widget_memory_restore (conf, GTK_WIDGET(self), "modest-edit-msg-window");
 }
 
        

diff --git a/src/gtk/modest-main-window.c b/src/gtk/modest-main-window.c
index 00323a8..88654b4 100644 (file)
--- a/src/gtk/modest-main-window.c
+++ b/src/gtk/modest-main-window.c
@@ -73,7 +73,7 @@ struct _ModestMainWindowPrivate {
        
        ModestWidgetFactory *widget_factory;
        TnyPlatformFactory *factory;
-  
+       
        ModestHeaderView *header_view;
        ModestFolderView *folder_view;
        ModestMsgView    *msg_preview;
@@ -266,8 +266,8 @@ on_menu_reply_forward (ModestMainWindow *self, guint action, GtkWidget *widget)
        if (header_list) {
                TnyHeader *header, *new_header;
                TnyFolder *folder;
-               TnyMsg    *msg, *new_msg;
-               ModestEditType edit_type;
+               TnyMsg    *msg, *new_msg = NULL;
+               ModestEditType edit_type = -2;
                gchar *from, *email_key;
                const gchar *account_name;
 
@@ -582,17 +582,16 @@ restore_sizes (ModestMainWindow *self)
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
        conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
 
-       modest_widget_memory_restore_settings (conf,GTK_WIDGET(self),
-                                              "modest-main-window");
-       modest_widget_memory_restore_settings (conf, GTK_WIDGET(priv->folder_paned),
-                                              "modest-folder-paned");
-       modest_widget_memory_restore_settings (conf, GTK_WIDGET(priv->msg_paned),
-                                              "modest-msg-paned");
-       modest_widget_memory_restore_settings (conf, GTK_WIDGET(priv->main_paned),
-                                              "modest-main-paned");
-       modest_widget_memory_restore_settings (conf, GTK_WIDGET(priv->header_view),
-                                              "modest-header-view");
-
+       modest_widget_memory_restore (conf,G_OBJECT(self),
+                                     "modest-main-window");
+       modest_widget_memory_restore (conf, G_OBJECT(priv->folder_paned),
+                                     "modest-folder-paned");
+       modest_widget_memory_restore (conf, G_OBJECT(priv->msg_paned),
+                                     "modest-msg-paned");
+       modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned),
+                                     "modest-main-paned");
+       modest_widget_memory_restore (conf, G_OBJECT(priv->header_view),
+                                     "header-view");
 }
 
 
@@ -605,16 +604,14 @@ save_sizes (ModestMainWindow *self)
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
        conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
        
-       modest_widget_memory_save_settings (conf,GTK_WIDGET(self),
-                                           "modest-main-window");
-       modest_widget_memory_save_settings (conf, GTK_WIDGET(priv->folder_paned),
-                                           "modest-folder-paned");
-       modest_widget_memory_save_settings (conf, GTK_WIDGET(priv->msg_paned),
-                                           "modest-msg-paned");
-       modest_widget_memory_save_settings (conf, GTK_WIDGET(priv->main_paned),
-                                           "modest-main-paned");
-       modest_widget_memory_save_settings (conf, GTK_WIDGET(priv->header_view),
-                                           "modest-header-view");
+       modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window");
+       modest_widget_memory_save (conf, G_OBJECT(priv->folder_paned),
+                                  "modest-folder-paned");
+       modest_widget_memory_save (conf, G_OBJECT(priv->msg_paned),
+                                  "modest-msg-paned");
+       modest_widget_memory_save (conf, G_OBJECT(priv->main_paned),
+                                  "modest-main-paned");
+       modest_widget_memory_save (conf, G_OBJECT(priv->header_view), "header-view");
 }
 
 static GtkWidget*