aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2013-07-11 15:37:33 -0400
committerKen VanDine <ken.vandine@canonical.com>2013-07-11 15:37:33 -0400
commit7f4ac7cc08765cd139d6c3ac1f3d501598eb6324 (patch)
tree0cb515a9f25a770ae26d53d8f0072ce15994ae0b
parent2ab588d17de27d836a815eff1b310e323097b3db (diff)
downloadayatana-indicator-messages-7f4ac7cc08765cd139d6c3ac1f3d501598eb6324.tar.gz
ayatana-indicator-messages-7f4ac7cc08765cd139d6c3ac1f3d501598eb6324.tar.bz2
ayatana-indicator-messages-7f4ac7cc08765cd139d6c3ac1f3d501598eb6324.zip
Fixed deprecations
-rw-r--r--src/app-section.c2
-rw-r--r--src/ido-detail-label.c7
-rw-r--r--src/messages-service.c3
3 files changed, 5 insertions, 7 deletions
diff --git a/src/app-section.c b/src/app-section.c
index 6aac52a..823d75a 100644
--- a/src/app-section.c
+++ b/src/app-section.c
@@ -302,7 +302,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..74af602 100644
--- a/src/ido-detail-label.c
+++ b/src/ido-detail-label.c
@@ -139,9 +139,10 @@ 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));
+ GtkStyleContext *style;
+ style = gtk_widget_get_style_context (GTK_WIDGET (widget));
+ gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL,
+ "font", &font, NULL);
return pango_context_get_metrics (context,
font,
diff --git a/src/messages-service.c b/src/messages-service.c
index b36a0a2..8f64478 100644
--- a/src/messages-service.c
+++ b/src/messages-service.c
@@ -622,9 +622,6 @@ main (int argc, char ** argv)
GMainLoop * mainloop = NULL;
IndicatorService * service = NULL;
- /* Glib init */
- g_type_init();
-
mainloop = g_main_loop_new (NULL, FALSE);
/* Create the Indicator Service interface */