commit 80b275a968e65802fca3cf51896b60bb45d38c5c
parent aa6b8ec48f363c8af62e90b719ae3539191336c3
Author: Colin Leroy <colin@colino.net>
Date: Tue, 16 Sep 2008 16:39:10 +0000
2008-09-16 [colin] 3.5.0cvs108
* src/messageview.c
* src/gtk/inputdialog.c
* src/gtk/inputdialog.h
Fix warnings
Diffstat:
6 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-16 [colin] 3.5.0cvs108
+
+ * src/messageview.c
+ * src/gtk/inputdialog.c
+ * src/gtk/inputdialog.h
+ Fix warnings
+
2008-09-16 [wwp] 3.5.0cvs107
* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3519,3 +3519,4 @@
( cvs diff -u -r 1.179.2.227 -r 1.179.2.228 src/imap.c; cvs diff -u -r 1.149.2.94 -r 1.149.2.95 src/inc.c; cvs diff -u -r 1.274.2.271 -r 1.274.2.272 src/mainwindow.c; cvs diff -u -r 1.39.2.50 -r 1.39.2.51 src/mainwindow.h; cvs diff -u -r 1.101.2.53 -r 1.101.2.54 src/news.c; cvs diff -u -r 1.49.2.39 -r 1.49.2.40 src/prefs_account.h; cvs diff -u -r 1.204.2.178 -r 1.204.2.179 src/prefs_common.c; cvs diff -u -r 1.103.2.113 -r 1.103.2.114 src/prefs_common.h; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_other.c; cvs diff -u -r 1.17.2.49 -r 1.17.2.50 src/send_message.c; cvs diff -u -r 1.2.2.32 -r 1.2.2.33 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/inputdialog.h; ) > 3.5.0cvs105.patchset
( cvs diff -u -r 1.61.2.84 -r 1.61.2.85 src/account.c; cvs diff -u -r 1.11.2.11 -r 1.11.2.12 src/account.h; cvs diff -u -r 1.382.2.475 -r 1.382.2.476 src/compose.c; cvs diff -u -r 1.8.2.36 -r 1.8.2.37 src/quote_fmt.c; cvs diff -u -r 1.8.2.17 -r 1.8.2.18 src/quote_fmt_lex.l; cvs diff -u -r 1.22.2.40 -r 1.22.2.41 src/quote_fmt_parse.y; ) > 3.5.0cvs106.patchset
( cvs diff -u -r 1.382.2.476 -r 1.382.2.477 src/compose.c; ) > 3.5.0cvs107.patchset
+( cvs diff -u -r 1.94.2.185 -r 1.94.2.186 src/messageview.c; cvs diff -u -r 1.2.2.33 -r 1.2.2.34 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/inputdialog.h; ) > 3.5.0cvs108.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=107
+EXTRA_VERSION=108
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
@@ -937,18 +937,18 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
LIBETPAN_LIBS="`$libetpanconfig --libs`"
LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
- if test "$LIBETPAN_VERSION" -lt "055"; then
- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.55 or newer. See http://www.etpan.org/])
+ if test "$LIBETPAN_VERSION" -lt "056"; then
+ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.56 or newer. See http://www.etpan.org/])
AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
- AC_MSG_ERROR([libetpan 0.55 not found])
+ AC_MSG_ERROR([libetpan 0.56 not found])
fi
AC_SUBST(LIBETPAN_FLAGS)
AC_SUBST(LIBETPAN_LIBS)
AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.)
else
- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.55 or newer. See http://www.etpan.org/ ])
+ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.56 or newer. See http://www.etpan.org/ ])
AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
- AC_MSG_ERROR([libetpan 0.55 not found])
+ AC_MSG_ERROR([libetpan 0.56 not found])
fi
else
AC_MSG_RESULT(no)
diff --git a/src/gtk/inputdialog.c b/src/gtk/inputdialog.c
@@ -258,7 +258,7 @@ gchar *input_dialog_query_password(const gchar *server, const gchar *user)
return pass;
}
-gchar *input_dialog_query_password_keep(const gchar *server, const gchar *user, const gchar **keep)
+gchar *input_dialog_query_password_keep(const gchar *server, const gchar *user, gchar **keep)
{
gchar *message;
gchar *pass;
@@ -276,7 +276,7 @@ gchar *input_dialog_query_password_keep(const gchar *server, const gchar *user,
message = g_strdup_printf(_("Input password:"));
if (keep && prefs_common.session_passwords) {
if (*keep != NULL) {
- pass = g_strdup (keep);
+ pass = g_strdup (*keep);
}
else {
gboolean state = FALSE;
diff --git a/src/gtk/inputdialog.h b/src/gtk/inputdialog.h
@@ -51,5 +51,5 @@ gchar *input_dialog_query_password (const gchar *server,
const gchar *user);
gchar *input_dialog_query_password_keep (const gchar *server,
const gchar *user,
- const gchar **keep);
+ gchar **keep);
#endif /* __INPUTDIALOG_H__ */
diff --git a/src/messageview.c b/src/messageview.c
@@ -1710,7 +1710,7 @@ static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
if (from_me) {
noticeview_set_icon(noticeview, STOCK_PIXMAP_NOTICE_WARN);
if (MSG_IS_RETRCPT_GOT(msginfo->flags)) {
- noticeview_set_text(noticeview, _("You got a return receipt in this message : "
+ noticeview_set_text(noticeview, _("You got a return receipt for this message : "
"it has been displayed by the recipient."));
} else {
noticeview_set_text(noticeview, _("You asked for a return receipt in this message."));
