2006-02-09 [colin] 2.0.0cvs39

	* src/matcher.c
		Check for pointer before using its members
	* src/gtk/gtksourceprintjob.c
		Fix a wrong warning

diff --git a/ChangeLog b/ChangeLog
index 1404519c0c383a2283c89710f0fde0d9f2291531..18895936184232c94b644e2729c2d505d96cfee3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-09 [colin]     2.0.0cvs39
+
+       * src/matcher.c
+               Check for pointer before using its members
+       * src/gtk/gtksourceprintjob.c
+               Fix a wrong warning
+

 2006-02-09 [wwp]       2.0.0cvs38
 
        * src/gtk/filesel.c
 2006-02-09 [wwp]       2.0.0cvs38
 
        * src/gtk/filesel.c

diff --git a/PATCHSETS b/PATCHSETS
index 1bd02b10d5c439ab2edcbef272c829ea2009ced8..fceac6d98c82f196032cda0a046ecbb4255ef11e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1222,3 +1222,4 @@
 ( cvs diff -u -r 1.204.2.74 -r 1.204.2.75 src/prefs_common.c;  cvs diff -u -r 1.9.2.22 -r 1.9.2.23 src/common/defs.h;  cvs diff -u -r 1.13.2.15 -r 1.13.2.16 src/common/plugin.c;  ) > 2.0.0cvs36.patchset
 ( cvs diff -u -r 1.42.2.20 -r 1.42.2.21 po/fr.po;  ) > 2.0.0cvs37.patchset
 ( cvs diff -u -r 1.2.2.21 -r 1.2.2.22 src/gtk/filesel.c;  ) > 2.0.0cvs38.patchset
 ( cvs diff -u -r 1.204.2.74 -r 1.204.2.75 src/prefs_common.c;  cvs diff -u -r 1.9.2.22 -r 1.9.2.23 src/common/defs.h;  cvs diff -u -r 1.13.2.15 -r 1.13.2.16 src/common/plugin.c;  ) > 2.0.0cvs36.patchset
 ( cvs diff -u -r 1.42.2.20 -r 1.42.2.21 po/fr.po;  ) > 2.0.0cvs37.patchset
 ( cvs diff -u -r 1.2.2.21 -r 1.2.2.22 src/gtk/filesel.c;  ) > 2.0.0cvs38.patchset

+( cvs diff -u -r 1.75.2.16 -r 1.75.2.17 src/matcher.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/gtksourceprintjob.c;  ) > 2.0.0cvs39.patchset

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

-EXTRA_VERSION=38
+EXTRA_VERSION=39

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtksourceprintjob.c b/src/gtk/gtksourceprintjob.c
index e835d336283ddef5a798d2caab5f4d31496b0b13..2944bf17ce274ae02a1edb833d1814ca9164b0e7 100644 (file)
--- a/src/gtk/gtksourceprintjob.c
+++ b/src/gtk/gtksourceprintjob.c
@@ -1710,7 +1710,7 @@ print_page (GtkSourcePrintJob *job)
        while (l != NULL)
        {
                Paragraph *para = l->data;
        while (l != NULL)
        {
                Paragraph *para = l->data;

-               gdouble baseline;
+               gdouble baseline = 0;

                gint last_line = line;
                
                line = print_paragraph (job, para, line, x, &y, &baseline, force_fit);
                gint last_line = line;
                
                line = print_paragraph (job, para, line, x, &y, &baseline, force_fit);

diff --git a/src/matcher.c b/src/matcher.c
index 7991d0febeb6abfd47a151ce2c77ac0c8fc7e0bd..eb00dea442622b52361058f8258b605c916bd5be 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -910,6 +910,9 @@ gboolean matcherlist_match(MatcherList *matchers, MsgInfo *info)
        GSList *l;
        gboolean result;
 
        GSList *l;
        gboolean result;
 

+       if (!matchers)
+               return FALSE;
+

        if (matchers->bool_and)
                result = TRUE;
        else
        if (matchers->bool_and)
                result = TRUE;
        else