2005-09-17 [colin] 1.9.14cvs36

	* src/prefs_actions.c
	* src/prefs_customheader.c
	* src/prefs_display_header.c
	* src/prefs_filtering_action.c
	* src/prefs_matcher.c
	* src/prefs_toolbar.c
		Fix strange casts (less elegant but
		works better)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 8bfebc0f032ec9c927fe1cae66822108e192efe1..31ec99632cb4da02fb45aa7e2361313c0490c39c 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,14 @@
+2005-09-17 [colin]     1.9.14cvs36
+
+       * src/prefs_actions.c
+       * src/prefs_customheader.c
+       * src/prefs_display_header.c
+       * src/prefs_filtering_action.c
+       * src/prefs_matcher.c
+       * src/prefs_toolbar.c
+               Fix strange casts (less elegant but
+               works better)
+
 2005-09-16 [colin]     1.9.14cvs35
 
        * src/jpilot.c

diff --git a/PATCHSETS b/PATCHSETS
index 433a0120942562329b1540236a06b11a77c1a0a4..aff5fb3c78ebc89d4b2ba90501ff4e0331dc16c8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -804,3 +804,4 @@
 ( cvs diff -u -r 1.60.2.29 -r 1.60.2.30 src/addressbook.c;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/ldapquery.c;  ) > 1.9.14cvs33.patchset
 ( cvs diff -u -r 1.654.2.844 -r 1.654.2.845 configure.ac;  cvs diff -u -r 1.155.2.31 -r 1.155.2.32 src/Makefile.am;  cvs diff -u -r 1.27.2.12 -r 1.27.2.13 src/addr_compl.c;  cvs diff -u -r 1.28.2.8 -r 1.28.2.9 src/addrindex.c;  cvs diff -u -r 1.2.4.7 -r 1.2.4.8 src/browseldap.c;  cvs diff -u -r 1.8.2.5 -r 1.8.2.6 src/editldap.c;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/ldaplocate.c;  cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/ldapquery.c;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/ldapquery.h;  cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/ldapserver.c;  cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/ldapserver.h;  cvs diff -u -r 1.115.2.53 -r 1.115.2.54 src/main.c;  cvs diff -u -r 1.25.2.10 -r 1.25.2.11 src/matcher_parser_parse.y;  cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/prefs_themes.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/Makefile.am;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/gtk/description_window.c;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/clamav/Makefile.am;  cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpinline/Makefile.am;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/Makefile.am;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/trayicon/Makefile.am;  ) > 1.9.14cvs34.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

diff --git a/configure.ac b/configure.ac
index 8ea97764a8b523fb627c9910f7d40ff7ce17dd1d..af25d412956cfa8da90c421f750d8bbce08e0246 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index b3cdbcd7a8e53750924f56ea96893f2a005d6253..f000fd61405e3a0ea21ff349e12a64ef001640bf 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -602,15 +602,16 @@ static void prefs_actions_up(GtkWidget *w, gpointer data)
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;
        GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(actions.actions_list_view)),
-                (GtkTreeModel **)(GtkListStore *) store,       
+                &model,        
                 &isel))
                return;
-
+       store = (GtkListStore *)model;
        sel = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &isel);
        if (!sel)
                return;
@@ -644,16 +645,17 @@ static void prefs_actions_up(GtkWidget *w, gpointer data)
 static void prefs_actions_down(GtkWidget *w, gpointer data)
 {
        GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(actions.actions_list_view)),
-                (GtkTreeModel **)(GtkListStore *) store,
+                &model,
                 &sel))
                return;
-
+       store = (GtkListStore *)model;
        try = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &sel);
        if (!try) 
                return;

diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index 8328e4c940d9383afdda757f2b7fbe178c851d2f..a77101711aaba4d76f9cafda3969c466f785e8fe 100644 (file)
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -562,15 +562,16 @@ static void prefs_custom_header_up(void)
        GtkTreePath *prev, *sel;
        GtkTreeIter isel;
        GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(customhdr.list_view)),
-                (GtkTreeModel **)(GtkListStore *) store,
+                &model,
                 &isel))
                return;
-
+       store = (GtkListStore *)model;
        sel = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &isel);
        if (!sel)
                return;
@@ -595,15 +596,16 @@ static void prefs_custom_header_up(void)
 static void prefs_custom_header_down(void)
 {
        GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter next, sel;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(customhdr.list_view)),
-                (GtkTreeModel **)(GtkListStore *) store,
+                &model,
                 &sel))
                return;
-
+       store = (GtkListStore *)model;
        next = sel;
        if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &next)) 
                return;

diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index f1eb2976bf9b8feaa35c23777757bcbc70949a85..1f7328ffe2f00a89a821d4bb68a7c40be9c36602 100644 (file)
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -615,15 +615,16 @@ static void prefs_display_header_up(void)
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;
        GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(dispheader.headers_list_view)),
-                (GtkTreeModel **)(GtkListStore *) store,       
+                &model,        
                 &isel))
                return;
-
+       store = (GtkListStore *)model;
        sel = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &isel);
        if (!sel)
                return;
@@ -648,16 +649,17 @@ static void prefs_display_header_up(void)
 static void prefs_display_header_down(void)
 {
        GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(dispheader.headers_list_view)),
-                (GtkTreeModel **)(GtkListStore *) store,
+                &model,
                 &sel))
                return;
-
+       store = (GtkListStore *)model;
        try = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &sel);
        if (!try) 
                return;

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 608f0580b66f8b48b327156a21442359d7dfa72a..272293ff3d61ec334d4a82eaa530dd1d31d75995 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -899,15 +899,16 @@ static void prefs_filtering_action_up(void)
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;
        GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(filtering_action.action_list_view)),
-                (GtkTreeModel **)(GtkListStore *) store,       
+                &model,        
                 &isel))
                return;
-
+       store = (GtkListStore *)model;
        sel = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &isel);
        if (!sel)
                return;
@@ -940,16 +941,17 @@ static void prefs_filtering_action_up(void)
 static void prefs_filtering_action_down(void)
 {
        GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(filtering_action.action_list_view)),
-                (GtkTreeModel **)(GtkListStore *) store,
+                &model,
                 &sel))
                return;
-
+       store = (GtkListStore *)model;
        try = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &sel);
        if (!try) 
                return;

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 0080e6ff784edd4c2f43e2cf47bb031612b18dc9..dd4a7ae69a3c323643450bee95a0096decc79114 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -1289,15 +1289,16 @@ static void prefs_matcher_up(void)
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;
        GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(matcher.cond_list_view)),
-                (GtkTreeModel **)(GtkListStore *) store,       
+                &model,        
                 &isel))
                return;
-
+       store = (GtkListStore *)model;
        sel = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &isel);
        if (!sel)
                return;
@@ -1330,16 +1331,17 @@ static void prefs_matcher_up(void)
 static void prefs_matcher_down(void)
 {
        GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(matcher.cond_list_view)),
-                (GtkTreeModel **)(GtkListStore *) store,
+                &model,
                 &sel))
                return;
-
+       store = (GtkListStore *)model;
        try = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &sel);
        if (!try) 
                return;

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index e8028ff0a0cf9e45b21070f944e64046f642af30..61ba8d94438c6e61c3d5a3eae29ae6c58b0665ca 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -575,14 +575,16 @@ static void prefs_toolbar_up(GtkButton *button, ToolbarPage *prefs_toolbar)
        GtkTreePath *prev, *sel;
        GtkTreeIter isel;
        GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(prefs_toolbar->list_view_set)),
-                (GtkTreeModel **)(GtkListStore *) store,       
+                &model,        
                 &isel))
                return;
+       store = (GtkListStore *)model;
 
        sel = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &isel);
        if (!sel)
@@ -607,15 +609,17 @@ static void prefs_toolbar_up(GtkButton *button, ToolbarPage *prefs_toolbar)
 static void prefs_toolbar_down(GtkButton *button, ToolbarPage *prefs_toolbar)
 {
        GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter next, sel;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(prefs_toolbar->list_view_set)),
-                (GtkTreeModel **)(GtkListStore *) store,
+                &model,
                 &sel))
                return;
 
+       store = (GtkListStore *)model;
        next = sel;
        if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &next)) 
                return;