luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make GPermission more forgiving

Browse Source 
It is not great if calling g_permission_acquire on a simple
permission object just segfaults. This commit arranges for
this to return a G_IO_ERROR_NOT_SUPPORTED error.
This commit is contained in:
Matthias Clasen 2012-08-19 02:19:27 -04:00
parent 4a8740d0d2
commit 4dbcd27eee
1 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
gio/gpermission.c
View File

@ -22,6 +22,11 @@
#include "config.h"
#include "gpermission.h"
#include "gioerror.h"
#include "gioenums.h"
#include "gasyncresult.h"
#include "gsimpleasyncresult.h"
#include "glibintl.h"
@ -318,21 +323,24 @@ g_permission_impl_update (GPermission *permission,
g_object_freeze_notify (object);
allowed = allowed != FALSE;
if (allowed != permission->priv->allowed)
{
permission->priv->allowed = !!allowed;
permission->priv->allowed = allowed;
g_object_notify (object, "allowed");
}
can_acquire = can_acquire != FALSE;
if (can_acquire != permission->priv->can_acquire)
{
permission->priv->can_acquire = !!can_acquire;
permission->priv->can_acquire = can_acquire;
g_object_notify (object, "can-acquire");
}
can_release = can_release != FALSE;
if (can_release != permission->priv->can_release)
{
permission->priv->can_release = !!can_release;
permission->priv->can_release = can_release;
g_object_notify (object, "can-release");
}
@ -372,6 +380,38 @@ g_permission_init (GPermission *permission)
GPermissionPrivate);
}
static gboolean
acquire_or_release (GPermission *permission,
GCancellable *cancellable,
GError **error)
{
g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
"Can't acquire or release permission");
return FALSE;
}
static void
acquire_or_release_async (GPermission *permission,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
g_simple_async_report_error_in_idle (G_OBJECT (permission),
callback, user_data,
G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
"Can't acquire or release permission");
}
static gboolean
acquire_or_release_finish (GPermission *permission,
GAsyncResult *result,
GError **error)
{
g_async_result_legacy_propagate_error (result, error);
return FALSE;
}
static void
g_permission_class_init (GPermissionClass *class)
{
@ -379,6 +419,13 @@ g_permission_class_init (GPermissionClass *class)
object_class->get_property = g_permission_get_property;
class->acquire = acquire_or_release;
class->release = acquire_or_release;
class->acquire_async = acquire_or_release_async;
class->release_async = acquire_or_release_async;
class->acquire_finish = acquire_or_release_finish;
class->release_finish = acquire_or_release_finish;
/**
* GPermission:allowed:
*