2005-05-24 [colin] 1.0.4cvs13

	* src/gtk/colorsel.c
		Fix compile error

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 862bc62713f0cda1ce2d441e805c9eca8cbcbe1c..dda9d5422e5117e66da756f1247b3b3fd8781331 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2005-05-24 [colin]     1.0.4cvs13
+
+       * src/gtk/colorsel.c
+               Fix compile error
+

 2005-05-23 [colin]     1.0.4cvs12
 
        * src/gtk/colorsel.c
 2005-05-23 [colin]     1.0.4cvs12
 
        * src/gtk/colorsel.c

diff --git a/PATCHSETS b/PATCHSETS
index 817e45b68f6269fc9dd3d259ce4d899327fce24a..30f16b4da90748140e46d38c80e46a7d3c140675 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -280,3 +280,4 @@
 ( cvs diff -u -r 1.4 -r 1.5 src/imap_gtk.c; cvs diff -u -r 1.180 -r 1.181 src/inc.c; cvs diff -u -r 1.319 -r 1.320 src/mainwindow.c; cvs diff -u -r 1.5 -r 1.6 src/mh_gtk.c; cvs diff -u -r 1.57 -r 1.58 src/toolbar.c; ) > 1.0.4cvs10.patchset
 ( cvs diff -u -r 1.132 -r 1.133 AUTHORS; cvs diff -u -r 1.35 -r 1.36 INSTALL; cvs diff -u -r 1.28 -r 1.29 Makefile.am; cvs diff -u -r 1.41 -r 1.42 README.claws; cvs diff -u -r 0 -r 1 RELEASE_NOTES.claws; cvs diff -u -r 1.1364 -r 1.1365 configure.ac; cvs diff -u -r 0 -r 1 po/ca.po; cvs diff -u -r 1.71 -r 1.72 po/de.po; cvs diff -u -r 1.75 -r 1.76 po/es.po; cvs diff -u -r 0 -r 1 po/fi.po; cvs diff -u -r 1.54 -r 1.55 po/fr.po; cvs diff -u -r 1.42 -r 1.43 po/it.po; cvs diff -u -r 1.17 -r 1.18 po/pl.po; cvs diff -u -r 1.24 -r 1.25 po/ru.po; cvs diff -u -r 1.16 -r 1.17 po/sk.po; cvs diff -u -r 1.27 -r 1.28 po/sr.po; cvs diff -u -r 1.12 -r 1.13 po/zh_CN.po; cvs diff -u -r 1.151 -r 1.152 src/main.c; cvs diff -u -r 1.4 -r 1.5 src/partial_download.c; cvs diff -u -r 1.64 -r 1.65 src/common/utils.c; ) > 1.0.4cvs11.patchset
 ( cvs diff -u -r 1.2 -r 1.3 src/gtk/colorsel.c; ) > 1.0.4cvs12.patchset
 ( cvs diff -u -r 1.4 -r 1.5 src/imap_gtk.c; cvs diff -u -r 1.180 -r 1.181 src/inc.c; cvs diff -u -r 1.319 -r 1.320 src/mainwindow.c; cvs diff -u -r 1.5 -r 1.6 src/mh_gtk.c; cvs diff -u -r 1.57 -r 1.58 src/toolbar.c; ) > 1.0.4cvs10.patchset
 ( cvs diff -u -r 1.132 -r 1.133 AUTHORS; cvs diff -u -r 1.35 -r 1.36 INSTALL; cvs diff -u -r 1.28 -r 1.29 Makefile.am; cvs diff -u -r 1.41 -r 1.42 README.claws; cvs diff -u -r 0 -r 1 RELEASE_NOTES.claws; cvs diff -u -r 1.1364 -r 1.1365 configure.ac; cvs diff -u -r 0 -r 1 po/ca.po; cvs diff -u -r 1.71 -r 1.72 po/de.po; cvs diff -u -r 1.75 -r 1.76 po/es.po; cvs diff -u -r 0 -r 1 po/fi.po; cvs diff -u -r 1.54 -r 1.55 po/fr.po; cvs diff -u -r 1.42 -r 1.43 po/it.po; cvs diff -u -r 1.17 -r 1.18 po/pl.po; cvs diff -u -r 1.24 -r 1.25 po/ru.po; cvs diff -u -r 1.16 -r 1.17 po/sk.po; cvs diff -u -r 1.27 -r 1.28 po/sr.po; cvs diff -u -r 1.12 -r 1.13 po/zh_CN.po; cvs diff -u -r 1.151 -r 1.152 src/main.c; cvs diff -u -r 1.4 -r 1.5 src/partial_download.c; cvs diff -u -r 1.64 -r 1.65 src/common/utils.c; ) > 1.0.4cvs11.patchset
 ( cvs diff -u -r 1.2 -r 1.3 src/gtk/colorsel.c; ) > 1.0.4cvs12.patchset

+( cvs diff -u -r 1.3 -r 1.4 src/gtk/colorsel.c; ) > 1.0.4cvs13.patchset

diff --git a/configure.ac b/configure.ac
index 93b0dc64374acf95b06eb0beb38c07a644cde536..caaaab6c7bc9b3827d8fe43f74a1ab78728d22a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=12
+EXTRA_VERSION=13

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/gtk/colorsel.c b/src/gtk/colorsel.c
index da0fd8d54fca4e93569f53ca2e8866963b9e93f9..f248efc494b80a6dec31eb0e5189259eeb65aa0c 100644 (file)
--- a/src/gtk/colorsel.c
+++ b/src/gtk/colorsel.c
@@ -18,6 +18,7 @@
  */
 
 #include <gtk/gtk.h>
  */
 
 #include <gtk/gtk.h>

+#include <gdk/gdkkeysyms.h>

 
 #include "colorsel.h"
 #include "manage_window.h"
 
 #include "colorsel.h"
 #include "manage_window.h"