mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-10 19:19:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Switch document portal to use strings for document ids

Browse Source
This commit is contained in:
Alexander Larsson
2015-08-26 17:26:53 +02:00
parent 12fbd9ff95
commit 0c25376657
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/org.freedesktop.portal.documents.xml
View File

@@ -30,24 +30,24 @@
</method>
<method name="Add">
<arg type='s' name='uri' direction='in'/>
<arg type='u' name='doc_id' direction='out'/>
<arg type='s' name='doc_id' direction='out'/>
</method>
<method name="AddLocal">
<arg type='h' name='fd' direction='in'/>
<arg type='u' name='doc_id' direction='out'/>
<arg type='s' name='doc_id' direction='out'/>
</method>
<method name="GrantPermissions">
<arg type='u' name='doc_id' direction='in'/>
<arg type='s' name='doc_id' direction='in'/>
<arg type='s' name='app_id' direction='in'/>
<arg type='as' name='permissions' direction='in'/>
</method>
<method name="RevokePermissions">
<arg type='u' name='doc_id' direction='in'/>
<arg type='s' name='doc_id' direction='in'/>
<arg type='s' name='app_id' direction='in'/>
<arg type='as' name='permissions' direction='in'/>
</method>
<method name="Delete">
<arg type='u' name='doc_id' direction='in'/>
<arg type='s' name='doc_id' direction='in'/>
</method>
</interface>
</node>

24
document-portal/xdp-main.c
View File

@@ -104,15 +104,13 @@ portal_grant_permissions (GDBusMethodInvocation *invocation,
const char *app_id)
{
const char *target_app_id;
guint32 doc_id;
g_autofree char *id = NULL;
const char *id;
g_autoptr(GError) error = NULL;
g_autofree const char **permissions = NULL;
XdpPermissionFlags perms;
g_autoptr(XdgAppDbEntry) entry = NULL;
g_variant_get (parameters, "(u&s^a&s)", &doc_id, &target_app_id, &permissions);
id = xdp_name_from_id (doc_id);
g_variant_get (parameters, "(&s&s^a&s)", &id, &target_app_id, &permissions);
entry = xdg_app_db_lookup (db, id);
if (entry == NULL)
@@ -152,14 +150,12 @@ portal_revoke_permissions (GDBusMethodInvocation *invocation,
{
const char *target_app_id;
g_autoptr(GError) error = NULL;
g_autofree char *id = NULL;
guint32 doc_id;
const char *id;
g_autofree const char **permissions = NULL;
g_autoptr(XdgAppDbEntry) entry = NULL;
XdpPermissionFlags perms;
g_variant_get (parameters, "(u&s^a&s)", &doc_id, &target_app_id, &permissions);
id = xdp_name_from_id (doc_id);
g_variant_get (parameters, "(&s&s^a&s)", &id, &target_app_id, &permissions);
entry = xdg_app_db_lookup (db, id);
if (entry == NULL)
@@ -198,18 +194,16 @@ portal_delete (GDBusMethodInvocation *invocation,
GVariant *parameters,
const char *app_id)
{
guint32 doc_id;
g_autofree char *id = NULL;
const char *id;
g_autoptr(XdgAppDbEntry) entry = NULL;
g_variant_get (parameters, "(u)", &doc_id);
id = xdp_name_from_id (doc_id);
g_variant_get (parameters, "(s)", &id);
entry = xdg_app_db_lookup (db, id);
if (entry == NULL)
{
g_dbus_method_invocation_return_error (invocation, XDG_APP_ERROR, XDG_APP_ERROR_NOT_FOUND,
"No such document: %d", doc_id);
"No such document: %s", id);
return;
}
@@ -291,7 +285,7 @@ portal_add (GDBusMethodInvocation *invocation,
id = do_create_doc (uri);
g_dbus_method_invocation_return_value (invocation,
g_variant_new ("(u)", xdp_id_from_name (id)));
g_variant_new ("(s)", id));
}
static void
@@ -376,7 +370,7 @@ portal_add_local (GDBusMethodInvocation *invocation,
}
g_dbus_method_invocation_return_value (invocation,
g_variant_new ("(u)", xdp_id_from_name (id)));
g_variant_new ("(s)", id));
}
typedef void (*PortalMethod) (GDBusMethodInvocation *invocation,