diff options
| author | infirit <[email protected]> | 2014-11-27 19:20:55 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-11-27 19:20:55 +0100 |
| commit | a5b8e8b03e5cfdfd951c82d2a80c0cb42b7879e6 (patch) | |
| tree | 05fcaa9e20a7092879ee6833ec3a4bd23cc16228 /accessx-status | |
| parent | 47f41b7c5ccba26c5d2c96b6541aabd3c163cb98 (diff) | |
| download | mate-applets-a5b8e8b03e5cfdfd951c82d2a80c0cb42b7879e6.tar.bz2 mate-applets-a5b8e8b03e5cfdfd951c82d2a80c0cb42b7879e6.tar.xz | |
accessx: use GAppInfo
Diffstat (limited to 'accessx-status')
| -rw-r--r-- | accessx-status/applet.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/accessx-status/applet.c b/accessx-status/applet.c index f5f0d560..4be88fe2 100644 --- a/accessx-status/applet.c +++ b/accessx-status/applet.c @@ -25,6 +25,8 @@ #include <glib/gi18n.h> #include <glib-object.h> #include <gtk/gtk.h> +#include <gio/gio.h> +#include <gio/gdesktopappinfo.h> #include <gdk/gdkkeysyms.h> #include <gdk/gdkx.h> #include <mate-panel-applet.h> @@ -177,6 +179,9 @@ static void help_cb(GtkAction* action, AccessxStatusApplet* sapplet) static void dialog_cb(GtkAction* action, AccessxStatusApplet* sapplet) { GError* error = NULL; + GdkScreen *screen; + GdkAppLaunchContext *launch_context; + GAppInfo *appinfo; if (sapplet->error_type != ACCESSX_STATUS_ERROR_NONE) { @@ -185,18 +190,18 @@ static void dialog_cb(GtkAction* action, AccessxStatusApplet* sapplet) } - GdkScreen* screen = gtk_widget_get_screen(GTK_WIDGET(sapplet->applet)); - /* This is the old way of calling things, we try this just in case - * we're in a mixed-version enviroment. It has to be tried first, - * because the new command doesn't fail in a way useful to - * gdk_spawn_command_line_on_screen and its error parameter. */ - gdk_spawn_command_line_on_screen(screen, "mate-accessibility-keyboard-properties", &error); + screen = gtk_widget_get_screen (GTK_WIDGET (sapplet->applet)); + appinfo = g_app_info_create_from_commandline ("mate-keyboard-properties --a11y", + _("Open the keyboard preferences dialog"), + G_APP_INFO_CREATE_NONE, + &error); - if (error != NULL) - { - g_error_free(error); - error = NULL; - gdk_spawn_command_line_on_screen(screen, "mate-keyboard-properties --a11y", &error); + if (!error) { + launch_context = gdk_app_launch_context_new (); + gdk_app_launch_context_set_screen (launch_context, screen); + g_app_info_launch (appinfo, NULL, G_APP_LAUNCH_CONTEXT (launch_context), &error); + + g_object_unref (launch_context); } if (error != NULL) @@ -211,6 +216,8 @@ static void dialog_cb(GtkAction* action, AccessxStatusApplet* sapplet) gtk_widget_show(dialog); g_error_free(error); } + + g_object_unref (appinfo); } static const GtkActionEntry accessx_status_applet_menu_actions[] = { |