From 628a1ab3a58b81350746fe6ca91df6fd9266d556 Mon Sep 17 00:00:00 2001 From: Ricardo Mones Date: Wed, 19 Oct 2011 08:44:27 +0000 Subject: [PATCH] 2011-10-19 [mones] 3.7.10cvs37 * src/prefs_msg_colors.c Fix Ok/Cancel buttons in color selector of preferences --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_msg_colors.c | 18 +++++++++--------- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7961896dc..cbfe5e6a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-10-19 [mones] 3.7.10cvs37 + + * src/prefs_msg_colors.c + Fix Ok/Cancel buttons in color selector of preferences + 2011-10-17 [colin] 3.7.10cvs36 * src/gtk/gtkshruler.c diff --git a/PATCHSETS b/PATCHSETS index f8320fa30..e8bc0cfbe 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4240,3 +4240,4 @@ ( cvs diff -u -r 1.22.2.24 -r 1.22.2.25 src/addrbook.c; cvs diff -u -r 1.1.4.22 -r 1.1.4.23 src/exportldif.c; cvs diff -u -r 1.18.2.32 -r 1.18.2.33 src/jpilot.c; cvs diff -u -r 1.6.10.18 -r 1.6.10.19 src/mutt.c; cvs diff -u -r 1.6.2.17 -r 1.6.2.18 src/pine.c; cvs diff -u -r 1.150.2.117 -r 1.150.2.118 src/procmsg.c; cvs diff -u -r 1.14.2.20 -r 1.14.2.21 src/vcard.c; ) > 3.7.10cvs34.patchset ( cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/gtk/gtkshruler.c; ) > 3.7.10cvs35.patchset ( cvs diff -u -r 1.1.4.19 -r 1.1.4.20 src/gtk/gtkshruler.c; ) > 3.7.10cvs36.patchset +( cvs diff -u -r 1.1.2.44 -r 1.1.2.45 src/prefs_msg_colors.c; ) > 3.7.10cvs37.patchset diff --git a/configure.ac b/configure.ac index d68fa60a4..dc003815d 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=10 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=36 +EXTRA_VERSION=37 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c index a081cf0a9..a152ceef3 100644 --- a/src/prefs_msg_colors.c +++ b/src/prefs_msg_colors.c @@ -579,8 +579,8 @@ static void quote_color_set_dialog(GtkWidget *widget, gpointer data) GdkColor color; gint rgbvalue = 0; GtkColorSelectionDialog *dialog; - GtkWidget button_ok; - GtkWidget button_cancel; + GtkWidget *button_ok; + GtkWidget *button_cancel; gint c; /* custom colors */ @@ -633,7 +633,7 @@ static void quote_color_set_dialog(GtkWidget *widget, gpointer data) } } - color_dialog = gtk_color_selection_dialog_new(title); + color_dialog = GTK_COLOR_SELECTION_DIALOG(gtk_color_selection_dialog_new(title)); g_free(title); gtk_window_set_position(GTK_WINDOW(color_dialog), GTK_WIN_POS_CENTER); gtk_window_set_modal(GTK_WINDOW(color_dialog), TRUE); @@ -644,9 +644,9 @@ static void quote_color_set_dialog(GtkWidget *widget, gpointer data) "cancel-button", &button_cancel, NULL); - g_signal_connect(G_OBJECT(&button_cancel), + g_signal_connect(G_OBJECT(button_cancel), "clicked", G_CALLBACK(quote_colors_set_dialog_cancel), data); - g_signal_connect(G_OBJECT(&button_ok), + g_signal_connect(G_OBJECT(button_ok), "clicked", G_CALLBACK(quote_colors_set_dialog_ok), data); g_signal_connect(G_OBJECT(color_dialog), "key_press_event", G_CALLBACK(quote_colors_set_dialog_key_pressed),data); @@ -735,8 +735,8 @@ static gboolean quote_colors_set_dialog_key_pressed(GtkWidget *widget, gpointer data) { GtkColorSelectionDialog *dialog; - GtkWidget button_ok; - GtkWidget button_cancel; + GtkWidget *button_ok; + GtkWidget *button_cancel; dialog = GTK_COLOR_SELECTION_DIALOG(widget); g_object_get(dialog, "ok-button", &button_ok, @@ -752,9 +752,9 @@ static gboolean quote_colors_set_dialog_key_pressed(GtkWidget *widget, case GDK_KEY_KP_Enter: /* NOTE: changing focus makes widget accept all currently * changed settings! */ - gtk_widget_grab_focus(&button_ok); + gtk_widget_grab_focus(button_ok); /* call ok handler */ - gtk_button_clicked(GTK_BUTTON(&button_ok)); + gtk_button_clicked(GTK_BUTTON(button_ok)); return TRUE; default: break; -- 2.25.1