[brasero] Fix for #594716 - Use accessor functions instead direct access (use GSEAL GnomeGoal)

[Philippe Rouquier <philippr src gnome org>]

commit cc02ff4b69fc44ed9ec2c33c0721c07a5f527a53
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Thu Sep 24 12:51:08 2009 +0200

    Fix for #594716 -  Use accessor functions instead direct access (use GSEAL GnomeGoal)

 libbrasero-utils/brasero-tool-color-picker.c |   38 ++++++++++++-------------
 1 files changed, 18 insertions(+), 20 deletions(-)
---
diff --git a/libbrasero-utils/brasero-tool-color-picker.c b/libbrasero-utils/brasero-tool-color-picker.c
index 7589783..e4541c2 100644
--- a/libbrasero-utils/brasero-tool-color-picker.c
+++ b/libbrasero-utils/brasero-tool-color-picker.c
@@ -121,34 +121,36 @@ brasero_tool_color_picker_expose (GtkWidget *widget,
 }
 
 static void
-brasero_tool_color_picker_cancel_clicked (GtkWidget *widget,
-					  BraseroToolColorPicker *self)
+brasero_tool_color_picker_destroy (GtkWidget *widget,
+                                   BraseroToolColorPicker *self)
 {
 	BraseroToolColorPickerPrivate *priv;
 
 	priv = BRASERO_TOOL_COLOR_PICKER_PRIVATE (self);
-
-	gtk_widget_destroy (priv->dialog);
 	priv->dialog = NULL;
 }
 
 static void
-brasero_tool_color_picker_ok_clicked (GtkWidget *widget,
-				      BraseroToolColorPicker *self)
+brasero_tool_color_picker_response (GtkWidget *widget,
+                                    GtkResponseType response,
+                                    BraseroToolColorPicker *self)
 {
 	BraseroToolColorPickerPrivate *priv;
 	GtkColorSelection *selection;
 
 	priv = BRASERO_TOOL_COLOR_PICKER_PRIVATE (self);
 
-	selection = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (priv->dialog)->colorsel);
-	gtk_color_selection_get_current_color (selection, &priv->color);
+	if (response == GTK_RESPONSE_OK) {
+		selection = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (priv->dialog)->colorsel);
+		gtk_color_selection_get_current_color (selection, &priv->color);
+
+		g_signal_emit (self,
+			       tool_color_picker_signals[COLOR_SET_SIGNAL],
+			       0);
+	}
+
 	gtk_widget_destroy (priv->dialog);
 	priv->dialog = NULL;
-
-	g_signal_emit (self,
-		       tool_color_picker_signals[COLOR_SET_SIGNAL],
-		       0);
 }
 
 static void
@@ -172,17 +174,13 @@ brasero_tool_color_picker_clicked (BraseroToolColorPicker *self,
 		gtk_window_set_modal (GTK_WINDOW (dialog), gtk_window_get_modal (GTK_WINDOW (toplevel)));
 	}
 
-	g_signal_connect (GTK_COLOR_SELECTION_DIALOG (dialog)->ok_button,
-			  "clicked",
-			  G_CALLBACK (brasero_tool_color_picker_ok_clicked),
-			  self);
-	g_signal_connect (GTK_COLOR_SELECTION_DIALOG (dialog)->cancel_button,
-			  "clicked",
-			  G_CALLBACK (brasero_tool_color_picker_cancel_clicked),
+	g_signal_connect (GTK_COLOR_SELECTION_DIALOG (dialog),
+			  "response",
+			  G_CALLBACK (brasero_tool_color_picker_response),
 			  self);
 	g_signal_connect (dialog,
 			  "destroy",
-			  G_CALLBACK (brasero_tool_color_picker_cancel_clicked),
+			  G_CALLBACK (brasero_tool_color_picker_destroy),
 			  self);
 
 	priv->dialog = dialog;