[giggle] asd

[Javier Jardón <jjardon src gnome org>]

commit fd0a69060a72c8daca789bd5078803bda81ef8df
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Jan 5 17:43:53 2011 +0100

    asd

 src/giggle-avatar-image.c  |    4 ++--
 src/giggle-diff-view.c     |   14 ++++++++------
 src/giggle-rev-list-view.c |    7 +++----
 src/giggle-view-file.c     |    9 ++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/giggle-avatar-image.c b/src/giggle-avatar-image.c
index 58fde55..a77aeb1 100644
--- a/src/giggle-avatar-image.c
+++ b/src/giggle-avatar-image.c
@@ -339,7 +339,7 @@ avatar_image_draw (GtkWidget  *widget,
 {
 	GiggleAvatarImagePriv *priv = GET_PRIV (widget);
 	GtkRequisition         requisition;
-	GtkStyle              *style;
+	GtkStyleContext       *context;
 	float                  xalign, yalign;
 	double                 x, y;
 	gint                   width, height;
@@ -348,7 +348,7 @@ avatar_image_draw (GtkWidget  *widget,
 	gtk_widget_get_preferred_size (widget, &requisition, NULL);
 	width = gtk_widget_get_allocated_width (widget);
 	height = gtk_widget_get_allocated_height (widget);
-	style = gtk_widget_get_style (widget);
+	context = gtk_widget_get_style_context (widget);
 
 	w = requisition.width;
 	h = requisition.height;
diff --git a/src/giggle-diff-view.c b/src/giggle-diff-view.c
index 91cc5da..d6a3b20 100644
--- a/src/giggle-diff-view.c
+++ b/src/giggle-diff-view.c
@@ -282,14 +282,14 @@ diff_view_set_property (GObject      *object,
 }
 
 static void
-diff_view_style_set (GtkWidget *widget,
-		     GtkStyle  *prev)
+diff_view_style_updated (GtkWidget *widget)
 {
 	GiggleDiffViewPriv *priv = GET_PRIV (widget);
 	static const GdkColor red = { 0, 0xffff, 0, 0 };
 	GdkColor *error_color;
 
-	GTK_WIDGET_CLASS (giggle_diff_view_parent_class)->style_set (widget, prev);
+	GTK_WIDGET_CLASS (giggle_diff_view_parent_class)->style_updated (widget);
+
 	gtk_widget_style_get (widget, "error-underline-color", &error_color, NULL);
 
 	if (!error_color)
@@ -297,7 +297,9 @@ diff_view_style_set (GtkWidget *widget,
 
 	g_object_set (priv->invalid_char,
 		      "foreground-gdk", &gtk_widget_get_style (widget)->base[GTK_STATE_NORMAL],
-		      "background-gdk", error_color, "style", PANGO_STYLE_ITALIC, NULL);
+	              "background-gdk", error_color,
+	              "style", PANGO_STYLE_ITALIC,
+	              NULL);
 
 	gdk_color_free (error_color);
 }
@@ -312,7 +314,7 @@ giggle_diff_view_class_init (GiggleDiffViewClass *class)
 	object_class->set_property = diff_view_set_property;
 	object_class->get_property = diff_view_get_property;
 
-	widget_class->style_set    = diff_view_style_set;
+	widget_class->style_updated = diff_view_style_updated;
 
 	g_object_class_install_property (
 		object_class,
@@ -435,7 +437,7 @@ giggle_diff_view_init (GiggleDiffView *diff_view)
 	gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (diff_view), FALSE);
 
 	font_desc = pango_font_description_from_string ("monospace");
-	gtk_widget_modify_font (GTK_WIDGET (diff_view), font_desc);
+	gtk_widget_override_font (GTK_WIDGET (diff_view), font_desc);
 	pango_font_description_free (font_desc);
 
 	manager = gtk_source_language_manager_new ();
diff --git a/src/giggle-rev-list-view.c b/src/giggle-rev-list-view.c
index 4e8bd6c..500ad24 100644
--- a/src/giggle-rev-list-view.c
+++ b/src/giggle-rev-list-view.c
@@ -560,8 +560,7 @@ finish:
 }
 
 static void
-rev_list_view_style_set (GtkWidget *widget,
-			 GtkStyle  *prev_style)
+rev_list_view_style_updated (GtkWidget *widget)
 {
 	GiggleRevListViewPriv *priv = GET_PRIV (widget);
 	GtkIconTheme          *icon_theme;
@@ -594,7 +593,7 @@ rev_list_view_style_set (GtkWidget *widget,
 					    priv->emblem_size * 3 +
 					    2 * gtk_widget_get_style (widget)->xthickness);
 
-	GTK_WIDGET_CLASS (giggle_rev_list_view_parent_class)->style_set (widget, prev_style);
+	GTK_WIDGET_CLASS (giggle_rev_list_view_parent_class)->style_updated (widget);
 }
 
 static void
@@ -634,7 +633,7 @@ giggle_rev_list_view_class_init (GiggleRevListViewClass *class)
 
 	widget_class->button_press_event  = rev_list_view_button_press;
 	widget_class->query_tooltip       = rev_list_view_query_tooltip;
-	widget_class->style_set           = rev_list_view_style_set;
+	widget_class->style_updated       = rev_list_view_style_updated;
 
 	tree_view_class->row_activated    = rev_list_view_row_activated;
 
diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c
index 515f814..52a0b60 100644
--- a/src/giggle-view-file.c
+++ b/src/giggle-view-file.c
@@ -572,9 +572,8 @@ create_category (GiggleViewFilePriv *priv,
 }
 
 static void
-source_view_style_set_cb (GtkWidget      *widget,
-			  GtkStyle       *prev,
-			  GiggleViewFile *view)
+source_view_style_updated_cb (GtkWidget      *widget,
+                              GiggleViewFile *view)
 {
 	GiggleViewFilePriv *priv = GET_PRIV (view);
 
@@ -1511,8 +1510,8 @@ giggle_view_file_init (GiggleViewFile *view)
 
 	g_signal_connect (priv->source_view, "query-tooltip",
 			  G_CALLBACK (source_view_query_tooltip_cb), view);
-	g_signal_connect (priv->source_view, "style-set",
-			  G_CALLBACK (source_view_style_set_cb), view);
+	g_signal_connect (priv->source_view, "style-updated",
+			  G_CALLBACK (source_view_style_updated_cb), view);
 	g_signal_connect (priv->source_view, "draw",
 			  G_CALLBACK (source_view_draw_cb), view);