From: Javier Fernandez Garcia-Boente <jfernandez@igalia.com>
Date: Thu, 5 Jul 2007 10:37:37 +0000 (+0000)
Subject: * Change save_settings call of main and viewer windows to
X-Git-Tag: git_migration_finished~2954
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=21b666ae007ad3d154fb0a081a43404529f57896

* Change save_settings call of main and viewer windows to
'delete-event' signal handler at modest-window-mgr.
* Review Copy menu item dimming rules.
* Fixes: NB#62502, NB#62342

pmo-trunk-r2584
---

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 288b88c..da10328 100644
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -442,12 +442,12 @@ wrap_in_scrolled_window (GtkWidget *win, GtkWidget *widget)
 }
 
 
-static gboolean
-on_delete_event (GtkWidget *widget, GdkEvent  *event, ModestMainWindow *self)
-{
-	modest_window_save_state (MODEST_WINDOW(self));
-	return FALSE;
-}
+/* static gboolean */
+/* on_delete_event (GtkWidget *widget, GdkEvent  *event, ModestMainWindow *self) */
+/* { */
+/* 	modest_window_save_state (MODEST_WINDOW(self)); */
+/* 	return FALSE; */
+/* } */
 
 typedef struct
 {
@@ -654,7 +654,7 @@ connect_signals (ModestMainWindow *self)
 			  self);
 	
 	/* window */
-	g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self);
+/* 	g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self); */
 	g_signal_connect (G_OBJECT (self), "window-state-event",
 			  G_CALLBACK (modest_main_window_window_state_event),
 			  NULL);
diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index 9f71d67..ded5e35 100644
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -461,12 +461,12 @@ modest_msg_view_window_finalize (GObject *obj)
 
 
 
-static gboolean
-on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgViewWindow *self)
-{
-	modest_window_save_state (MODEST_WINDOW (self));
-	return FALSE;
-}
+/* static gboolean */
+/* on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgViewWindow *self) */
+/* { */
+/* 	modest_window_save_state (MODEST_WINDOW (self)); */
+/* 	return FALSE; */
+/* } */
 
 ModestWindow *
 modest_msg_view_window_new_with_header_model (TnyMsg *msg, 
@@ -585,7 +585,7 @@ modest_msg_view_window_new (TnyMsg *msg,
 	init_window (MODEST_MSG_VIEW_WINDOW(obj), msg);
 	restore_settings (MODEST_MSG_VIEW_WINDOW(obj));
 	
-	g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj);
+/* 	g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj); */
 
 	g_signal_connect (G_OBJECT(priv->msg_view), "link_clicked",
 			  G_CALLBACK (modest_ui_actions_on_msg_link_clicked), obj);
diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 8e9aa4f..7799461 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -351,10 +351,10 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 			widget = modest_main_window_get_child_widget (main_window,
 								      MODEST_WIDGET_TYPE_HEADER_VIEW);
 			modest_header_view_refilter (MODEST_HEADER_VIEW (widget));
-		}
 
-		/* Update toolbar dimming state */
-		modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (win));
+			/* Update toolbar dimming state */
+			modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
+		}
 	}
 
 	/* free */
diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index c212f71..7ebd97d 100644
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -1438,7 +1438,7 @@ _invalid_clipboard_selected (ModestWindow *win,
 			  (MODEST_IS_ATTACHMENTS_VIEW (focused)));
 		
 		if (result)
-			modest_dimming_rule_set_notification (rule, _(""));			
+			modest_dimming_rule_set_notification (rule, "");
 	}		
 	else if (MODEST_IS_MAIN_WINDOW (win)) {
 		GtkWidget *header_view = NULL;
diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index 3995637..c49b026 100644
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -437,6 +437,11 @@ on_window_destroy (ModestWindow *window,
 		}
 	}
 
+	/* Save configuration state (TODO: why edit window does not require this function ?) */
+	if (!MODEST_IS_MSG_EDIT_WINDOW (window)) 
+		modest_window_save_state (MODEST_WINDOW(window));
+
+
 	/* Unregister window */
 	modest_window_mgr_unregister_window (self, window);