forked from Mirrors/flatpak-builder
common: Move typedef to separate header to avoid circular deps
parent
ad7310f246
commit
b761aa05a7
|
@ -21,6 +21,7 @@ $(systemd_dbus_built_sources) : data/org.freedesktop.systemd1.xml
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
libxdgapp_common_la_SOURCES = \
|
libxdgapp_common_la_SOURCES = \
|
||||||
|
common/xdg-app-common-types.h \
|
||||||
common/xdg-app-dir.c \
|
common/xdg-app-dir.c \
|
||||||
common/xdg-app-dir.h \
|
common/xdg-app-dir.h \
|
||||||
common/xdg-app-run.c \
|
common/xdg-app-run.c \
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
/*
|
||||||
|
* Copyright © 2015 Red Hat, Inc
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* Authors:
|
||||||
|
* Alexander Larsson <alexl@redhat.com>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __XDG_APP_COMMON_TYPES_H__
|
||||||
|
#define __XDG_APP_COMMON_TYPES_H__
|
||||||
|
|
||||||
|
typedef struct XdgAppDir XdgAppDir;
|
||||||
|
typedef struct XdgAppDeploy XdgAppDeploy;
|
||||||
|
typedef struct XdgAppContext XdgAppContext;
|
||||||
|
|
||||||
|
#endif /* __XDG_APP_COMMON_TYPES_H__ */
|
|
@ -30,6 +30,7 @@
|
||||||
|
|
||||||
#include "xdg-app-dir.h"
|
#include "xdg-app-dir.h"
|
||||||
#include "xdg-app-utils.h"
|
#include "xdg-app-utils.h"
|
||||||
|
#include "xdg-app-run.h"
|
||||||
|
|
||||||
#include "errno.h"
|
#include "errno.h"
|
||||||
|
|
||||||
|
|
|
@ -23,10 +23,7 @@
|
||||||
|
|
||||||
#include <ostree.h>
|
#include <ostree.h>
|
||||||
|
|
||||||
#include <xdg-app-run.h>
|
#include <xdg-app-common-types.h>
|
||||||
|
|
||||||
typedef struct XdgAppDir XdgAppDir;
|
|
||||||
typedef struct XdgAppDeploy XdgAppDeploy;
|
|
||||||
|
|
||||||
#define XDG_APP_TYPE_DIR xdg_app_dir_get_type()
|
#define XDG_APP_TYPE_DIR xdg_app_dir_get_type()
|
||||||
#define XDG_APP_DIR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XDG_APP_TYPE_DIR, XdgAppDir))
|
#define XDG_APP_DIR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XDG_APP_TYPE_DIR, XdgAppDir))
|
||||||
|
|
|
@ -23,11 +23,10 @@
|
||||||
|
|
||||||
#include "libglnx/libglnx.h"
|
#include "libglnx/libglnx.h"
|
||||||
#include "dbus-proxy/xdg-app-proxy.h"
|
#include "dbus-proxy/xdg-app-proxy.h"
|
||||||
|
#include "xdg-app-common-types.h"
|
||||||
|
|
||||||
void xdg_app_run_in_transient_unit (const char *app_id);
|
void xdg_app_run_in_transient_unit (const char *app_id);
|
||||||
|
|
||||||
typedef struct XdgAppContext XdgAppContext;
|
|
||||||
|
|
||||||
#define XDG_APP_METADATA_GROUP_CONTEXT "Context"
|
#define XDG_APP_METADATA_GROUP_CONTEXT "Context"
|
||||||
#define XDG_APP_METADATA_GROUP_SESSION_BUS_POLICY "Session Bus Policy"
|
#define XDG_APP_METADATA_GROUP_SESSION_BUS_POLICY "Session Bus Policy"
|
||||||
#define XDG_APP_METADATA_GROUP_ENVIRONMENT "Environment"
|
#define XDG_APP_METADATA_GROUP_ENVIRONMENT "Environment"
|
||||||
|
|
Loading…
Reference in New Issue