cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-09 04:13:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Register errors with D-Bus

Browse Source 
So we get errors like:
net.reactivated.Fprint.Error.DiscoverPrints
instead of:
org.freedesktop.DBus.GLib.UnmappedError.FprintdErrorQuark.Code2
This commit is contained in:
Bastien Nocera
2008-11-24 12:33:20 +00:00
committed by Daniel Drake
parent 6fc861a154
commit 9743d9d2a0
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/fprintd.h
View File

@ -27,10 +27,14 @@
#define TIMEOUT 30 #define TIMEOUT 30
#define FPRINT_SERVICE_NAME "net.reactivated.Fprint" #define FPRINT_SERVICE_NAME "net.reactivated.Fprint"
extern DBusGConnection *fprintd_dbus_conn; extern DBusGConnection *fprintd_dbus_conn;
GQuark fprint_error_quark(void);
/* Errors */ /* Errors */
GQuark fprint_error_quark(void);
GType fprint_error_get_type(void);
#define FPRINT_ERROR fprint_error_quark() #define FPRINT_ERROR fprint_error_quark()
#define FPRINT_TYPE_ERROR fprint_error_get_type()
#define FPRINT_ERROR_DBUS_INTERFACE "net.reactivated.Fprint.Error"
typedef enum { typedef enum {
FPRINT_ERROR_INTERNAL, FPRINT_ERROR_INTERNAL,
FPRINT_ERROR_ALREADY_IN_USE, FPRINT_ERROR_ALREADY_IN_USE,

30
src/manager.c
View File

@ -64,7 +64,8 @@ static void fprint_manager_finalize(GObject *object)
static void fprint_manager_class_init(FprintManagerClass *klass) static void fprint_manager_class_init(FprintManagerClass *klass)
{ {
dbus_g_object_type_install_info(FPRINT_TYPE_MANAGER, dbus_g_object_type_install_info(FPRINT_TYPE_MANAGER,
&dbus_glib_fprint_manager_object_info); &dbus_glib_fprint_manager_object_info);
dbus_g_error_domain_register (FPRINT_ERROR, FPRINT_ERROR_DBUS_INTERFACE, FPRINT_TYPE_ERROR);
g_type_class_add_private ((GObjectClass *) klass, sizeof (FprintManagerPrivate)); g_type_class_add_private ((GObjectClass *) klass, sizeof (FprintManagerPrivate));
@ -213,3 +214,30 @@ GQuark fprint_error_quark(void)
return quark; return quark;
} }
#define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC }
GType
fprint_error_get_type (void)
{
static GType etype = 0;
if (etype == 0) {
static const GEnumValue values[] =
{
ENUM_ENTRY (FPRINT_ERROR_INTERNAL, "Internal"),
ENUM_ENTRY (FPRINT_ERROR_ALREADY_IN_USE, "InUse"),
ENUM_ENTRY (FPRINT_ERROR_DISCOVER_PRINTS, "DiscoverPrints"),
ENUM_ENTRY (FPRINT_ERROR_PRINT_NOT_FOUND, "PrintNotFound"),
ENUM_ENTRY (FPRINT_ERROR_PRINT_LOAD, "PrintLoad"),
ENUM_ENTRY (FPRINT_ERROR_NO_SUCH_LOADED_PRINT, "NoSuchLoadedPrint"),
ENUM_ENTRY (FPRINT_ERROR_CLAIM_DEVICE, "ClaimDevice"),
ENUM_ENTRY (FPRINT_ERROR_VERIFY_START, "VerifyStart"),
ENUM_ENTRY (FPRINT_ERROR_VERIFY_STOP, "VerifyStop"),
ENUM_ENTRY (FPRINT_ERROR_ENROLL_START, "EnrollStart"),
ENUM_ENTRY (FPRINT_ERROR_ENROLL_STOP, "EnrollStop"),
ENUM_ENTRY (FPRINT_ERROR_FAILED, "Failed"),
{ 0, 0, 0 }
};
etype = g_enum_register_static ("FprintError", values);
}
return etype;
}