[pkg-fso-commits] [SCM] libframeworkd-glib branch, master, updated. ad3bb0a5bb521ce8de424cf5ca702f23731c6333

[quickdev]

The following commit has been merged in the master branch:
commit 26330e402a603eebdeb71522893679aea38009ce
Author: quickdev <niklas.coding at gmail.com>
Date:   Mon Dec 22 22:07:18 2008 +0100

    Renamed DBUS error constants, because they are already used in the dbus source.

diff --git a/src/frameworkd-glib-dbus.c b/src/frameworkd-glib-dbus.c
index 9370201..924bfbd 100644
--- a/src/frameworkd-glib-dbus.c
+++ b/src/frameworkd-glib-dbus.c
@@ -88,14 +88,14 @@ GError* dbus_handle_internal_errors(GError *error) {
     int dbusError = 0;
 
     if(error->code == DBUS_GERROR_SERVICE_UNKNOWN) {
-        dbusError = DBUS_ERROR_SERVICE_NOT_AVAILABLE;
+        dbusError = FRAMEWORKD_GLIB_DBUS_ERROR_SERVICE_NOT_AVAILABLE;
     } else if(error->code == DBUS_GERROR_NO_REPLY) {
-        dbusError = DBUS_ERROR_NO_REPLY;
+        dbusError = FRAMEWORKD_GLIB_DBUS_ERROR_NO_REPLY;
     } else {
         lose_gerror("Unknown internal dbus error", error);
     }
     //dbus_connect_to_bus(NULL);
-    return g_error_new (DBUS_ERROR, dbusError, error->message);
+    return g_error_new (FRAMEWORKD_GLIB_DBUS_ERROR, dbusError, error->message);
 }
 
 void dbus_connect_to_bus(FrameworkdHandlers* frameworkdHandler ) {
diff --git a/src/frameworkd-glib-dbus.h b/src/frameworkd-glib-dbus.h
index 99afc5b..ad22302 100644
--- a/src/frameworkd-glib-dbus.h
+++ b/src/frameworkd-glib-dbus.h
@@ -22,13 +22,13 @@
 
 #define DEBUG
 
-#define DBUS_ERROR g_quark_from_static_string("dbus")
-#define IS_DBUS_ERROR(error, code) g_error_matches(error, DBUS_ERROR, code)
+#define FRAMEWORKD_GLIB_DBUS_ERROR g_quark_from_static_string("dbus")
+#define IS_FRAMEWORKD_GLIB_DBUS_ERROR(error, code) g_error_matches(error, FRAMEWORKD_GLIB_DBUS_ERROR, code)
 
 typedef enum {
-    DBUS_ERROR_SERVICE_NOT_AVAILABLE = -1,
-    DBUS_ERROR_NO_REPLY = -2
-} DbusErrors;
+    FRAMEWORKD_GLIB_DBUS_ERROR_SERVICE_NOT_AVAILABLE = -1,
+    FRAMEWORKD_GLIB_DBUS_ERROR_NO_REPLY = -2
+} FramewordGlibDbusErrors;
 
 typedef struct {
     void (*networkStatus)(GHashTable *);

-- 
libframeworkd-glib