[empathy/mc5: 418/483] replace UNIQUE_NAME_PREFIX by TP_ACCOUNT_OBJECT_PATH_BASE



commit 27e11ea6e41c5b2498307d581caa751936de30f1
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Tue Aug 18 19:33:10 2009 +0100

    replace UNIQUE_NAME_PREFIX by TP_ACCOUNT_OBJECT_PATH_BASE

 libempathy/empathy-account.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/libempathy/empathy-account.c b/libempathy/empathy-account.c
index 7d89f20..623a324 100644
--- a/libempathy/empathy-account.c
+++ b/libempathy/empathy-account.c
@@ -28,6 +28,7 @@
 #include <telepathy-glib/gtypes.h>
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/defs.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include <libempathy/empathy-debug.h>
@@ -38,8 +39,6 @@
 #include "empathy-utils.h"
 #include "empathy-marshal.h"
 
-#define UNIQUE_NAME_PREFIX "/org/freedesktop/Telepathy/Account/"
-
 /* signals */
 enum {
   STATUS_CHANGED,
@@ -418,9 +417,9 @@ empathy_account_parse_unique_name (const gchar *bus_name,
   const gchar *cm, *cm_end;
 
   g_return_val_if_fail (
-    g_str_has_prefix (bus_name, UNIQUE_NAME_PREFIX), FALSE);
+    g_str_has_prefix (bus_name, TP_ACCOUNT_OBJECT_PATH_BASE), FALSE);
 
-  cm = bus_name + strlen (UNIQUE_NAME_PREFIX);
+  cm = bus_name + strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
 
   for (cm_end = cm; *cm_end != '/' && *cm_end != '\0'; cm_end++)
     /* pass */;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]