[Commits] prefs_msg_colors.c 1.1.2.44 1.1.2.45

[mones at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv29642/src

Modified Files:
      Tag: gtk2
	prefs_msg_colors.c 
Log Message:
2011-10-19 [mones]	3.7.10cvs37

	* src/prefs_msg_colors.c
		Fix Ok/Cancel buttons in color selector of preferences 

Index: prefs_msg_colors.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_msg_colors.c,v
retrieving revision 1.1.2.44
retrieving revision 1.1.2.45
diff -u -d -r1.1.2.44 -r1.1.2.45
--- prefs_msg_colors.c	7 Oct 2011 09:17:49 -0000	1.1.2.44
+++ prefs_msg_colors.c	19 Oct 2011 08:44:27 -0000	1.1.2.45
@@ -579,8 +579,8 @@
 	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 @@
 		}
 	}
 
-	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 @@
                                "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 @@
 						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 @@
 			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;