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/config.h.in

diff --git a/src/config.h.in b/src/config.h.in
index 2383753..5611167 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -9,7 +9,7 @@
 #define RING_CLIENT_APP_ID "cx.ring.RingGnome"
 
 #define RING_CLIENT_INSTALL "@RING_INSTALL_PREFIX@"
-#define RING_DATA_DIR "/share/ring-gnome"
+#define RING_DATA_DIR "/share/gnome-ring"
 
 #define PACKAGE_NAME "@PROJECT_NAME@"
 #define LOCALEDIR    "@RING_INSTALL_PREFIX@/share/locale"

src/ring.cx

diff --git a/src/ring.cx b/src/ring.cx
index f624947..48e9e74 100644
--- a/src/ring.cx
+++ b/src/ring.cx
@@ -26,7 +26,7 @@
   HAS_KDE=1
 fi
 
-if type "ring-gnome" > /dev/null 2> /dev/null; then
+if type "gnome-ring" > /dev/null 2> /dev/null; then
   HAS_GNOME=1
 fi
 
@@ -41,14 +41,14 @@
   ring-kde $*
   exit $?
 elif [ $HAS_KDE == "0" ] && [ $HAS_GNOME == "1" ]; then
-  ring-gnome $*
+  gnome-ring $*
   exit $?
 fi
 
 # Both clients installed: run KDE client if KDE wm is running
 # else use the Gnome client.
 if [ -z "$(ps aux | grep kwin | grep -v grep)" ]; then
-  ring-gnome $*
+  gnome-ring $*
   exit $?
 else
   ring-kde $*

src/ring_client.cpp

diff --git a/src/ring_client.cpp b/src/ring_client.cpp
index 8270d06..5ca58e9 100644
--- a/src/ring_client.cpp
+++ b/src/ring_client.cpp
@@ -295,11 +295,6 @@
         exit(1); /* the g_error above should normally cause the applicaiton to exit */
     }
 
-    /* QCore application settings
-       We are intentionally not setting OrganizationName and OrganizationDomain,
-       which would lead to not-so-standard paths when using QStandardPaths */
-    QCoreApplication::setApplicationName("ring");
-
     /* load translations from LRC */
     priv->translator.reset(new QTranslator);
     if (priv->translator->load(QLocale::system(), "lrc", "_", RING_CLIENT_INSTALL "/share/libringclient/translations")) {

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]);