diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-02-24 23:55:14 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-02-25 00:29:17 +0800 |
| commit | 1e878d27797a90e0602180972f1727caed6c87eb (patch) | |
| tree | 2a0f4ee0f464f0c6414d30538e5885232d1f7597 | |
| parent | b05a5abcc6842be084aa12632b8ddd8d11dfa485 (diff) | |
| download | gsoc2013-empathy-1e878d27797a90e0602180972f1727caed6c87eb.tar gsoc2013-empathy-1e878d27797a90e0602180972f1727caed6c87eb.tar.gz gsoc2013-empathy-1e878d27797a90e0602180972f1727caed6c87eb.tar.bz2 gsoc2013-empathy-1e878d27797a90e0602180972f1727caed6c87eb.tar.lz gsoc2013-empathy-1e878d27797a90e0602180972f1727caed6c87eb.tar.xz gsoc2013-empathy-1e878d27797a90e0602180972f1727caed6c87eb.tar.zst gsoc2013-empathy-1e878d27797a90e0602180972f1727caed6c87eb.zip | |
Use a appropriate unique name for Empathy unique app
| -rw-r--r-- | libempathy/empathy-utils.h | 2 | ||||
| -rw-r--r-- | src/empathy-debug-window.c | 4 | ||||
| -rw-r--r-- | src/empathy.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index 859aed1e4..0fc6fc2a9 100644 --- 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 a78ae57ab..f15bb3def 100644 --- 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 308ea212c..5ba8be1b2 100644 --- 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)) { |