diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-05-09 12:21:28 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-05-09 12:21:28 +0200 |
| commit | 5e9b247d260ff4e2b9a9620053e61e8a0161cdee (patch) | |
| tree | 11a05b05d1c7d6d2db8f58519630e3de8e22b6fc /session-helper | |
| parent | 8abbc0186efe977cec2a3214e7aa3703e9f1169f (diff) | |
| download | xdg-app-5e9b247d260ff4e2b9a9620053e61e8a0161cdee.tar.gz | |
Migrate ~/.local/share/xdg-app to ~/.local/share/flatpak
Diffstat (limited to 'session-helper')
| -rw-r--r-- | session-helper/Makefile.am.inc | 2 | ||||
| -rw-r--r-- | session-helper/flatpak-permission-store.c | 2 | ||||
| -rw-r--r-- | session-helper/flatpak-session-helper.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/session-helper/Makefile.am.inc b/session-helper/Makefile.am.inc index 89dca77..65a3dee 100644 --- a/session-helper/Makefile.am.inc +++ b/session-helper/Makefile.am.inc @@ -15,4 +15,4 @@ flatpak_session_helper_SOURCES = \ $(NULL) flatpak_session_helper_LDADD = $(BASE_LIBS) libflatpak-common.la -flatpak_session_helper_CFLAGS = $(BASE_CFLAGS) +flatpak_session_helper_CFLAGS = $(BASE_CFLAGS) $(SOUP_CFLAGS) $(OSTREE_CFLAGS) $(GSYSTEM_CFLAGS) diff --git a/session-helper/flatpak-permission-store.c b/session-helper/flatpak-permission-store.c index 89da8e2..a41a8d3 100644 --- a/session-helper/flatpak-permission-store.c +++ b/session-helper/flatpak-permission-store.c @@ -64,7 +64,7 @@ lookup_table (const char *name, if (table != NULL) return table; - dir = g_build_filename (g_get_user_data_dir (), "xdg-app/db", NULL); + dir = g_build_filename (g_get_user_data_dir (), "flatpak/db", NULL); g_mkdir_with_parents (dir, 0755); path = g_build_filename (dir, name, NULL); diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c index 54ec63e..074a05f 100644 --- a/session-helper/flatpak-session-helper.c +++ b/session-helper/flatpak-session-helper.c @@ -26,6 +26,7 @@ #include <gio/gio.h> #include "flatpak-dbus.h" #include "flatpak-permission-store.h" +#include "flatpak-utils.h" static char *monitor_dir; @@ -134,6 +135,8 @@ main (int argc, g_set_prgname (argv[0]); + flatpak_migrate_from_xdg_app (); + monitor_dir = g_build_filename (g_get_user_runtime_dir (), "flatpak-monitor", NULL); if (g_mkdir_with_parents (monitor_dir, 0755) != 0) { |