aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-01-29 04:59:48 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-01-29 04:59:48 +0000
commit9a961bc4ba6f073eff54a0c12d12e6f116c7bac6 (patch)
tree072a26aaeeaff9900acc385a0bb81714222ffec8
parent63123fe5e9a6b5f26ffc1c1e5cba33972b54e502 (diff)
applied the patch: Preserve 'Auto wrapping' setting when saving to and loading from drafts.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2448 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog9
-rw-r--r--src/compose.c17
2 files changed, 22 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 40b8be93..84d5ba0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-29
+
+ * version 3.0.0beta7
+
+2010-01-29
+
+ * src/compose.c: applied the patch: Preserve 'Auto wrapping' setting
+ when saving to and loading from drafts (thanks to Antonio Ospite).
+
2010-01-28
* libsylph/libsylph-0.def
diff --git a/src/compose.c b/src/compose.c
index 830eb544..36139969 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1136,6 +1136,7 @@ void compose_reedit(MsgInfo *msginfo)
gchar buf[BUFFSIZE];
const gchar *str;
GtkWidget *focus_widget = NULL;
+ GtkItemFactory *ifactory;
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
@@ -1213,12 +1214,11 @@ void compose_reedit(MsgInfo *msginfo)
compose_connect_changed_callbacks(compose);
compose_set_title(compose);
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
if (compose->use_mdn) {
- GtkItemFactory *ifactory;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
menu_set_active(ifactory, "/Tools/Request disposition notification", TRUE);
}
+ menu_set_active(ifactory, "/Edit/Auto wrapping", compose->autowrap);
syl_plugin_signal_emit("compose-created", compose);
@@ -1599,6 +1599,7 @@ static gint compose_parse_source_msg(Compose *compose, MsgInfo *msginfo)
{"REP:", NULL, FALSE},
{"FWD:", NULL, FALSE},
{"Disposition-Notification-To:", NULL, FALSE},
+ {"X-Sylpheed-Compose-AutoWrap:", NULL, FALSE},
{NULL, NULL, FALSE}};
enum
@@ -1607,7 +1608,8 @@ static gint compose_parse_source_msg(Compose *compose, MsgInfo *msginfo)
H_X_SYLPHEED_FORWARD = 1,
H_REP = 2,
H_FWD = 3,
- H_MDN = 4
+ H_MDN = 4,
+ H_X_SYLPHEED_COMPOSE_AUTOWRAP = 5
};
gchar *file;
@@ -1638,6 +1640,11 @@ static gint compose_parse_source_msg(Compose *compose, MsgInfo *msginfo)
compose->forward_targets = g_strdup(str);
} else if (hnum == H_MDN) {
compose->use_mdn = TRUE;
+ } else if (hnum == H_X_SYLPHEED_COMPOSE_AUTOWRAP) {
+ if (g_ascii_strcasecmp(str, "TRUE") == 0)
+ compose->autowrap = TRUE;
+ else
+ compose->autowrap = FALSE;
}
}
@@ -4738,6 +4745,8 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
else if (compose->forward_targets)
fprintf(fp, "X-Sylpheed-Forward: %s\n",
compose->forward_targets);
+ fprintf(fp, "X-Sylpheed-Compose-AutoWrap: %s\n",
+ compose->autowrap ? "TRUE": "FALSE");
}
/* separator between header and body */