Use a appropriate unique name for Empathy unique app

diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 859aed1e4a237bdd8f323925b920e55dbd6cd959..0fc6fc2a9773282116784640400b9e414304aeca 100644 (file)
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -37,8 +37,6 @@
 #define EMPATHY_GET_PRIV(obj,type) ((type##Priv *) ((type *) obj)->priv)
 #define EMP_STR_EMPTY(x) ((x) == NULL || (x)[0] == '\0')
 
-#define EMPATHY_CLIENT_NAME "org.freedesktop.Telepathy.Client.Empathy"
-
 G_BEGIN_DECLS
 
 void         empathy_init                           (void);

diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index a78ae57ab161249b82a4c11a15cf0459bcf82f56..f15bb3def747e27f1dca23cf43f9b0a6a9bc052f 100644 (file)
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -746,8 +746,8 @@ debug_window_fill_cm_chooser (EmpathyDebugWindow *debug_window)
   /* Add empathy */
   gtk_list_store_append (priv->cms, &iter);
   gtk_list_store_set (priv->cms, &iter,
-      COL_CM_NAME, "empathy",
-      COL_CM_UNIQUE_NAME, EMPATHY_CLIENT_NAME,
+      COL_CM_NAME, _(PACKAGE_NAME),
+      COL_CM_UNIQUE_NAME, "org.gnome."PACKAGE_NAME,
       -1);
   gtk_combo_box_set_active (GTK_COMBO_BOX (priv->cm_chooser), 0);
 

diff --git a/src/empathy.c b/src/empathy.c
index 308ea212cb735d5eb1dd538fbce51aa42732fe79..5ba8be1b271c7809b3b7f89bf8f22a18d945c785 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -612,7 +612,7 @@ main (int argc, char *argv[])
   g_log_set_default_handler (tp_debug_sender_log_handler, G_LOG_DOMAIN);
 #endif
 
-  unique_app = unique_app_new (EMPATHY_CLIENT_NAME, NULL);
+  unique_app = unique_app_new ("org.gnome."PACKAGE_NAME, NULL);
 
   if (unique_app_is_running (unique_app))
     {