[Xfce4-commits] [xfce/xfce4-power-manager] 37/63: Ported xfpm-errors to gdbus errors.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit 8499aa632ae2445d3cb7de64ced42063db0189e2
Author: Peter de Ridder <peter at xfce.org>
Date:   Sun Mar 15 15:47:29 2015 +0100

    Ported xfpm-errors to gdbus errors.
---
 src/xfpm-errors.c |   41 +++++++++++++++++------------------------
 src/xfpm-errors.h |    2 --
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/src/xfpm-errors.c b/src/xfpm-errors.c
index 4364bcd..aed55ee 100644
--- a/src/xfpm-errors.c
+++ b/src/xfpm-errors.c
@@ -22,38 +22,31 @@
 #include <config.h>
 #endif
 
-#include "xfpm-errors.h"
+#include <gio/gio.h>
 
-static GQuark xfpm_error_quark = 0;
+#include "xfpm-errors.h"
 
 GQuark
 xfpm_get_error_quark (void)
 {
+    static volatile gsize xfpm_error_quark = 0;
     if (xfpm_error_quark == 0)
-	xfpm_error_quark = g_quark_from_static_string ("xfpm-error-quark");
-	
-    return xfpm_error_quark;
-}
-
-GType
-xfpm_error_get_type (void)
-{
-    static GType type = 0;
-    
-    if (!type)
     {
-	static const GEnumValue values[] = 
+	static const GDBusErrorEntry values[] =
 	{
-	    { XFPM_ERROR_UNKNOWN, "XFPM_ERROR_UNKNOWN", "Unknown" },
-	    { XFPM_ERROR_PERMISSION_DENIED, "XFPM_ERROR_PERMISSION_DENIED", "PermissionDenied" },
-	    { XFPM_ERROR_NO_HARDWARE_SUPPORT, "XFPM_ERROR_HARDWARE_NOT_SUPPORT", "NoHardwareSupport" },
-	    { XFPM_ERROR_COOKIE_NOT_FOUND, "XFPM_ERROR_COOKIE_NOT_FOUND", "CookieNotFound" },
-	    { XFPM_ERROR_INVALID_ARGUMENTS, "XFPM_ERROR_INVALID_ARGUMENTS", "InvalidArguments" },
-	    { XFPM_ERROR_SLEEP_FAILED, "XFPM_ERROR_SLEEP_FAILED", "SleepFailed" },
-	    { 0, NULL, NULL }
+	    { XFPM_ERROR_UNKNOWN, "org.xfce.PowerManager.Error.Unknown" },
+	    { XFPM_ERROR_PERMISSION_DENIED, "org.xfce.PowerManager.Error.PermissionDenied" },
+	    { XFPM_ERROR_NO_HARDWARE_SUPPORT, "org.xfce.PowerManager.Error.NoHardwareSupport" },
+	    { XFPM_ERROR_COOKIE_NOT_FOUND, "org.xfce.PowerManager.Error.CookieNotFound" },
+	    { XFPM_ERROR_INVALID_ARGUMENTS, "org.xfce.PowerManager.Error.InvalidArguments" },
+	    { XFPM_ERROR_SLEEP_FAILED, "org.xfce.PowerManager.Error.SleepFailed" },
 	};
-	
-	type = g_enum_register_static ("XfpmError", values);
+
+        g_dbus_error_register_error_domain ("xfpm-error-quark",
+                                            &xfpm_error_quark,
+                                            values,
+                                            G_N_ELEMENTS (values));
     }
-    return type;
+
+    return (GQuark) xfpm_error_quark;
 }
diff --git a/src/xfpm-errors.h b/src/xfpm-errors.h
index 10d4845..4cc2b23 100644
--- a/src/xfpm-errors.h
+++ b/src/xfpm-errors.h
@@ -25,7 +25,6 @@
 
 G_BEGIN_DECLS
 
-#define XFPM_TYPE_ERROR	(xfpm_error_get_type  ())
 #define XFPM_ERROR      (xfpm_get_error_quark ())
 
 
@@ -40,7 +39,6 @@ typedef enum
     
 } XfpmError;
 
-GType	xfpm_error_get_type  (void) G_GNUC_CONST;
 GQuark  xfpm_get_error_quark (void);
 
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.