Merge lp:~larsu/indicator-messages/dont-use-deprecated-function into lp:~indicator-applet-developers/indicator-messages/trunk.13.10

Proposed by Lars Karlitski
Status: Merged
Approved by: Ted Gould
Approved revision: 347
Merged at revision: 346
Proposed branch: lp:~larsu/indicator-messages/dont-use-deprecated-function
Merge into: lp:~indicator-applet-developers/indicator-messages/trunk.13.10
Diff against target: 31 lines (+13/-8)
1 file modified
src/ido-detail-label.c (+13/-8)
To merge this branch: bzr merge lp:~larsu/indicator-messages/dont-use-deprecated-function
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+166491@code.launchpad.net

Commit message

use gtk_style_context_get instead of deprecated gtk_style_context_get_font

Description of the change

use gtk_style_context_get instead of deprecated gtk_style_context_get_font (build hits Werror with gtk 3.8 otherwise)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/ido-detail-label.c'
--- src/ido-detail-label.c 2012-09-04 17:20:20 +0000
+++ src/ido-detail-label.c 2013-05-30 11:56:29 +0000
@@ -138,14 +138,19 @@
138gtk_widget_get_font_metrics (GtkWidget *widget,138gtk_widget_get_font_metrics (GtkWidget *widget,
139 PangoContext *context)139 PangoContext *context)
140{140{
141 const PangoFontDescription *font;141 PangoFontDescription *font;
142142 PangoFontMetrics *metrics;
143 font = gtk_style_context_get_font (gtk_widget_get_style_context (widget),143
144 gtk_widget_get_state_flags (widget));144 gtk_style_context_get (gtk_widget_get_style_context (widget),
145145 gtk_widget_get_state_flags (widget),
146 return pango_context_get_metrics (context,146 "font", &font, NULL);
147 font,147
148 pango_context_get_language (context));148 metrics = pango_context_get_metrics (context,
149 font,
150 pango_context_get_language (context));
151
152 pango_font_description_free (font);
153 return metrics;
149}154}
150155
151static gint156static gint

Subscribers

People subscribed via source and target branches