diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-02-25 04:14:24 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-02-25 04:14:30 +0800 |
| commit | ed582f419d68c95dabfc26d4453c89d0d7f038a4 (patch) | |
| tree | b432b1a69f5668308de742502b36e5cc08f28fa7 /src | |
| parent | 81aeb65dee8294293fca221cf72a63cefde67d07 (diff) | |
| parent | 065307088d490e8f8bc4c04d3981b047c9fb408f (diff) | |
| download | gsoc2013-empathy-ed582f419d68c95dabfc26d4453c89d0d7f038a4.tar gsoc2013-empathy-ed582f419d68c95dabfc26d4453c89d0d7f038a4.tar.gz gsoc2013-empathy-ed582f419d68c95dabfc26d4453c89d0d7f038a4.tar.bz2 gsoc2013-empathy-ed582f419d68c95dabfc26d4453c89d0d7f038a4.tar.lz gsoc2013-empathy-ed582f419d68c95dabfc26d4453c89d0d7f038a4.tar.xz gsoc2013-empathy-ed582f419d68c95dabfc26d4453c89d0d7f038a4.tar.zst gsoc2013-empathy-ed582f419d68c95dabfc26d4453c89d0d7f038a4.zip | |
Merge branch 'requests'. Fixes: #598905
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-debug-window.c | 4 | ||||
| -rw-r--r-- | src/empathy.c | 2 |
2 files changed, 3 insertions, 3 deletions
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)) { |