From: Tristan Chabredier Date: Mon, 20 Feb 2006 13:56:04 +0000 (+0000) Subject: 2006-02-20 [wwp] 2.0.0cvs66 X-Git-Tag: REL_2_1_0~128 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=4138ad7f635fab5cb6f441880699db09e86afebb 2006-02-20 [wwp] 2.0.0cvs66 * src/summaryview.c * src/gtk/gtksctree.c * src/gtk/gtkshruler.c changed more runtime typecast checks. --- diff --git a/ChangeLog b/ChangeLog index bac46c42b..c19ae3134 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-02-20 [wwp] 2.0.0cvs66 + + * src/summaryview.c + * src/gtk/gtksctree.c + * src/gtk/gtkshruler.c + changed more runtime typecast checks. + 2006-02-20 [wwp] 2.0.0cvs65 * src/summary_search.c diff --git a/PATCHSETS b/PATCHSETS index 350e35b7e..c307ca4dd 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1249,3 +1249,4 @@ ( cvs diff -u -r 1.15.2.23 -r 1.15.2.24 src/summary_search.c; ) > 2.0.0cvs63.patchset ( cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/gtk/gtkutils.c; ) > 2.0.0cvs64.patchset ( cvs diff -u -r 1.15.2.24 -r 1.15.2.25 src/summary_search.c; ) > 2.0.0cvs65.patchset +( cvs diff -u -r 1.395.2.171 -r 1.395.2.172 src/summaryview.c; cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/gtk/gtksctree.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/gtkshruler.c; ) > 2.0.0cvs66.patchset diff --git a/configure.ac b/configure.ac index fd057d00e..8d9ada4b0 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=65 +EXTRA_VERSION=66 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c index 7ced34d18..707885ca4 100644 --- a/src/gtk/gtksctree.c +++ b/src/gtk/gtksctree.c @@ -1115,7 +1115,7 @@ GtkCTreeNode* gtk_sctree_insert_node (GtkCTree *ctree, gboolean expanded) { if (!emptyxpm) { - stock_pixmap_gdk((GtkWidget*)ctree, STOCK_PIXMAP_EMPTY, + stock_pixmap_gdk(GTK_WIDGET(ctree), STOCK_PIXMAP_EMPTY, &emptyxpm, &emptyxpmmask); } if (!pixmap_closed) { @@ -1148,7 +1148,7 @@ void gtk_sctree_set_node_info (GtkCTree *ctree, gboolean expanded) { if (!emptyxpm) { - stock_pixmap_gdk((GtkWidget*)ctree, STOCK_PIXMAP_EMPTY, + stock_pixmap_gdk(GTK_WIDGET(ctree), STOCK_PIXMAP_EMPTY, &emptyxpm, &emptyxpmmask); } if (!pixmap_closed) { diff --git a/src/gtk/gtkshruler.c b/src/gtk/gtkshruler.c index 2e25a9df5..afabbe5ad 100644 --- a/src/gtk/gtkshruler.c +++ b/src/gtk/gtkshruler.c @@ -80,8 +80,8 @@ gtk_shruler_class_init(GtkSHRulerClass * klass) GtkWidgetClass * widget_class; GtkRulerClass * hruler_class; - widget_class = (GtkWidgetClass*) klass; - hruler_class = (GtkRulerClass*) klass; + widget_class = GTK_WIDGET_CLASS(klass); + hruler_class = GTK_RULER_CLASS(klass); /* just neglect motion notify events */ widget_class->motion_notify_event = NULL /* gtk_shruler_motion_notify */; diff --git a/src/summaryview.c b/src/summaryview.c index 7d55de6df..144c997c1 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -3735,7 +3735,7 @@ void summary_save_as(SummaryView *summaryview) if (GTK_CLIST(ctree)->selection->next) { GList *item; for (item = GTK_CLIST(ctree)->selection->next; item != NULL; item=item->next) { - msginfo = gtk_ctree_node_get_row_data(ctree, (GtkCTreeNode*)item->data); + msginfo = gtk_ctree_node_get_row_data(ctree, GTK_CTREE_NODE(item->data)); if (!msginfo) break; src = procmsg_get_message_file(msginfo); if (append_file(src, dest, TRUE) < 0)