From: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Date: Tue, 25 Jul 2006 14:40:37 +0000 (+0000)
Subject: * minor
X-Git-Tag: git_migration_finished~4454
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=a76663859906115a5cc433da6933f59b17edb159

* minor

pmo-trunk-r422
---

diff --git a/src/gtk2/modest-account-assistant.c b/src/gtk2/modest-account-assistant.c
index 2823f63..c431391 100644
--- a/src/gtk2/modest-account-assistant.c
+++ b/src/gtk2/modest-account-assistant.c
@@ -197,7 +197,6 @@ add_identity_page (ModestAccountAssistant *self)
 					 page, FALSE);
 }	
 
-
 /*
 
 static void
@@ -232,7 +231,6 @@ mbox_maildir_configuration (ModestAccountAssistant *self)
 
 */
 
-
 static void
 add_receiving_page (ModestAccountAssistant *self)
 {
diff --git a/src/gtk2/modest-main-window.c b/src/gtk2/modest-main-window.c
index bfd08c1..c141f6f 100644
--- a/src/gtk2/modest-main-window.c
+++ b/src/gtk2/modest-main-window.c
@@ -31,7 +31,7 @@
 
 #include "modest-main-window.h"
 #include "modest-account-view-window.h"
-#include "modest-msg-window.h"
+#include "modest-edit-msg-window.h"
 
 /* 'private'/'protected' functions */
 static void modest_main_window_class_init    (ModestMainWindowClass *klass);
@@ -50,6 +50,7 @@ enum {
 
 typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate;
 struct _ModestMainWindowPrivate {
+
 	GtkWidget *toolbar;
 	GtkWidget *menubar;
 
@@ -130,15 +131,12 @@ modest_main_window_init (ModestMainWindow *obj)
 static void
 modest_main_window_finalize (GObject *obj)
 {
-	ModestMainWindowPrivate *priv;
-	
+	ModestMainWindowPrivate *priv;	
 	priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
-
 	if (priv->widget_factory) {
 		g_object_unref (G_OBJECT(priv->widget_factory));
 		priv->widget_factory = NULL;
 	}
-
 	if (priv->conf) {
 		g_object_unref (G_OBJECT(priv->conf));
 		priv->conf = NULL;
@@ -190,17 +188,20 @@ static void
 on_menu_new_message (ModestMainWindow *self, guint action, GtkWidget *widget)
 {
 	GtkWidget *msg_win;
+	ModestMainWindowPrivate *priv;
+
 
-	msg_win = modest_msg_window_new (MODEST_MSG_WINDOW_TYPE_NEW,
-					 NULL);
+	priv  = MODEST_MAIN_WINDOW_GET_PRIVATE(self);	
 
+	msg_win = modest_edit_msg_window_new (priv->conf,
+					      MODEST_EDIT_TYPE_NEW,
+					      NULL);
 	gtk_widget_show (msg_win);
 }
 
 static void
 on_menu_quit (ModestMainWindow *self, guint action, GtkWidget *widget)
 {
-	save_sizes (self);
 	gtk_main_quit ();
 }
 
@@ -362,6 +363,16 @@ wrapped_in_scrolled_window (GtkWidget *widget, gboolean needs_viewport)
 	return win;
 }
 
+
+static gboolean
+on_delete_event (GtkWidget *widget, GdkEvent  *event, ModestMainWindow *self)
+{
+	save_sizes (self);
+}
+
+
+
+
 GtkWidget*
 modest_main_window_new (ModestWidgetFactory *factory, ModestConf *conf)
 {
@@ -432,6 +443,9 @@ modest_main_window_new (ModestWidgetFactory *factory, ModestConf *conf)
 	
 	gtk_window_set_title (GTK_WINDOW(obj), "Modest");
 
+	g_signal_connect (G_OBJECT(obj), "delete-event",
+			  G_CALLBACK(on_delete_event), obj);
+
 	restore_sizes (MODEST_MAIN_WINDOW(obj));	
 	
 	return GTK_WIDGET(obj);
diff --git a/src/gtk2/modest-main-window.h b/src/gtk2/modest-main-window.h
index 61cb56b..578caf0 100644
--- a/src/gtk2/modest-main-window.h
+++ b/src/gtk2/modest-main-window.h
@@ -39,8 +39,7 @@ struct _ModestMainWindowClass {
 /* member functions */
 GType        modest_main_window_get_type    (void) G_GNUC_CONST;
 
-/* typical parameter-less _new function */
-/* if this is a kind of GtkWidget, it should probably return at GtkWidget* */
+
 GtkWidget*   modest_main_window_new         (ModestWidgetFactory *factory, ModestConf *conf);
 
 G_END_DECLS