[brasero/gnome-2-30] Fix a few runtime warnings with the Cover Editor



commit 27c0e975e94dd847778099c6e47259d0857fbad6
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Tue May 11 11:16:16 2010 +0200

    Fix a few runtime warnings with the Cover Editor

 libbrasero-utils/brasero-jacket-view.c       |    4 ++--
 libbrasero-utils/brasero-tool-color-picker.c |   11 +++--------
 2 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/libbrasero-utils/brasero-jacket-view.c b/libbrasero-utils/brasero-jacket-view.c
index 5e32a76..7b74061 100644
--- a/libbrasero-utils/brasero-jacket-view.c
+++ b/libbrasero-utils/brasero-jacket-view.c
@@ -685,7 +685,7 @@ brasero_jacket_view_focus_in_cb (GtkWidget *view,
 		text_view->need_im_reset = TRUE;
 		gtk_im_context_focus_in (text_view->im_context);
 	}
-
+	
 	buffer = gtk_text_view_get_buffer (text_view);
 	brasero_jacket_buffer_show_default_text (BRASERO_JACKET_BUFFER (buffer), FALSE);
 
@@ -1384,9 +1384,9 @@ brasero_jacket_view_realize (GtkWidget *widget)
 						       attributes_mask));
 	window = gtk_widget_get_window (widget);
 	gdk_window_set_user_data (window, widget);
+	GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
 	gtk_widget_style_attach (widget);
-	GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
 	gdk_window_show (gtk_widget_get_window (widget));
 }
diff --git a/libbrasero-utils/brasero-tool-color-picker.c b/libbrasero-utils/brasero-tool-color-picker.c
index 85cb5fb..471d4c2 100644
--- a/libbrasero-utils/brasero-tool-color-picker.c
+++ b/libbrasero-utils/brasero-tool-color-picker.c
@@ -194,7 +194,6 @@ static void
 brasero_tool_color_picker_init (BraseroToolColorPicker *object)
 {
 	BraseroToolColorPickerPrivate *priv;
-	GtkWidget *frame;
 
 	priv = BRASERO_TOOL_COLOR_PICKER_PRIVATE (object);
 
@@ -207,19 +206,15 @@ brasero_tool_color_picker_init (BraseroToolColorPicker *object)
 	gtk_widget_show (priv->label);
 	gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (object), priv->label);
 
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_OUT);
-	gtk_widget_show (frame);
-
-	priv->icon = gtk_alignment_new (0.5, 0.5, 1., 1.);
+	priv->icon = gtk_image_new ();
 	gtk_widget_show (priv->icon);
 	g_signal_connect (priv->icon,
 			  "expose-event",
 			  G_CALLBACK (brasero_tool_color_picker_expose),
 			  object);
-	gtk_container_add (GTK_CONTAINER (frame), priv->icon);
 
-	gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (object), frame);
+	/* This function expects a GtkMisc object!! */
+	gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (object), priv->icon);
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]