2005-09-09 [paul] 1.9.14cvs11

	* src/mainwindow.c
		fix asserts
	* src/common/xml.c
		delay memory allocation until file is
		opened successfully
		Patch by Daniel Gustafson

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 8e2c428deb3e28240f61a3eb7224f9b49feb3ae9..8c24683b3f48fae8dadf6f9571522e562c5689d2 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,12 @@
+2005-09-09 [paul]      1.9.14cvs11
+
+       * src/mainwindow.c
+               fix asserts
+       * src/common/xml.c
+               delay memory allocation until file is
+               opened successfully
+               Patch by Daniel Gustafson
+

 2005-09-09 [cleroy]    1.9.14cvs10
 
        * src/imap.c
 2005-09-09 [cleroy]    1.9.14cvs10
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index 04515c9216bb5c0c2d46f96ffeb45193cc55a421..30f34317f9c812cc5a992c26258742b2ac707211 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -779,3 +779,4 @@
 ( cvs diff -u -r 1.654.2.818 -r 1.654.2.819 configure.ac;  cvs diff -u -r 1.96.2.73 -r 1.96.2.74 src/textview.c;  ) > 1.9.14cvs8.patchset
 ( cvs diff -u -r 1.382.2.162 -r 1.382.2.163 src/compose.c;  cvs diff -u -r 1.213.2.54 -r 1.213.2.55 src/folder.c;  cvs diff -u -r 1.87.2.16 -r 1.87.2.17 src/folder.h;  cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.1 -r 1.2.2.2 src/folder_item_prefs.h;  cvs diff -u -r 1.179.2.66 -r 1.179.2.67 src/imap.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/imap_gtk.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/imap_gtk.h;  cvs diff -u -r 1.115.2.52 -r 1.115.2.53 src/main.c;  cvs diff -u -r 1.274.2.61 -r 1.274.2.62 src/mainwindow.c;  cvs diff -u -r 1.39.2.4 -r 1.39.2.5 src/mainwindow.h;  cvs diff -u -r 1.101.2.13 -r 1.101.2.14 src/news.c;  cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/news_gtk.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/news_gtk.h;  cvs diff -u -r 1.52.2.12 -r 1.52.2.13 src/prefs_folder_item.c;  ) > 1.9.14cvs9.patchset
 ( cvs diff -u -r 1.179.2.67 -r 1.179.2.68 src/imap.c;  ) > 1.9.14cvs10.patchset
 ( cvs diff -u -r 1.654.2.818 -r 1.654.2.819 configure.ac;  cvs diff -u -r 1.96.2.73 -r 1.96.2.74 src/textview.c;  ) > 1.9.14cvs8.patchset
 ( cvs diff -u -r 1.382.2.162 -r 1.382.2.163 src/compose.c;  cvs diff -u -r 1.213.2.54 -r 1.213.2.55 src/folder.c;  cvs diff -u -r 1.87.2.16 -r 1.87.2.17 src/folder.h;  cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.1 -r 1.2.2.2 src/folder_item_prefs.h;  cvs diff -u -r 1.179.2.66 -r 1.179.2.67 src/imap.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/imap_gtk.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/imap_gtk.h;  cvs diff -u -r 1.115.2.52 -r 1.115.2.53 src/main.c;  cvs diff -u -r 1.274.2.61 -r 1.274.2.62 src/mainwindow.c;  cvs diff -u -r 1.39.2.4 -r 1.39.2.5 src/mainwindow.h;  cvs diff -u -r 1.101.2.13 -r 1.101.2.14 src/news.c;  cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/news_gtk.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/news_gtk.h;  cvs diff -u -r 1.52.2.12 -r 1.52.2.13 src/prefs_folder_item.c;  ) > 1.9.14cvs9.patchset
 ( cvs diff -u -r 1.179.2.67 -r 1.179.2.68 src/imap.c;  ) > 1.9.14cvs10.patchset

+( cvs diff -u -r 1.274.2.62 -r 1.274.2.63 src/mainwindow.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/common/xml.c;  ) > 1.9.14cvs11.patchset

diff --git a/configure.ac b/configure.ac
index 52894dbbafc8af9e2a4fe6a108a762a992be7ddc..741eb466b0191e7faada8e53310eb780855fd56c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=10
+EXTRA_VERSION=11

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/xml.c b/src/common/xml.c
index 63ba7b41b066c501bd156694761de803a4b57f2b..8fd56625253d017908947b1f68a79326f618600a 100644 (file)
--- a/src/common/xml.c
+++ b/src/common/xml.c
@@ -69,8 +69,6 @@ XMLFile *xml_open_file(const gchar *path)
 
        g_return_val_if_fail(path != NULL, NULL);
 
 
        g_return_val_if_fail(path != NULL, NULL);
 

-       XML_STRING_TABLE_CREATE();
-

        newfile = g_new(XMLFile, 1);
 
        newfile->fp = g_fopen(path, "rb");
        newfile = g_new(XMLFile, 1);
 
        newfile->fp = g_fopen(path, "rb");


@@ -79,6 +77,8 @@ XMLFile *xml_open_file(const gchar *path)
                return NULL;
        }
 
                return NULL;
        }
 

+       XML_STRING_TABLE_CREATE();
+

        newfile->buf = g_string_new(NULL);
        newfile->bufp = newfile->buf->str;
 
        newfile->buf = g_string_new(NULL);
        newfile->bufp = newfile->buf->str;
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 218877be1598e6209ffd3b5a283e2cb9428e3d6b..e8155fbb67aa1171902b67f6d6d8524bab1077fc 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1896,15 +1896,15 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        case SORT_BY_NUMBER:
                menu_path = "/View/Sort/by number"; break;
        case SORT_BY_SIZE:
        case SORT_BY_NUMBER:
                menu_path = "/View/Sort/by number"; break;
        case SORT_BY_SIZE:

-               menu_path = "/View/Sort/by size"; break;
+               menu_path = "/View/Sort/by Size"; break;

        case SORT_BY_DATE:
        case SORT_BY_DATE:

-               menu_path = "/View/Sort/by date"; break;
+               menu_path = "/View/Sort/by Date"; break;

        case SORT_BY_FROM:
        case SORT_BY_FROM:

-               menu_path = "/View/Sort/by from"; break;
+               menu_path = "/View/Sort/by From"; break;

        case SORT_BY_TO:
        case SORT_BY_TO:

-               menu_path = "/View/Sort/by recipient"; break;
+               menu_path = "/View/Sort/by To"; break;

        case SORT_BY_SUBJECT:
        case SORT_BY_SUBJECT:

-               menu_path = "/View/Sort/by subject"; break;
+               menu_path = "/View/Sort/by Subject"; break;

        case SORT_BY_LABEL:
                menu_path = "/View/Sort/by color label"; break;
        case SORT_BY_MARK:
        case SORT_BY_LABEL:
                menu_path = "/View/Sort/by color label"; break;
        case SORT_BY_MARK: