2005-09-17 [paul] 1.9.14cvs38

	* src/folderview.c
	* src/mainwindow.c
		fix gcc-2.95 issues
		Patch by Pawel Pekala

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index f538245f5ca735da3b47252c9ce843366f4be804..46f2b462205ed11fe31eb629d3bd2678d19065ff 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-09-17 [paul]      1.9.14cvs38
+
+       * src/folderview.c
+       * src/mainwindow.c
+               fix gcc-2.95 issues
+               Patch by Pawel Pekala
+

 2005-09-17 [colin]     1.9.14cvs37
 
        * src/addrindex.c
 2005-09-17 [colin]     1.9.14cvs37
 
        * src/addrindex.c

diff --git a/PATCHSETS b/PATCHSETS
index 8140d90c5c95ab3bd3c52f5202f4b9d9d00fb1a2..32ea7f752d55b9e4469496e952c68a34b67304da 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -806,3 +806,4 @@
 ( cvs diff -u -r 1.18.2.11 -r 1.18.2.12 src/jpilot.c;  ) > 1.9.14cvs35.patchset
 ( cvs diff -u -r 1.60.2.22 -r 1.60.2.23 src/prefs_actions.c;  cvs diff -u -r 1.16.2.13 -r 1.16.2.14 src/prefs_customheader.c;  cvs diff -u -r 1.16.2.13 -r 1.16.2.14 src/prefs_display_header.c;  cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.23 -r 1.43.2.24 src/prefs_matcher.c;  cvs diff -u -r 1.30.2.16 -r 1.30.2.17 src/prefs_toolbar.c;  ) > 1.9.14cvs36.patchset
 ( cvs diff -u -r 1.28.2.9 -r 1.28.2.10 src/addrindex.c;  ) > 1.9.14cvs37.patchset
 ( cvs diff -u -r 1.18.2.11 -r 1.18.2.12 src/jpilot.c;  ) > 1.9.14cvs35.patchset
 ( cvs diff -u -r 1.60.2.22 -r 1.60.2.23 src/prefs_actions.c;  cvs diff -u -r 1.16.2.13 -r 1.16.2.14 src/prefs_customheader.c;  cvs diff -u -r 1.16.2.13 -r 1.16.2.14 src/prefs_display_header.c;  cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.23 -r 1.43.2.24 src/prefs_matcher.c;  cvs diff -u -r 1.30.2.16 -r 1.30.2.17 src/prefs_toolbar.c;  ) > 1.9.14cvs36.patchset
 ( cvs diff -u -r 1.28.2.9 -r 1.28.2.10 src/addrindex.c;  ) > 1.9.14cvs37.patchset

+( cvs diff -u -r 1.207.2.63 -r 1.207.2.64 src/folderview.c;  cvs diff -u -r 1.274.2.65 -r 1.274.2.66 src/mainwindow.c;  ) > 1.9.14cvs38.patchset

diff --git a/configure.ac b/configure.ac
index 839473533a227cd3dfb5d58e2f74aa5b9f52d285..01c9f60ea9a1519a371f71dddbc8e6d78412e175 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=37
+EXTRA_VERSION=38

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 058b6a4f4aab6ccec98fdc3712aeafb7f33d16ab..1e9520c14ad053b503c57c7514cd1301ed130117 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1976,10 +1976,10 @@ static void folderview_empty_trash_cb(FolderView *folderview, guint action,
        FolderItem *item;
        GSList *mlist = NULL;
        GSList *cur = NULL;
        FolderItem *item;
        GSList *mlist = NULL;
        GSList *cur = NULL;

-       if (!folderview->selected) return;

        FolderItem *special_trash = NULL;
        PrefsAccount *ac;
 
        FolderItem *special_trash = NULL;
        PrefsAccount *ac;
 

+       if (!folderview->selected) return;

        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);


@@ -2194,9 +2194,10 @@ void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
 void folderview_reflect_prefs(void)
 {
        FolderView *folderview = mainwindow_get_mainwindow()->folderview;
 void folderview_reflect_prefs(void)
 {
        FolderView *folderview = mainwindow_get_mainwindow()->folderview;

+       FolderItem *item = folderview_get_selected_item(folderview);    

        normal_style = normal_color_style = bold_style = 
                bold_color_style = bold_tgtfold_style = NULL;
        normal_style = normal_color_style = bold_style = 
                bold_color_style = bold_tgtfold_style = NULL;

-       FolderItem *item = folderview_get_selected_item(folderview);
+

        folderview_init(folderview);
        folderview_column_set_titles(folderview);
        folderview_set_all();
        folderview_init(folderview);
        folderview_column_set_titles(folderview);
        folderview_set_all();

diff --git a/src/mainwindow.c b/src/mainwindow.c
index bd9a21da3d1ce8b8626044ac0417e6fbb233f87e..745c19a1b3631ebc21a7f821b11a74ef16b48912 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3128,8 +3128,8 @@ static void new_account_cb(MainWindow *mainwin, guint action,
 
 static void account_selector_menu_cb(GtkMenuItem *menuitem, gpointer data)
 {
 
 static void account_selector_menu_cb(GtkMenuItem *menuitem, gpointer data)
 {

-       cur_account = (PrefsAccount *)data;

        FolderItem *item = NULL;
        FolderItem *item = NULL;

+       cur_account = (PrefsAccount *)data;

        
        if (!mainwindow_get_mainwindow())
                return;
        
        if (!mainwindow_get_mainwindow())
                return;