diff options
author | monsta <[email protected]> | 2017-09-26 17:51:47 +0300 |
---|---|---|
committer | monsta <[email protected]> | 2017-09-30 12:17:28 +0300 |
commit | 6535fefbddb1d2dd6cb93a60789e3a73c57d7fb0 (patch) | |
tree | 4db6f6602b3119fbf68b055d61a10e206a1a7bad /mate-panel/libpanel-util | |
parent | 1e2b86c0e6d940a9b5746b1244181664d905c781 (diff) | |
download | mate-panel-6535fefbddb1d2dd6cb93a60789e3a73c57d7fb0.tar.bz2 mate-panel-6535fefbddb1d2dd6cb93a60789e3a73c57d7fb0.tar.xz |
make file/folder launchers work again
fixes https://github.com/mate-desktop/mate-panel/issues/590
reverts a part of 7ee450758e4f2bee13aa8ff967a5795a6dcdc91f
Diffstat (limited to 'mate-panel/libpanel-util')
-rw-r--r-- | mate-panel/libpanel-util/panel-launch.c | 10 | ||||
-rw-r--r-- | mate-panel/libpanel-util/panel-launch.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/mate-panel/libpanel-util/panel-launch.c b/mate-panel/libpanel-util/panel-launch.c index 0f4d7033..830e7177 100644 --- a/mate-panel/libpanel-util/panel-launch.c +++ b/mate-panel/libpanel-util/panel-launch.c @@ -163,23 +163,29 @@ panel_app_info_launch_uri (GDesktopAppInfo *appinfo, } gboolean -panel_app_info_launch (GDesktopAppInfo *appinfo, +panel_launch_key_file (GKeyFile *keyfile, GList *uri_list, GdkScreen *screen, const gchar *action, GError **error) { + GDesktopAppInfo *appinfo; gboolean retval; - g_return_val_if_fail (appinfo != NULL, FALSE); + g_return_val_if_fail (keyfile != NULL, FALSE); g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + appinfo = g_desktop_app_info_new_from_keyfile (keyfile); + if (appinfo == NULL) + return FALSE; + retval = panel_app_info_launch_uris (appinfo, uri_list, screen, action, gtk_get_current_event_time (), error); + g_object_unref (appinfo); return retval; } diff --git a/mate-panel/libpanel-util/panel-launch.h b/mate-panel/libpanel-util/panel-launch.h index b98b8ca4..653167c1 100644 --- a/mate-panel/libpanel-util/panel-launch.h +++ b/mate-panel/libpanel-util/panel-launch.h @@ -45,7 +45,7 @@ gboolean panel_app_info_launch_uri (GDesktopAppInfo *appinfo, guint32 timestamp, GError **error); -gboolean panel_app_info_launch (GDesktopAppInfo *appinfo, +gboolean panel_launch_key_file (GKeyFile *keyfile, GList *uri_list, GdkScreen *screen, const gchar *action, |