gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2007-08-25 [wwp] 2.10.0cvs174

Browse source 
* src/alertpanel.c
	* src/messageview.c
	* src/prefs_actions.c
		Call the pango markup escape function right ince in alertpanel_create
		instead of everywhere (reverts some parts of 2.10.0cvs123 and
		2.10.0cvs158).

	* src/common/log.c
		Fix a crash due to a misuse of g_print(), encountered when the string
		passed to g_print was containing printf substitution symbols.
This commit is contained in:
Tristan Chabredier 2007-08-25 16:59:40 +00:00
parent 44661ecf7d
commit 9ec9de93c7
7 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2007-08-25 [wwp] 2.10.0cvs174
* src/alertpanel.c
* src/messageview.c
* src/prefs_actions.c
Call the pango markup escape function right ince in alertpanel_create
instead of everywhere (reverts some parts of 2.10.0cvs123 and
2.10.0cvs158).
* src/common/log.c
Fix a crash due to a misuse of g_print(), encountered when the string
passed to g_print was containing printf substitution symbols.
2007-08-25 [paul] 2.10.0cvs173
* src/common/log.c

1
PATCHSETS
View file

@ -2828,3 +2828,4 @@
( cvs diff -u -r 1.155.2.73 -r 1.155.2.74 src/Makefile.am; cvs diff -u -r 1.25.2.46 -r 1.25.2.47 src/stock_pixmap.c; diff -u /dev/null src/pixmaps/insert_file.xpm; ) > 2.10.0cvs171.patchset
( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/icon_legend.c; ) > 2.10.0cvs172.patchset
( cvs diff -u -r 1.6.2.15 -r 1.6.2.16 src/common/log.c; ) > 2.10.0cvs173.patchset
( cvs diff -u -r 1.17.2.36 -r 1.17.2.37 src/alertpanel.c; cvs diff -u -r 1.94.2.147 -r 1.94.2.148 src/messageview.c; cvs diff -u -r 1.60.2.48 -r 1.60.2.49 src/prefs_actions.c; cvs diff -u -r 1.6.2.16 -r 1.6.2.17 src/common/log.c; ) > 2.10.0cvs174.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=10
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=173
EXTRA_VERSION=174
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

7
src/alertpanel.c
View file

@ -243,6 +243,7 @@ static void alertpanel_create(const gchar *title,
GtkWidget *button3;
const gchar *label2;
const gchar *label3;
gchar *esc_message;
gchar *tmp = title?g_markup_printf_escaped("%s", title)
:g_strdup("");
gchar *title_full = g_strdup_printf("<span weight=\"bold\" "
@ -319,8 +320,10 @@ static void alertpanel_create(const gchar *title,
if (font_desc)
gtk_widget_modify_font(label, font_desc);
g_free(title_full);
label = gtk_label_new(message);
esc_message = g_markup_printf_escaped("%s", message);
label = gtk_label_new(esc_message);
g_free(esc_message);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);

2
src/common/log.c
View file

@ -140,7 +140,7 @@ void log_print(LogInstance instance, const gchar *format, ...)
g_vsnprintf(buf + LOG_TIME_LEN, BUFFSIZE, format, args);
va_end(args);
if (debug_get_mode()) g_printf(buf);
if (debug_get_mode()) g_print("%s", buf);
logtext->instance = instance;
logtext->text = g_strdup(buf);

2
src/messageview.c
View file

@ -588,7 +588,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
if (ok != 0) {
AlertValue val;
gchar *message;
message = g_markup_printf_escaped(
message = g_strdup_printf(
_("The notification address to which the return receipt is\n"
"to be sent does not correspond to the return path:\n"
"Notification address: %s\n"

6
src/prefs_actions.c
View file

@ -568,11 +568,7 @@ static gint prefs_actions_clist_set_row(GtkTreeIter *row)
}
if (action_get_type(entry_text) == ACTION_ERROR) {
gchar *message;
message = g_markup_printf_escaped(_("The command\n%s\nhas a syntax error."),
entry_text);
alertpanel_error(message);
g_free(message);
alertpanel_error(_("The command\n%s\nhas a syntax error."), entry_text);
return -1;
}