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

This commit is contained in:
Milan Crha
2011-11-29 14:48:51 +01:00
parent f2b9a4b609
commit 06e45c8e87
2 changed files with 9 additions and 7 deletions
+8 -6
View File
@@ -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);
+1 -1
View File
@@ -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);