From baf09dcb6c0c7533c52d635b701dbabdbe0ccb0b Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Mon, 20 Feb 2006 12:59:09 +0000 Subject: [PATCH] 2006-02-20 [wwp] 2.0.0cvs64 * src/gtk/gtkutils.c better runtime typecast checks. --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/gtkutils.c | 12 ++++++------ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39b140fb8..d2633c23f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-20 [wwp] 2.0.0cvs64 + + * src/gtk/gtkutils.c + better runtime typecast checks. + 2006-02-20 [wwp] 2.0.0cvs63 * src/summary_search.c diff --git a/PATCHSETS b/PATCHSETS index c6b856f2f..1136de097 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1247,3 +1247,4 @@ ( cvs diff -u -r 1.179.2.92 -r 1.179.2.93 src/imap.c; cvs diff -u -r 1.1.4.28 -r 1.1.4.29 src/etpan/imap-thread.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/etpan/imap-thread.h; ) > 2.0.0cvs61.patchset ( cvs diff -u -r 1.382.2.242 -r 1.382.2.243 src/compose.c; cvs diff -u -r 1.179.2.93 -r 1.179.2.94 src/imap.c; cvs diff -u -r 1.395.2.170 -r 1.395.2.171 src/summaryview.c; cvs diff -u -r 1.1.4.29 -r 1.1.4.30 src/etpan/imap-thread.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/etpan/imap-thread.h; cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/gtk/quicksearch.c; ) > 2.0.0cvs62.patchset ( 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 diff --git a/configure.ac b/configure.ac index 49f991daa..5cafa20bd 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=63 +EXTRA_VERSION=64 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c index 8e5afa59c..b2f8b1c75 100644 --- a/src/gtk/gtkutils.c +++ b/src/gtk/gtkutils.c @@ -913,7 +913,7 @@ GtkWidget *gtkut_get_browse_file_btn(const gchar *button_label) #if GTK_CHECK_VERSION(2, 6, 0) button = gtk_button_new_with_mnemonic(button_label); - gtk_button_set_image((GtkButton*)button, + gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_BUTTON)); #else GtkWidget* image; @@ -928,8 +928,8 @@ GtkWidget *gtkut_get_browse_file_btn(const gchar *button_label) gtk_label_set_text_with_mnemonic(GTK_LABEL(label), button_label); gtk_label_set_mnemonic_widget(GTK_LABEL(label), button); - gtk_box_pack_start((GtkBox*)box, image, FALSE, FALSE, 1); - gtk_box_pack_end((GtkBox*)box, label, FALSE, FALSE, 1); + gtk_box_pack_start(GTK_BOX(box), image, FALSE, FALSE, 1); + gtk_box_pack_end((GTK_BOX(box), label, FALSE, FALSE, 1); gtk_widget_show(label); gtk_widget_show(image); gtk_widget_show(box); @@ -947,7 +947,7 @@ GtkWidget *gtkut_get_browse_directory_btn(const gchar *button_label) #if GTK_CHECK_VERSION(2, 6, 0) button = gtk_button_new_with_mnemonic(button_label); - gtk_button_set_image((GtkButton*)button, + gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_BUTTON)); #else GtkWidget* image; @@ -962,8 +962,8 @@ GtkWidget *gtkut_get_browse_directory_btn(const gchar *button_label) gtk_label_set_text_with_mnemonic(GTK_LABEL(label), button_label); gtk_label_set_mnemonic_widget(GTK_LABEL(label), button); - gtk_box_pack_start((GtkBox*)box, image, FALSE, FALSE, 1); - gtk_box_pack_end((GtkBox*)box, label, FALSE, FALSE, 1); + gtk_box_pack_start(GTK_BOX(box), image, FALSE, FALSE, 1); + gtk_box_pack_end(GTK_BOX(box), label, FALSE, FALSE, 1); gtk_widget_show(label); gtk_widget_show(image); gtk_widget_show(box); -- 2.25.1