Revert "Rename gnome-ring to ring-gnome"
Reverting until further discussion.
This reverts commit c634cbec7d5ef2e67a2948c6ec75e889d3c432ce.
Tuleap: #764
Change-Id: Ie7a47859b7103817208da416623f2a3e225f5eb9
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56640ed..7090cd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -337,12 +337,12 @@
# install and compile glib gsettings schema
add_schema("cx.ring.RingGnome.gschema.xml" GSCHEMA_RING)
-ADD_EXECUTABLE(ring-gnome ${GLIB_RESOURCES_RING} ${GSCHEMA_RING} ${SRC_FILES})
+ADD_EXECUTABLE(gnome-ring ${GLIB_RESOURCES_RING} ${GSCHEMA_RING} ${SRC_FILES})
-ADD_DEPENDENCIES(ring-gnome libqrencode)
+ADD_DEPENDENCIES(gnome-ring libqrencode)
IF(NOT ${ENABLE_STATIC} MATCHES false)
-TARGET_LINK_LIBRARIES(ring-gnome
+TARGET_LINK_LIBRARIES(gnome-ring
${LIB_RING_CLIENT_LIBRARY}
${GTK3_LIBRARIES}
${Qt5Core_LIBRARIES}
@@ -356,7 +356,7 @@
-lqrencode
)
ELSE()
-TARGET_LINK_LIBRARIES(ring-gnome
+TARGET_LINK_LIBRARIES(gnome-ring
${LIB_RING_CLIENT_LIBRARY}
${GTK3_LIBRARIES}
${Qt5Core_LIBRARIES}
@@ -381,34 +381,34 @@
"${PROJECT_BINARY_DIR}/config.h"
)
-INSTALL(TARGETS ring-gnome
+INSTALL(TARGETS gnome-ring
RUNTIME DESTINATION bin
)
# install .desktop in XDG desktop dir so that it is recognized by the system
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/ring-gnome.desktop
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
)
-# install .desktop in the ring-gnome data dir, so that it can be copied to the
+# install .desktop in the gnome-ring data dir, so that it can be copied to the
# autostart dir by the client
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/ring-gnome.desktop.autostart
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop.autostart
DESTINATION
- ${CMAKE_INSTALL_PREFIX}/share/ring-gnome/
+ ${CMAKE_INSTALL_PREFIX}/share/gnome-ring/
PERMISSIONS
WORLD_READ
OWNER_WRITE
OWNER_READ
GROUP_READ
RENAME
- ring-gnome.desktop
+ gnome-ring.desktop
)
INSTALL(FILES pixmaps/ring.svg
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
)
-INSTALL(FILES ring-gnome.appdata.xml
+INSTALL(FILES gnome-ring.appdata.xml
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata/
)
diff --git a/README b/README
index b7b53fb..e22dcf4 100644
--- a/README
+++ b/README
@@ -46,7 +46,7 @@
cmake ..
make
-You can then simply run ./ring-gnome from the build directory
+You can then simply run ./gnome-ring from the build directory
Installing
==================
diff --git a/doc/ring-gnome.1 b/doc/gnome-ring.1
similarity index 68%
rename from doc/ring-gnome.1
rename to doc/gnome-ring.1
index 9c5c226..449739a 100644
--- a/doc/ring-gnome.1
+++ b/doc/gnome-ring.1
@@ -1,11 +1,11 @@
-.\" Manpage for ring-gnome.
-.TH man 8 "08 April 2016" "1.0" "ring-gnome man page"
+.\" Manpage for gnome-ring.
+.TH man 8 "08 April 2016" "1.0" "gnome-ring man page"
.SH NAME
-ring-gnome \- Gnome client for Ring.cx
+gnome-ring \- Gnome client for Ring.cx
.SH SYNOPSIS
-ring-gnome [options]
+gnome-ring [options]
.SH DESCRIPTION
-ring-gnome is a gnome client for Ring.cx
+gnome-ring is a gnome client for Ring.cx
.SH OPTIONS
.B \-v, \-\-version
Display the version and exit.
diff --git a/ring-gnome.appdata.xml b/gnome-ring.appdata.xml
similarity index 93%
rename from ring-gnome.appdata.xml
rename to gnome-ring.appdata.xml
index 7d7257d..b939fbd 100644
--- a/ring-gnome.appdata.xml
+++ b/gnome-ring.appdata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2015 Savoir-faire Linux -->
<component type="desktop">
- <id>ring-gnome.desktop</id>
+ <id>gnome-ring.desktop</id>
<metadata_license>CC-BY-SA-3.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<name>Ring</name>
@@ -13,4 +13,4 @@
</p>
</description>
<url type="homepage">http://www.ring.cx</url>
-</component>
+</component>
\ No newline at end of file
diff --git a/ring-gnome.desktop b/gnome-ring.desktop
similarity index 93%
rename from ring-gnome.desktop
rename to gnome-ring.desktop
index a69fb5e..12d4418 100644
--- a/ring-gnome.desktop
+++ b/gnome-ring.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Ring
Comment=Ring is a secured and distributed communication software.
-Exec=ring-gnome
+Exec=gnome-ring
Icon=ring
StartupNotify=true
Terminal=false
diff --git a/ring-gnome.desktop.autostart b/gnome-ring.desktop.autostart
similarity index 81%
rename from ring-gnome.desktop.autostart
rename to gnome-ring.desktop.autostart
index e8f0770..bdd4d2f 100644
--- a/ring-gnome.desktop.autostart
+++ b/gnome-ring.desktop.autostart
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Ring
Comment=Ring is a secured and distributed communication software.
-Exec=ring-gnome --restore-last-window-state
+Exec=gnome-ring --restore-last-window-state
Icon=ring
StartupNotify=true
Terminal=false
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"
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 $*
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")) {
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]);