[gtranslator] Update status combo box from gedit.

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 3e0e0b7e3e5a7461120f42234454e620711db49e
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Mar 13 16:19:16 2011 +0100

    Update status combo box from gedit.

 src/gtr-status-combo-box.c |   58 ++++++++++++++++++++++----------------------
 src/gtr-status-combo-box.h |    7 ++++-
 2 files changed, 34 insertions(+), 31 deletions(-)
---
diff --git a/src/gtr-status-combo-box.c b/src/gtr-status-combo-box.c
index b13af32..a1ccfcd 100644
--- a/src/gtr-status-combo-box.c
+++ b/src/gtr-status-combo-box.c
@@ -41,6 +41,11 @@ struct _GtrStatusComboBoxPrivate
 	GtkWidget *current_item;
 };
 
+struct _GtrStatusComboBoxClassPrivate
+{
+	GtkCssProvider *css;
+};
+
 /* Signals */
 enum
 {
@@ -58,7 +63,8 @@ enum
 
 static guint signals[NUM_SIGNALS] = { 0 };
 
-G_DEFINE_TYPE(GtrStatusComboBox, gtr_status_combo_box, GTK_TYPE_EVENT_BOX)
+G_DEFINE_TYPE_WITH_CODE (GtrStatusComboBox, gtr_status_combo_box, GTK_TYPE_EVENT_BOX,
+                         g_type_add_class_private (g_define_type_id, sizeof (GtrStatusComboBoxClassPrivate)))
 
 static void
 gtr_status_combo_box_finalize (GObject *object)
@@ -123,6 +129,15 @@ static void
 gtr_status_combo_box_class_init (GtrStatusComboBoxClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	static const gchar style[] =
+		"* {\n"
+		  "-GtkButton-default-border : 0;\n"
+		  "-GtkButton-default-outside-border : 0;\n"
+		  "-GtkButton-inner-border: 0;\n"
+		  "-GtkWidget-focus-line-width : 0;\n"
+		  "-GtkWidget-focus-padding : 0;\n"
+		  "padding: 0;\n"
+		"}";
 	
 	object_class->finalize = gtr_status_combo_box_finalize;
 	object_class->get_property = gtr_status_combo_box_get_property;
@@ -147,6 +162,11 @@ gtr_status_combo_box_class_init (GtrStatusComboBoxClass *klass)
 					 		      G_PARAM_READWRITE));
 
 	g_type_class_add_private (object_class, sizeof (GtrStatusComboBoxPrivate));
+
+	klass->priv = G_TYPE_CLASS_GET_PRIVATE (klass, GTR_TYPE_STATUS_COMBO_BOX, GtrStatusComboBoxClassPrivate);
+
+	klass->priv->css = gtk_css_provider_new ();
+	gtk_css_provider_load_from_data (klass->priv->css, style, -1, NULL);
 }
 
 static void
@@ -275,17 +295,6 @@ static void
 gtr_status_combo_box_init (GtrStatusComboBox *self)
 {
 	GtkStyleContext *context;
-	GtkCssProvider *css;
-	GError *error = NULL;
-	const gchar style[] =
-		"* {\n"
-		"	-GtkButton-default-border : 0;\n"
-		"	-GtkButton-default-outside-border : 0;\n"
-		"	-GtkButton-inner-border: 0;\n"
-		"	-GtkWidget-focus-line-width: 0;\n"
-		"	-GtkWidget-focus-padding: 0;\n"
-		"	padding: 0;\n"
-		"}\n";
 
 	self->priv = GTR_STATUS_COMBO_BOX_GET_PRIVATE (self);
 
@@ -346,23 +355,14 @@ gtr_status_combo_box_init (GtrStatusComboBox *self)
 			  self);
 
 	/* make it as small as possible */
-	css = gtk_css_provider_new ();
-	if (gtk_css_provider_load_from_data (css, style, -1, &error))
-	{
-		context = gtk_widget_get_style_context (GTK_WIDGET (self->priv->button));
-		gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER (css),
-		                                GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-		context = gtk_widget_get_style_context (GTK_WIDGET (self->priv->frame));
-		gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER (css),
-		                                GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-	}
-	else
-	{
-		g_warning ("%s", error->message);
-		g_error_free (error);
-	}
-
-	g_object_unref (css);
+	context = gtk_widget_get_style_context (GTK_WIDGET (self->priv->button));
+	gtk_style_context_add_provider (context,
+	                                GTK_STYLE_PROVIDER (GTR_STATUS_COMBO_BOX_GET_CLASS (self)->priv->css),
+	                                GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+	context = gtk_widget_get_style_context (GTK_WIDGET (self->priv->frame));
+	gtk_style_context_add_provider (context,
+	                                GTK_STYLE_PROVIDER (GTR_STATUS_COMBO_BOX_GET_CLASS (self)->priv->css),
+	                                GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 }
 
 /* public functions */
diff --git a/src/gtr-status-combo-box.h b/src/gtr-status-combo-box.h
index 0446d2c..e552fb0 100644
--- a/src/gtr-status-combo-box.h
+++ b/src/gtr-status-combo-box.h
@@ -36,8 +36,9 @@ G_BEGIN_DECLS
 #define GTR_STATUS_COMBO_BOX_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTR_TYPE_STATUS_COMBO_BOX, GtrStatusComboBoxClass))
 
 typedef struct _GtrStatusComboBox		GtrStatusComboBox;
-typedef struct _GtrStatusComboBoxClass	GtrStatusComboBoxClass;
 typedef struct _GtrStatusComboBoxPrivate	GtrStatusComboBoxPrivate;
+typedef struct _GtrStatusComboBoxClass	GtrStatusComboBoxClass;
+typedef struct _GtrStatusComboBoxClassPrivate	GtrStatusComboBoxClassPrivate;
 
 struct _GtrStatusComboBox
 {
@@ -49,6 +50,8 @@ struct _GtrStatusComboBox
 struct _GtrStatusComboBoxClass
 {
 	GtkEventBoxClass parent_class;
+
+	GtrStatusComboBoxClassPrivate *priv;
 	
 	void (*changed) (GtrStatusComboBox *combo,
 			 GtkMenuItem         *item);
@@ -83,4 +86,4 @@ G_END_DECLS
 
 #endif /* __GTR_STATUS_COMBO_BOX_H__ */
 
-/* ex:ts=8:noet: */
+/* ex:set ts=8 noet: */