Don't use deprecated gdk_app_launch_context_new()

diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 591c964f44966f190c868e73235ff2c279db9a1d..b6e84aa9117b95604f9b14cfc873c7d33e6debac 100644 (file)
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -1090,6 +1090,7 @@ account_widget_launch_external_clicked (GtkWidget *button,
       GDesktopAppInfo *desktop_info;
       GError *error = NULL;
       GdkAppLaunchContext *context = NULL;
+      GdkDisplay *display;
       gchar *cmd;
       GAppInfo *app_info;
 
@@ -1114,9 +1115,8 @@ account_widget_launch_external_clicked (GtkWidget *button,
           goto out;
         }
 
-      context = gdk_app_launch_context_new ();
-      gdk_app_launch_context_set_screen  (context,
-          gtk_widget_get_screen (button));
+      display = gdk_display_get_default ();
+      context = gdk_display_get_app_launch_context (display);
 
       if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context,
             &error))

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 196ffceb5ac3bf395d5310a9debb8e9559289599..f1a21140b20fdc318d0dd45ab54e54667c917564 100644 (file)
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -2389,6 +2389,7 @@ empathy_accounts_dialog_show_application (GdkScreen *screen,
     gboolean hidden)
 {
   GError *error = NULL;
+  GdkDisplay *display;
   GString *cmd;
   gchar *path;
   GAppInfo *app_info;
@@ -2435,8 +2436,8 @@ empathy_accounts_dialog_show_application (GdkScreen *screen,
       goto out;
     }
 
-  context = gdk_app_launch_context_new ();
-  gdk_app_launch_context_set_display (context, gdk_screen_get_display (screen));
+  display = gdk_screen_get_display (screen);
+  context = gdk_display_get_app_launch_context (display);
 
   if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context,
         &error))

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 88335b654665314f82a6ce490eb18b22227db09b..740220b2f62efc0d767814439eb78954af4e9454 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -1479,14 +1479,12 @@ static void
 main_window_help_debug_cb (GtkAction         *action,
                           EmpathyMainWindow *window)
 {
-       GdkScreen *screen = gdk_screen_get_default ();
+       GdkDisplay *display;
        GError *error = NULL;
        gchar *path;
        GAppInfo *app_info;
        GdkAppLaunchContext *context = NULL;
 
-       g_return_if_fail (GDK_IS_SCREEN (screen));
-
        /* Try to run from source directory if possible */
        path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "src",
                        "empathy-debugger", NULL);
@@ -1503,8 +1501,8 @@ main_window_help_debug_cb (GtkAction         *action,
                goto out;
        }
 
-       context = gdk_app_launch_context_new ();
-       gdk_app_launch_context_set_display (context, gdk_screen_get_display (screen));
+       display = gdk_display_get_default ();
+       context = gdk_display_get_app_launch_context (display);
 
        if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context,
                &error)) {