2011-11-05 [wwp] 3.7.10cvs72

	* src/gtk/gtkaspell.c
		Fix compilation where 'null' is undefined (use NULL instead).

diff --git a/ChangeLog b/ChangeLog
index dc8abfdb55de4678d2a653a84f6eb434279a8793..d7bc1e103c7f19028ebe53df871f3a3a16df1a8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-05 [wwp]       3.7.10cvs72
+
+       * src/gtk/gtkaspell.c
+               Fix compilation where 'null' is undefined (use NULL instead).
+

 2011-11-05 [colin]     3.7.10cvs71
 
        * src/gtk/gtkaspell.c
 2011-11-05 [colin]     3.7.10cvs71
 
        * src/gtk/gtkaspell.c

diff --git a/PATCHSETS b/PATCHSETS
index b78dd59d00a2ca768a90ddff01bbf7f8c6b8e849..09904454c475d57d1257f4903d6b08010060f6c9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4275,3 +4275,4 @@
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 doc/man/claws-mail.1;  ) > 3.7.10cvs69.patchset
 ( cvs diff -u -r 1.9.2.74 -r 1.9.2.75 src/gtk/gtkaspell.c;  ) > 3.7.10cvs70.patchset
 ( cvs diff -u -r 1.9.2.75 -r 1.9.2.76 src/gtk/gtkaspell.c;  ) > 3.7.10cvs71.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 doc/man/claws-mail.1;  ) > 3.7.10cvs69.patchset
 ( cvs diff -u -r 1.9.2.74 -r 1.9.2.75 src/gtk/gtkaspell.c;  ) > 3.7.10cvs70.patchset
 ( cvs diff -u -r 1.9.2.75 -r 1.9.2.76 src/gtk/gtkaspell.c;  ) > 3.7.10cvs71.patchset

+( cvs diff -u -r 1.9.2.76 -r 1.9.2.77 src/gtk/gtkaspell.c;  ) > 3.7.10cvs72.patchset

diff --git a/configure.ac b/configure.ac
index 4f9aa5da56818e61901dd0904977597347ff4cbb..a41ee542b9e77580b17cf64bf0fffb963d7b6625 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=71
+EXTRA_VERSION=72

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index d50ed5621a7739fc1b1fcde4cfbcbb5c2cd2b13d..18cd509a9b01b5e6a2544c5f509f6057d452f051 100644 (file)
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -1192,7 +1192,7 @@ void gtkaspell_block_check(GtkAspell *gtkaspell)
 {
        GtkTextView *gtktext;
        
 {
        GtkTextView *gtktext;
        

-       if (gtkaspell == null)
+       if (gtkaspell == NULL)

                return;
                
        gtktext = gtkaspell->gtktext;
                return;
                
        gtktext = gtkaspell->gtktext;


@@ -1208,7 +1208,7 @@ void gtkaspell_unblock_check(GtkAspell *gtkaspell)
 {
        GtkTextView *gtktext;
 
 {
        GtkTextView *gtktext;
 

-       if (gtkaspell == null)
+       if (gtkaspell == NULL)

                return;
                
        gtktext = gtkaspell->gtktext;
                return;
                
        gtktext = gtkaspell->gtktext;