+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
( 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
MICRO_VERSION=14
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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)
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;