[nautilus: 6/18] file-conflict-dialog: port to GtkStyleContext
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus: 6/18] file-conflict-dialog: port to GtkStyleContext
- Date: Mon, 6 Dec 2010 14:57:29 +0000 (UTC)
commit 5da941e338b159c42a4b4f2581573635e3d68b11
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Mon Dec 6 15:38:26 2010 +0100
file-conflict-dialog: port to GtkStyleContext
.../nautilus-file-conflict-dialog.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.c b/libnautilus-private/nautilus-file-conflict-dialog.c
index d15b50b..53bf505 100644
--- a/libnautilus-private/nautilus-file-conflict-dialog.c
+++ b/libnautilus-private/nautilus-file-conflict-dialog.c
@@ -110,7 +110,8 @@ file_list_ready_cb (GList *files,
GdkPixbuf *pixbuf;
GtkWidget *label;
GString *str;
- PangoFontDescription *desc;
+ PangoFontDescription *desc, *old_desc;
+ GtkStyleContext *style;
dialog = GTK_DIALOG (fcd);
details = fcd->details;
@@ -201,13 +202,19 @@ file_list_ready_cb (GList *files,
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (details->titles_vbox),
label, FALSE, FALSE, 0);
- gtk_widget_modify_font (label, NULL);
+
+ style = gtk_widget_get_style_context (label);
+ gtk_style_context_get_style (style,
+ GTK_STYLE_PROPERTY_FONT, &old_desc,
+ NULL);
+
desc = pango_font_description_new ();
pango_font_description_set_weight (desc, PANGO_WEIGHT_BOLD);
pango_font_description_set_size (desc,
- pango_font_description_get_size (gtk_widget_get_style (label)->font_desc) * PANGO_SCALE_LARGE);
- gtk_widget_modify_font (label, desc);
+ pango_font_description_get_size (old_desc) * PANGO_SCALE_LARGE);
+ gtk_widget_override_font (label, desc);
pango_font_description_free (desc);
+ pango_font_description_free (old_desc);
gtk_widget_show (label);
label = gtk_label_new (secondary_text);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]