[evolution] Bug #664708 - Composer's headers preference is reset on From change

[Milan Crha <mcrha src gnome org>]

commit 06e45c8e87d64c8d5a180115bcdded2f3551a886
Author: Milan Crha <mcrha redhat com>
Date:   Tue Nov 29 14:48:51 2011 +0100

    Bug #664708 - Composer's headers preference is reset on From change

 composer/e-composer-header-table.c     |   14 ++++++++------
 modules/calendar/e-cal-shell-content.c |    2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 5083ef3..d0955c4 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -334,6 +334,9 @@ composer_header_table_setup_mail_headers (EComposerHeaderTable *table)
 				break;
 		}
 
+		if (key != NULL)
+			g_settings_unbind (header, "visible");
+
 		switch (ii) {
 			case E_COMPOSER_HEADER_FROM:
 				sensitive = TRUE;
@@ -358,10 +361,8 @@ composer_header_table_setup_mail_headers (EComposerHeaderTable *table)
 		e_composer_header_set_sensitive (header, sensitive);
 		e_composer_header_set_visible (header, visible);
 
-		if (key != NULL) {
-			g_settings_unbind (settings, key);
+		if (key != NULL)
 			g_settings_bind (settings, key, G_OBJECT (header), "visible", G_SETTINGS_BIND_DEFAULT);
-		}
 	}
 
 	g_object_unref (settings);
@@ -395,6 +396,9 @@ composer_header_table_setup_post_headers (EComposerHeaderTable *table)
 				break;
 		}
 
+		if (key != NULL)
+			g_settings_unbind (header, "visible");
+
 		switch (ii) {
 			case E_COMPOSER_HEADER_FROM:
 			case E_COMPOSER_HEADER_POST_TO:
@@ -410,10 +414,8 @@ composer_header_table_setup_post_headers (EComposerHeaderTable *table)
 				break;
 		}
 
-		if (key != NULL) {
-			g_settings_unbind (settings, key);
+		if (key != NULL)
 			g_settings_bind (settings, key, G_OBJECT (header), "visible", G_SETTINGS_BIND_DEFAULT);
-		}
 	}
 
 	g_object_unref (settings);
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index e2e1ce5..5c2d1bd 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -125,7 +125,7 @@ cal_shell_content_notify_view_id_cb (ECalShellContent *cal_shell_content)
 	else
 		key = "hpane-position";
 
-	g_settings_unbind (settings, key);
+	g_settings_unbind (paned, "hposition");
 
 	g_settings_bind (settings, key, G_OBJECT (paned), "hposition", G_SETTINGS_BIND_DEFAULT);