2009-02-12 [paul] 3.7.0cvs60

	* src/gtk/spell_entry.c
	* src/gtk/spell_entry.h
		fix broken build

diff --git a/ChangeLog b/ChangeLog
index 2e215a0585d8b76d2495e608cfb9242f5f3cda9c..d392539c72a5e6d154f725b1b520400aaa0c8986 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-12 [paul]      3.7.0cvs60
+
+       * src/gtk/spell_entry.c
+       * src/gtk/spell_entry.h
+               fix broken build
+

 2009-02-11 [colin]     3.7.0cvs59
 
        * src/gtk/spell_entry.c
 2009-02-11 [colin]     3.7.0cvs59
 
        * src/gtk/spell_entry.c

diff --git a/PATCHSETS b/PATCHSETS
index 5fc9433cd43d1ef2d39ab5792b0cd38e281f2cba..7116acd43cd4f5c35febd8f1dc755460b653ef83 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3721,3 +3721,4 @@
 ( cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/printing.c;  cvs diff -u -r 1.9.2.48 -r 1.9.2.49 src/common/defs.h;  ) > 3.7.0cvs57.patchset
 ( cvs diff -u -r 1.382.2.498 -r 1.382.2.499 src/compose.c;  cvs diff -u -r 1.20.2.21 -r 1.20.2.22 src/gtk/Makefile.am;  cvs diff -u -r 1.9.2.64 -r 1.9.2.65 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/gtk/gtkaspell.h;  ) > 3.7.0cvs58.patchset
 ( diff -u /dev/null src/gtk/spell_entry.c;  diff -u /dev/null src/gtk/spell_entry.h;  ) > 3.7.0cvs59.patchset
 ( cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/printing.c;  cvs diff -u -r 1.9.2.48 -r 1.9.2.49 src/common/defs.h;  ) > 3.7.0cvs57.patchset
 ( cvs diff -u -r 1.382.2.498 -r 1.382.2.499 src/compose.c;  cvs diff -u -r 1.20.2.21 -r 1.20.2.22 src/gtk/Makefile.am;  cvs diff -u -r 1.9.2.64 -r 1.9.2.65 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/gtk/gtkaspell.h;  ) > 3.7.0cvs58.patchset
 ( diff -u /dev/null src/gtk/spell_entry.c;  diff -u /dev/null src/gtk/spell_entry.h;  ) > 3.7.0cvs59.patchset

+( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/spell_entry.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/spell_entry.h;  ) > 3.7.0cvs60.patchset

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

-EXTRA_VERSION=59
+EXTRA_VERSION=60

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/spell_entry.c b/src/gtk/spell_entry.c
index b21e17df9e842e013f825236124f1d24880732dc..3f887dfe40898473eb62c0177bf10b729562bbaa 100644 (file)
--- a/src/gtk/spell_entry.c
+++ b/src/gtk/spell_entry.c
@@ -38,10 +38,7 @@
 
 #include <string.h>
 #include <glib.h>
 
 #include <string.h>
 #include <glib.h>

-#include <gtk/gtkwidget.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkseparator.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>

 
 #include "spell_entry.h"
 #include "prefs_common.h"
 
 #include "spell_entry.h"
 #include "prefs_common.h"

diff --git a/src/gtk/spell_entry.h b/src/gtk/spell_entry.h
index c2846f68ae9508272e6bead74ce0342e22e82176..801d1dd59feb30510b5d5ed358aaffad1bfc6ba3 100644 (file)
--- a/src/gtk/spell_entry.h
+++ b/src/gtk/spell_entry.h
@@ -39,9 +39,7 @@ typedef struct _ClawsSpellEntry ClawsSpellEntry;
 typedef struct _ClawsSpellEntryClass ClawsSpellEntryClass;
 typedef struct _ClawsSpellEntryPriv ClawsSpellEntryPriv;
 
 typedef struct _ClawsSpellEntryClass ClawsSpellEntryClass;
 typedef struct _ClawsSpellEntryPriv ClawsSpellEntryPriv;
 

-#include <gtk/gtkentry.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>

 #include "gtkaspell.h"
 
 #define CLAWS_TYPE_SPELL_ENTRY            (claws_spell_entry_get_type())
 #include "gtkaspell.h"
 
 #define CLAWS_TYPE_SPELL_ENTRY            (claws_spell_entry_get_type())