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.

diff --git a/ChangeLog b/ChangeLog
index da0869d247d90cbd71d3e4f5c38f7afebf4ea652..5086a8ed988227c226327e954bd2886d2f6a164e 100644 (file)
--- 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 7350763110510358c60d8b51b91eb219c28929a4..f19df4d6014223e473854b5da3de72ace550e16d 100644 (file)
--- 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 a11d294c7dd609fe942675b51e907fe9fc638d64..8f0ae19d1618762a5568a1aaa839319800dce34d 100644 (file)
--- 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 9eaa6e1ea4edf1426822bba1eb81b15a36d35d96..c6ad14c0538496b7a5a75df62d21b6c81928ea0f 100644 (file)
--- 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 6c199dd91ccfaa7a004878d6cfcbd01d0c124139..7377046dff76fe1a3d3494e64091b1798fed9b95 100644 (file)
--- 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 9e21b2799aab9aa9d1c6146a1e50a0bc17747268..b1a093139fdbf4731f48191c706362296d7000fa 100644 (file)
--- a/src/plugins/pgpinline/plugin.c
+++ b/src/plugins/pgpinline/plugin.c
@@ -26,9 +26,9 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include "claws.h"
 #include "version.h"
 #include "pgpinline.h"
+#include "plugin.h"
 
 #define PLUGIN_NAME (_("PGP/inline"))