commit 526c41ebc40384cebd28e7f046c0eb08102fa155
author Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Wed Jun 08 16:48:20 2016 -0400
committer Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Wed Jun 08 17:28:20 2016 -0400
tree 80bc27be4aedc31ff846a40b6a2d1db4cce5d142
parent c634cbec7d5ef2e67a2948c6ec75e889d3c432ce

Revert "Rename gnome-ring to ring-gnome"

Reverting until further discussion.

This reverts commit c634cbec7d5ef2e67a2948c6ec75e889d3c432ce.

Tuleap: #764
Change-Id: Ie7a47859b7103817208da416623f2a3e225f5eb9

src/utils/files.cpp

diff --git a/src/utils/files.cpp b/src/utils/files.cpp
index 0b53f76..d941cc4 100644
--- a/src/utils/files.cpp
+++ b/src/utils/files.cpp
@@ -29,13 +29,13 @@
 void
 autostart_symlink(gboolean autostart)
 {
-    /* autostart is enabled by creating a symlink to ring-gnome.desktop in
+    /* autostart is enabled by creating a symlink to gnome-ring.desktop in
      * $XDG_CONFIG_HOME/autostart (by default ~/.config/autostart)
      * and removing it to disable autostart
      */
 
     GError *error = NULL;
-    gchar *autostart_path = g_strconcat(g_get_user_config_dir(), "/autostart/ring-gnome.desktop", NULL);
+    gchar *autostart_path = g_strconcat(g_get_user_config_dir(), "/autostart/gnome-ring.desktop", NULL);
 
     if (autostart) {
         g_debug("enabling autostart");
@@ -53,9 +53,9 @@
          */
         int num_paths = 3;
         gchar *desktop_paths[num_paths];
-        desktop_paths[0] = g_strconcat("/usr", RING_DATA_DIR, "/ring-gnome.desktop", NULL);
-        desktop_paths[1] = g_strconcat("/usr/local", RING_DATA_DIR, "/ring-gnome.desktop", NULL);
-        desktop_paths[2] = g_strconcat(RING_CLIENT_INSTALL, RING_DATA_DIR, "/ring-gnome.desktop", NULL);
+        desktop_paths[0] = g_strconcat("/usr", RING_DATA_DIR, "/gnome-ring.desktop", NULL);
+        desktop_paths[1] = g_strconcat("/usr/local", RING_DATA_DIR, "/gnome-ring.desktop", NULL);
+        desktop_paths[2] = g_strconcat(RING_CLIENT_INSTALL, RING_DATA_DIR, "/gnome-ring.desktop", NULL);
 
         for (int i = 0; i < num_paths && !desktop_path; ++i) {
             g_debug("checking %s", desktop_paths[i]);