diff options
| author | Tamaranch <138-Tamaranch@users.noreply.gitlab.xfce.org> | 2020-07-08 12:10:59 +0200 |
|---|---|---|
| committer | Tamaranch <138-Tamaranch@users.noreply.gitlab.xfce.org> | 2020-07-21 15:16:06 +0200 |
| commit | 2ebe6a499cb05b9ceebe780c63e7d8426e5e5b8a (patch) | |
| tree | b07e59a53a41d2a977573f7b0193820bfce44c88 | |
| parent | 412d1cf515b022ea1ca8573216eddd19f38b5e1b (diff) | |
| download | xfce4-session-2ebe6a499cb05b9ceebe780c63e7d8426e5e5b8a.tar.gz | |
Field codes expansion API update
| -rw-r--r-- | configure.ac.in | 2 | ||||
| -rw-r--r-- | xfce4-session/xfsm-global.c | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac.in b/configure.ac.in index 84d4fdeb..2a918f1b 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -100,7 +100,7 @@ dnl Check for i18n support XDT_I18N([@LINGUAS@]) dnl Check for required packages -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.15.1]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.15.2]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.15.1]) XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.22.0]) XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) diff --git a/xfce4-session/xfsm-global.c b/xfce4-session/xfsm-global.c index 256d3205..c8af6bd1 100644 --- a/xfce4-session/xfsm-global.c +++ b/xfce4-session/xfsm-global.c @@ -390,11 +390,12 @@ xfsm_launch_desktop_files_on_run_hook (gboolean start_at_spi, filename = xfce_resource_lookup (XFCE_RESOURCE_CONFIG, files[n]); uri = g_filename_to_uri (filename, NULL, NULL); g_free (filename); - exec = xfce_expand_field_codes (xfce_rc_read_entry (rc, "Exec", NULL), - xfce_rc_read_entry (rc, "Icon", NULL), - xfce_rc_read_entry (rc, "Name", NULL), - uri, - FALSE); + exec = xfce_expand_desktop_entry_field_codes (xfce_rc_read_entry (rc, "Exec", NULL), + NULL, + xfce_rc_read_entry (rc, "Icon", NULL), + xfce_rc_read_entry (rc, "Name", NULL), + uri, + FALSE); g_free (uri); /* execute the item */ |