aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2013-07-12 11:20:03 -0400
committerKen VanDine <ken.vandine@canonical.com>2013-07-12 11:20:03 -0400
commit14b509d829d886ba7e30cd6a8d9ecd052df4b1e3 (patch)
tree488ed0cbc609fe538f0c7516303fb63654e7c0cb
parent9b2ecf678c7ecf2113d10625569e3ea3992066eb (diff)
parent95687294084afe619678e750f82c34654ee107c9 (diff)
downloadayatana-indicator-messages-14b509d829d886ba7e30cd6a8d9ecd052df4b1e3.tar.gz
ayatana-indicator-messages-14b509d829d886ba7e30cd6a8d9ecd052df4b1e3.tar.bz2
ayatana-indicator-messages-14b509d829d886ba7e30cd6a8d9ecd052df4b1e3.zip
Fixed deprecations
-rw-r--r--src/app-section.c2
-rw-r--r--src/ido-detail-label.c20
2 files changed, 13 insertions, 9 deletions
diff --git a/src/app-section.c b/src/app-section.c
index 19532f2..3a55147 100644
--- a/src/app-section.c
+++ b/src/app-section.c
@@ -301,7 +301,7 @@ nick_activate_cb (GSimpleAction *action,
g_return_if_fail(priv->ids != NULL);
- if (!indicator_desktop_shortcuts_nick_exec(priv->ids, nick)) {
+ if (!indicator_desktop_shortcuts_nick_exec_with_context(priv->ids, nick, NULL)) {
g_warning("Unable to execute nick '%s' for desktop file '%s'",
nick, g_desktop_app_info_get_filename (priv->appinfo));
}
diff --git a/src/ido-detail-label.c b/src/ido-detail-label.c
index 780a2dd..c97c06d 100644
--- a/src/ido-detail-label.c
+++ b/src/ido-detail-label.c
@@ -138,14 +138,18 @@ static PangoFontMetrics *
gtk_widget_get_font_metrics (GtkWidget *widget,
PangoContext *context)
{
- const PangoFontDescription *font;
-
- font = gtk_style_context_get_font (gtk_widget_get_style_context (widget),
- gtk_widget_get_state_flags (widget));
-
- return pango_context_get_metrics (context,
- font,
- pango_context_get_language (context));
+ PangoFontMetrics *font_metrics;
+ PangoFontDescription *font;
+ GtkStyleContext *style;
+ style = gtk_widget_get_style_context (GTK_WIDGET (widget));
+ gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL,
+ "font", &font, NULL);
+
+ font_metrics = pango_context_get_metrics (context,
+ font,
+ pango_context_get_language (context));
+ pango_font_description_free (font);
+ return font_metrics;
}
static gint