From 133603139fccebe03c9cfa17eb6c1bed427bf5d0 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Tue, 26 Dec 2006 13:26:01 +0000 Subject: [PATCH] 2006-12-26 [wwp] 2.6.1cvs70 * src/partial_download.c * src/gtk/gtkvscrollbutton.c * src/plugins/pgpinline/plugin.c Fix for few compiler warnings that matter. --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/gtkvscrollbutton.c | 2 +- src/partial_download.c | 2 -- src/plugins/pgpinline/plugin.c | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index da0869d24..5086a8ed9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-12-26 [wwp] 2.6.1cvs70 + + * src/partial_download.c + * src/gtk/gtkvscrollbutton.c + * src/plugins/pgpinline/plugin.c + Fix for few compiler warnings that matter. + 2006-12-25 [colin] 2.6.1cvs69 * src/partial_download.c diff --git a/PATCHSETS b/PATCHSETS index 735076311..f19df4d60 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2177,3 +2177,4 @@ ( cvs diff -u -r 1.382.2.344 -r 1.382.2.345 src/compose.c; ) > 2.6.1cvs67.patchset ( cvs diff -u -r 1.382.2.345 -r 1.382.2.346 src/compose.c; ) > 2.6.1cvs68.patchset ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/partial_download.c; cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/gtk/logwindow.c; ) > 2.6.1cvs69.patchset +( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/partial_download.c; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpinline/plugin.c; ) > 2.6.1cvs70.patchset diff --git a/configure.ac b/configure.ac index a11d294c7..8f0ae19d1 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=69 +EXTRA_VERSION=70 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/gtkvscrollbutton.c b/src/gtk/gtkvscrollbutton.c index 9eaa6e1ea..c6ad14c05 100644 --- a/src/gtk/gtkvscrollbutton.c +++ b/src/gtk/gtkvscrollbutton.c @@ -198,7 +198,7 @@ void gtk_vscrollbutton_set_adjustment(GtkVScrollbutton *scrollbutton, scrollbutton->adjustment = adjustment; g_object_ref(G_OBJECT(adjustment)); - gtk_object_sink(G_OBJECT(adjustment)); + gtk_object_sink(GTK_OBJECT(adjustment)); } } diff --git a/src/partial_download.c b/src/partial_download.c index 6c199dd91..7377046df 100644 --- a/src/partial_download.c +++ b/src/partial_download.c @@ -141,8 +141,6 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download) gchar uidl[POPBUFSIZE]; time_t recv_time; time_t now; - int len; - int start = TRUE; gchar partial_recv[POPBUFSIZE]; int err = -1; gchar *filename; diff --git a/src/plugins/pgpinline/plugin.c b/src/plugins/pgpinline/plugin.c index 9e21b2799..b1a093139 100644 --- a/src/plugins/pgpinline/plugin.c +++ b/src/plugins/pgpinline/plugin.c @@ -26,9 +26,9 @@ #include #include -#include "claws.h" #include "version.h" #include "pgpinline.h" +#include "plugin.h" #define PLUGIN_NAME (_("PGP/inline")) -- 2.25.1