2007-10-22 [wwp] 3.0.2cvs95

	* src/quote_fmt_parse.y
		Remove accidentally committed debug traces.
		Fix a warning.

diff --git a/ChangeLog b/ChangeLog
index 22febab8fefcdbf01cf024a6bbf50de8f9b3b31e..b1a9e57a023a1d22ec483e3aaf4cda173e6e5972 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-22 [wwp]       3.0.2cvs95
+
+       * src/quote_fmt_parse.y
+               Remove accidentally committed debug traces.
+               Fix a warning.
+

 2007-10-22 [colin]     3.0.2cvs94
 
        * src/etpan/nntp-thread.c
 2007-10-22 [colin]     3.0.2cvs94
 
        * src/etpan/nntp-thread.c

diff --git a/PATCHSETS b/PATCHSETS
index 4e156b9a4f85c170dd832534d9108dd806119786..5c42737aa9f7ad92b2b4ac998f66c64624d13168 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3007,3 +3007,4 @@
 ( cvs diff -u -r 1.1.2.50 -r 1.1.2.51 src/imap_gtk.c;  cvs diff -u -r 1.83.2.120 -r 1.83.2.121 src/mimeview.c;  cvs diff -u -r 1.96.2.188 -r 1.96.2.189 src/textview.c;  cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/inputdialog.h;  ) > 3.0.2cvs92.patchset
 ( cvs diff -u -r 1.4.2.22 -r 1.4.2.23 src/common/ssl_certificate.c;  ) > 3.0.2cvs93.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/etpan/nntp-thread.c;  ) > 3.0.2cvs94.patchset
 ( cvs diff -u -r 1.1.2.50 -r 1.1.2.51 src/imap_gtk.c;  cvs diff -u -r 1.83.2.120 -r 1.83.2.121 src/mimeview.c;  cvs diff -u -r 1.96.2.188 -r 1.96.2.189 src/textview.c;  cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/inputdialog.h;  ) > 3.0.2cvs92.patchset
 ( cvs diff -u -r 1.4.2.22 -r 1.4.2.23 src/common/ssl_certificate.c;  ) > 3.0.2cvs93.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/etpan/nntp-thread.c;  ) > 3.0.2cvs94.patchset

+( cvs diff -u -r 1.22.2.37 -r 1.22.2.38 src/quote_fmt_parse.y;  ) > 3.0.2cvs95.patchset

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

-EXTRA_VERSION=94
+EXTRA_VERSION=95

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 06ec182c7f0e01dd71e247bbc600cecee2be7801..ebc349fa6290c2df2b5b32176d180e57baa5214f 100644 (file)
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -141,7 +141,6 @@ gchar *quote_fmt_get_buffer(void)
 
 GList *quote_fmt_get_attachments_list(void)
 {
 
 GList *quote_fmt_get_attachments_list(void)
 {

-       fprintf(stderr, "+ get attachment list %p\n", attachments);

        return attachments;
 }
 
        return attachments;
 }
 


@@ -174,10 +173,8 @@ void quote_fmt_reset_vartable(void)
                var_table = NULL;
        }
        if (attachments) {
                var_table = NULL;
        }
        if (attachments) {

-               fprintf(stderr, "+ freeing attachment list\n");

                GList *cur = attachments;
                while (cur) {
                GList *cur = attachments;
                while (cur) {

-                       fprintf(stderr, "-> %s\n", (gchar*)cur->data);

                        g_free(cur->data);
                        cur = g_list_next(cur);
                }
                        g_free(cur->data);
                        cur = g_list_next(cur);
                }


@@ -523,7 +520,6 @@ static void quote_fmt_insert_user_input(const gchar *varname)
 
 static void quote_fmt_attach_file(const gchar *filename)
 {
 
 static void quote_fmt_attach_file(const gchar *filename)
 {

-       fprintf(stderr, "+ adding attachment %s\n", filename);

        attachments = g_list_append(attachments, g_strdup(filename));
 }
 
        attachments = g_list_append(attachments, g_strdup(filename));
 }
 


@@ -660,7 +656,7 @@ string:
        }
        | string CHARACTER
        {
        }
        | string CHARACTER
        {

-               int len;
+               size_t len;

                
                strncpy($$, $1, sizeof($$));
                $$[sizeof($$) - 1] = '\0';
                
                strncpy($$, $1, sizeof($$));
                $$[sizeof($$) - 1] = '\0';