Use org.freedesktop.UDisks2.* for errors, not org.freedesktop.UDisks.*

This will break apps using the D-Bus library but will not break apps
using the libudisks2 library.

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/udisks/udisksclient.c b/udisks/udisksclient.c
index 737063d..9df622f 100644 (file)
--- a/udisks/udisksclient.c
+++ b/udisks/udisksclient.c
@@ -154,8 +154,9 @@ static void
 udisks_client_init (UDisksClient *client)
 {
   static volatile GQuark udisks_error_domain = 0;
-  /* this will force associating errors in the UDISKS_ERROR error domain
-   * with org.freedesktop.UDisks.Error.* errors via g_dbus_error_register_error_domain().
+  /* this will force associating errors in the UDISKS_ERROR error
+   * domain with org.freedesktop.UDisks2.Error.* errors via
+   * g_dbus_error_register_error_domain().
    */
   udisks_error_domain = UDISKS_ERROR;
   udisks_error_domain; /* shut up -Wunused-but-set-variable */

diff --git a/udisks/udisksenums.h b/udisks/udisksenums.h
index fc34c94..a5daf5b 100644 (file)
--- a/udisks/udisksenums.h
+++ b/udisks/udisksenums.h
@@ -52,21 +52,21 @@ G_BEGIN_DECLS
  */
 typedef enum
 {
-  UDISKS_ERROR_FAILED,                     /* org.freedesktop.UDisks.Error.Failed */
-  UDISKS_ERROR_CANCELLED,                  /* org.freedesktop.UDisks.Error.Cancelled */
-  UDISKS_ERROR_ALREADY_CANCELLED,          /* org.freedesktop.UDisks.Error.AlreadyCancelled */
-  UDISKS_ERROR_NOT_AUTHORIZED,             /* org.freedesktop.UDisks.Error.NotAuthorized */
-  UDISKS_ERROR_NOT_AUTHORIZED_CAN_OBTAIN,  /* org.freedesktop.UDisks.Error.NotAuthorizedCanObtain */
-  UDISKS_ERROR_NOT_AUTHORIZED_DISMISSED,   /* org.freedesktop.UDisks.Error.NotAuthorizedDismissed */
-  UDISKS_ERROR_ALREADY_MOUNTED,            /* org.freedesktop.UDisks.Error.AlreadyMounted */
-  UDISKS_ERROR_NOT_MOUNTED,                /* org.freedesktop.UDisks.Error.NotMounted */
-  UDISKS_ERROR_OPTION_NOT_PERMITTED,       /* org.freedesktop.UDisks.Error.OptionNotPermitted */
-  UDISKS_ERROR_MOUNTED_BY_OTHER_USER,      /* org.freedesktop.UDisks.Error.MountedByOtherUser */
-  UDISKS_ERROR_ALREADY_UNMOUNTING,         /* org.freedesktop.UDisks.Error.AlreadyUnmounting */
-  UDISKS_ERROR_NOT_SUPPORTED,              /* org.freedesktop.UDisks.Error.NotSupported */
-  UDISKS_ERROR_TIMED_OUT,                  /* org.freedesktop.UDisks.Error.Timedout */
-  UDISKS_ERROR_WOULD_WAKEUP,               /* org.freedesktop.UDisks.Error.WouldWakeup */
-  UDISKS_ERROR_DEVICE_BUSY                 /* org.freedesktop.UDisks.Error.DeviceBusy */
+  UDISKS_ERROR_FAILED,                     /* org.freedesktop.UDisks2.Error.Failed */
+  UDISKS_ERROR_CANCELLED,                  /* org.freedesktop.UDisks2.Error.Cancelled */
+  UDISKS_ERROR_ALREADY_CANCELLED,          /* org.freedesktop.UDisks2.Error.AlreadyCancelled */
+  UDISKS_ERROR_NOT_AUTHORIZED,             /* org.freedesktop.UDisks2.Error.NotAuthorized */
+  UDISKS_ERROR_NOT_AUTHORIZED_CAN_OBTAIN,  /* org.freedesktop.UDisks2.Error.NotAuthorizedCanObtain */
+  UDISKS_ERROR_NOT_AUTHORIZED_DISMISSED,   /* org.freedesktop.UDisks2.Error.NotAuthorizedDismissed */
+  UDISKS_ERROR_ALREADY_MOUNTED,            /* org.freedesktop.UDisks2.Error.AlreadyMounted */
+  UDISKS_ERROR_NOT_MOUNTED,                /* org.freedesktop.UDisks2.Error.NotMounted */
+  UDISKS_ERROR_OPTION_NOT_PERMITTED,       /* org.freedesktop.UDisks2.Error.OptionNotPermitted */
+  UDISKS_ERROR_MOUNTED_BY_OTHER_USER,      /* org.freedesktop.UDisks2.Error.MountedByOtherUser */
+  UDISKS_ERROR_ALREADY_UNMOUNTING,         /* org.freedesktop.UDisks2.Error.AlreadyUnmounting */
+  UDISKS_ERROR_NOT_SUPPORTED,              /* org.freedesktop.UDisks2.Error.NotSupported */
+  UDISKS_ERROR_TIMED_OUT,                  /* org.freedesktop.UDisks2.Error.Timedout */
+  UDISKS_ERROR_WOULD_WAKEUP,               /* org.freedesktop.UDisks2.Error.WouldWakeup */
+  UDISKS_ERROR_DEVICE_BUSY                 /* org.freedesktop.UDisks2.Error.DeviceBusy */
 } UDisksError;
 
 #define UDISKS_ERROR_NUM_ENTRIES  (UDISKS_ERROR_DEVICE_BUSY + 1)

diff --git a/udisks/udiskserror.c b/udisks/udiskserror.c
index 9d2df57..dbf7df9 100644 (file)
--- a/udisks/udiskserror.c
+++ b/udisks/udiskserror.c
@@ -33,21 +33,21 @@
 
 static const GDBusErrorEntry dbus_error_entries[] =
 {
-  {UDISKS_ERROR_FAILED,                       "org.freedesktop.UDisks.Error.Failed"},
-  {UDISKS_ERROR_CANCELLED,                    "org.freedesktop.UDisks.Error.Cancelled"},
-  {UDISKS_ERROR_ALREADY_CANCELLED,            "org.freedesktop.UDisks.Error.AlreadyCancelled"},
-  {UDISKS_ERROR_NOT_AUTHORIZED,               "org.freedesktop.UDisks.Error.NotAuthorized"},
-  {UDISKS_ERROR_NOT_AUTHORIZED_CAN_OBTAIN,    "org.freedesktop.UDisks.Error.NotAuthorizedCanObtain"},
-  {UDISKS_ERROR_NOT_AUTHORIZED_DISMISSED,     "org.freedesktop.UDisks.Error.NotAuthorizedDismissed"},
-  {UDISKS_ERROR_ALREADY_MOUNTED,              "org.freedesktop.UDisks.Error.AlreadyMounted"},
-  {UDISKS_ERROR_NOT_MOUNTED,                  "org.freedesktop.UDisks.Error.NotMounted"},
-  {UDISKS_ERROR_OPTION_NOT_PERMITTED,         "org.freedesktop.UDisks.Error.OptionNotPermitted"},
-  {UDISKS_ERROR_MOUNTED_BY_OTHER_USER,        "org.freedesktop.UDisks.Error.MountedByOtherUser"},
-  {UDISKS_ERROR_ALREADY_UNMOUNTING,           "org.freedesktop.UDisks.Error.AlreadyUnmounting"},
-  {UDISKS_ERROR_NOT_SUPPORTED,                "org.freedesktop.UDisks.Error.NotSupported"},
-  {UDISKS_ERROR_TIMED_OUT,                    "org.freedesktop.UDisks.Error.Timedout"},
-  {UDISKS_ERROR_WOULD_WAKEUP,                 "org.freedesktop.UDisks.Error.WouldWakeup"},
-  {UDISKS_ERROR_DEVICE_BUSY,                  "org.freedesktop.UDisks.Error.DeviceBusy"},
+  {UDISKS_ERROR_FAILED,                       "org.freedesktop.UDisks2.Error.Failed"},
+  {UDISKS_ERROR_CANCELLED,                    "org.freedesktop.UDisks2.Error.Cancelled"},
+  {UDISKS_ERROR_ALREADY_CANCELLED,            "org.freedesktop.UDisks2.Error.AlreadyCancelled"},
+  {UDISKS_ERROR_NOT_AUTHORIZED,               "org.freedesktop.UDisks2.Error.NotAuthorized"},
+  {UDISKS_ERROR_NOT_AUTHORIZED_CAN_OBTAIN,    "org.freedesktop.UDisks2.Error.NotAuthorizedCanObtain"},
+  {UDISKS_ERROR_NOT_AUTHORIZED_DISMISSED,     "org.freedesktop.UDisks2.Error.NotAuthorizedDismissed"},
+  {UDISKS_ERROR_ALREADY_MOUNTED,              "org.freedesktop.UDisks2.Error.AlreadyMounted"},
+  {UDISKS_ERROR_NOT_MOUNTED,                  "org.freedesktop.UDisks2.Error.NotMounted"},
+  {UDISKS_ERROR_OPTION_NOT_PERMITTED,         "org.freedesktop.UDisks2.Error.OptionNotPermitted"},
+  {UDISKS_ERROR_MOUNTED_BY_OTHER_USER,        "org.freedesktop.UDisks2.Error.MountedByOtherUser"},
+  {UDISKS_ERROR_ALREADY_UNMOUNTING,           "org.freedesktop.UDisks2.Error.AlreadyUnmounting"},
+  {UDISKS_ERROR_NOT_SUPPORTED,                "org.freedesktop.UDisks2.Error.NotSupported"},
+  {UDISKS_ERROR_TIMED_OUT,                    "org.freedesktop.UDisks2.Error.Timedout"},
+  {UDISKS_ERROR_WOULD_WAKEUP,                 "org.freedesktop.UDisks2.Error.WouldWakeup"},
+  {UDISKS_ERROR_DEVICE_BUSY,                  "org.freedesktop.UDisks2.Error.DeviceBusy"},
 };
 
 GQuark