Revision 3236 src/compose.c

View differences:

compose.c
898 898
	}
899 899

  
900 900
	if (quote) {
901
		gchar *qmark;
902
		gchar *quote_str;
903

  
904
		if (prefs_common.quotemark && *prefs_common.quotemark)
905
			qmark = prefs_common.quotemark;
906
		else
907
			qmark = "> ";
908

  
909
		quote_str = compose_quote_fmt(compose, replyinfo,
910
					      prefs_common.quotefmt,
911
					      qmark, body);
901
		compose_quote_fmt(compose, replyinfo,
902
				  prefs_common.quotefmt,
903
				  prefs_common.quotemark, body);
912 904
	}
913 905

  
914 906
	if (!account->sig_before_quote && prefs_common.auto_sig)
......
1030 1022

  
1031 1023
			g_free(msgfile);
1032 1024
		} else {
1033
			gchar *qmark;
1034
			gchar *quote_str;
1035 1025
			MsgInfo *full_msginfo;
1036 1026

  
1037 1027
			full_msginfo = procmsg_msginfo_get_full_info(msginfo);
......
1047 1037
					(buffer, &iter, "\n\n", 2);
1048 1038
			}
1049 1039

  
1050
			if (prefs_common.fw_quotemark &&
1051
			    *prefs_common.fw_quotemark)
1052
				qmark = prefs_common.fw_quotemark;
1053
			else
1054
				qmark = "> ";
1055

  
1056
			quote_str = compose_quote_fmt(compose, full_msginfo,
1057
						      prefs_common.fw_quotefmt,
1058
						      qmark, body);
1040
			compose_quote_fmt(compose, full_msginfo,
1041
					  prefs_common.fw_quotefmt,
1042
					  prefs_common.fw_quotemark, body);
1059 1043
			compose_attach_parts(compose, msginfo);
1060 1044

  
1061 1045
			procmsg_msginfo_free(full_msginfo);
......
1746 1730
	if (!msginfo)
1747 1731
		msginfo = &dummyinfo;
1748 1732

  
1749
	if (qmark != NULL) {
1750
		quote_fmt_init(msginfo, NULL, NULL);
1751
		quote_fmt_scan_string(qmark);
1752
		quote_fmt_parse();
1733
	if (qmark == NULL || *qmark == '\0')
1734
		qmark = "> ";
1753 1735

  
1754
		buf = quote_fmt_get_buffer();
1755
		if (buf == NULL)
1756
			alertpanel_error(_("Quote mark format error."));
1757
		else
1758
			quote_str = g_strdup(buf);
1759
	}
1736
	quote_fmt_init(msginfo, NULL, NULL);
1737
	quote_fmt_scan_string(qmark);
1738
	quote_fmt_parse();
1760 1739

  
1740
	buf = quote_fmt_get_buffer();
1741
	if (buf == NULL)
1742
		alertpanel_error(_("Quote mark format error."));
1743
	else
1744
		quote_str = g_strdup(buf);
1745

  
1761 1746
	if (fmt && *fmt != '\0') {
1762 1747
		quote_fmt_init(msginfo, quote_str, body);
1763 1748
		quote_fmt_scan_string(fmt);
......
6223 6208
	GtkTextBuffer *buffer;
6224 6209
	GtkTextMark *mark;
6225 6210
	GtkTextIter iter;
6226
	gchar *qmark;
6227 6211
	gchar *parsed_str;
6228 6212

  
6229 6213
	if (!tmpl || !tmpl->value) return;
......
6257 6241
		gint num;
6258 6242
		MsgInfo *msginfo = NULL;
6259 6243

  
6260
		if (prefs_common.quotemark && *prefs_common.quotemark)
6261
			qmark = prefs_common.quotemark;
6262
		else
6263
			qmark = "> ";
6264

  
6265 6244
		item = folder_find_item_and_num_from_id(compose->reply_target,
6266 6245
							&num);
6267 6246
		if (item && num > 0)
6268 6247
			msginfo = folder_item_get_msginfo(item, num);
6269 6248
		parsed_str = compose_quote_fmt(compose, msginfo,
6270
					       tmpl->value, qmark, NULL);
6249
					       tmpl->value,
6250
					       prefs_common.quotemark, NULL);
6271 6251
		procmsg_msginfo_free(msginfo);
6272 6252
	}
6273 6253

  
......
7706 7686
	GtkTextMark *mark;
7707 7687
	GtkClipboard *clipboard;
7708 7688
	gchar *str = NULL;
7709
	const gchar *qmark;
7710 7689

  
7711 7690
	if (!compose->focused_editable ||
7712 7691
	    !GTK_WIDGET_HAS_FOCUS(compose->focused_editable) ||
......
7720 7699
	if (!str)
7721 7700
		return;
7722 7701

  
7723
	if (prefs_common.quotemark && *prefs_common.quotemark)
7724
		qmark = prefs_common.quotemark;
7725
	else
7726
		qmark = "> ";
7727
	compose_quote_fmt(compose, NULL, "%Q", qmark, str);
7702
	compose_quote_fmt(compose, NULL, "%Q", prefs_common.quotemark, str);
7728 7703

  
7729 7704
	g_free(str);
7730 7705

  

Also available in: Unified diff