Commit dcc6c718 authored by Vladimir Stoiakin's avatar Vladimir Stoiakin Committed by Adrien Béraud

migration: rename files and directories

Rename the objects according to the new name of the project.

Change-Id: Iaf018c6e5b49b3a7a0b0c2ee26a52669961b6673
parent cb1138ad
......@@ -14,7 +14,7 @@ ENDIF()
set (CMAKE_CXX_STANDARD 14)
# set project name and version
PROJECT(ring-client-gnome)
PROJECT(jami-client-gnome)
IF(EXISTS "${PROJECT_SOURCE_DIR}/version.txt")
FILE (STRINGS "version.txt" PROJECT_VERSION)
......@@ -355,12 +355,12 @@ IF (GETTEXT_FOUND)
ENDIF(GETTEXT_FOUND)
# install and compile glib gsettings schema
add_schema("cx.ring.RingGnome.gschema.xml" GSCHEMA_RING)
add_schema("net.jami.client.gnome.gschema.xml" GSCHEMA_RING)
ADD_EXECUTABLE(gnome-ring ${GLIB_RESOURCES_RING} ${GSCHEMA_RING} ${SRC_FILES})
ADD_EXECUTABLE(jami-gnome ${GLIB_RESOURCES_RING} ${GSCHEMA_RING} ${SRC_FILES})
IF(NOT ${ENABLE_STATIC} MATCHES false)
TARGET_LINK_LIBRARIES(gnome-ring
TARGET_LINK_LIBRARIES(jami-gnome
${LIB_RING_CLIENT_LIBRARY}
${GTK3_LIBRARIES}
${Qt5Core_LIBRARIES}
......@@ -377,7 +377,7 @@ TARGET_LINK_LIBRARIES(gnome-ring
-lrt
)
ELSE()
TARGET_LINK_LIBRARIES(gnome-ring
TARGET_LINK_LIBRARIES(jami-gnome
${LIB_RING_CLIENT_LIBRARY}
${GTK3_LIBRARIES}
${Qt5Core_LIBRARIES}
......@@ -420,46 +420,46 @@ CONFIGURE_FILE (
"${PROJECT_BINARY_DIR}/config.h"
)
INSTALL(TARGETS gnome-ring
INSTALL(TARGETS jami-gnome
RUNTIME DESTINATION bin
)
# install .desktop in XDG desktop dir so that it is recognized by the system
INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop
INSTALL(FILES ${PROJECT_SOURCE_DIR}/jami-gnome.desktop
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
)
# install audio files
INSTALL(FILES ${PROJECT_SOURCE_DIR}/sounds/ringtone_notify.wav
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/sounds/gnome-ring
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/sounds/jami-gnome
)
# install .desktop in the gnome-ring data dir, so that it can be copied to the
# install .desktop in the jami-gnome data dir, so that it can be copied to the
# autostart dir by the client
INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop.autostart
INSTALL(FILES ${PROJECT_SOURCE_DIR}/jami-gnome.desktop.autostart
DESTINATION
${CMAKE_INSTALL_PREFIX}/share/gnome-ring/
${CMAKE_INSTALL_PREFIX}/share/jami-gnome
PERMISSIONS
WORLD_READ
OWNER_WRITE
OWNER_READ
GROUP_READ
RENAME
gnome-ring.desktop
jami-gnome.desktop
)
INSTALL(FILES pixmaps/jami.svg
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
)
INSTALL(FILES gnome-ring.appdata.xml
INSTALL(FILES jami-gnome.appdata.xml
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata/
)
# install shell script which will launch "ring"
# install shell script which will launch Jami
INSTALL(
FILES
"${PROJECT_SOURCE_DIR}/src/ring.cx"
"${PROJECT_SOURCE_DIR}/src/jami"
DESTINATION
${CMAKE_INSTALL_PREFIX}/bin
PERMISSIONS
......
......@@ -53,7 +53,7 @@ cmake ..
make
```
You can then simply run `./gnome-ring` from the build directory
You can then simply run `./jami-gnome` from the build directory
## Installing
......
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
<schema path="/net/jami/JamiGnome/" id="cx.ring.RingGnome">
<schema path="/net/jami/JamiGnome/" id="net.jami.client.gnome">
<key name="start-on-login" type="b">
<default>true</default>
<summary>Start Jami on login.</summary>
......
.\" Manpage for gnome-ring.
.TH man 8 "08 April 2016" "1.0" "gnome-ring man page"
.\" Manpage for jami-gnome.
.TH man 8 "08 April 2016" "1.0" "jami-gnome man page"
.SH NAME
gnome-ring \- Gnome client for Ring.cx
jami-gnome \- Gnome client for jami.net
.SH SYNOPSIS
gnome-ring [options]
jami-gnome [options]
.SH DESCRIPTION
gnome-ring is a gnome client for Ring.cx
jami-gnome is a gnome client for jami.net
.SH OPTIONS
.B \-v, \-\-version
Display the version and exit.
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2017 Savoir-faire Linux -->
<component type="desktop">
<id>gnome-ring.desktop</id>
<id>jami-gnome.desktop</id>
<metadata_license>CC-BY-SA-3.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<name>Jami</name>
......
......@@ -4,7 +4,7 @@ GenericName=Jami
Comment[hu]=A Jami egy biztonságos és elosztott csevegőprogram
Comment[ru]=Jami — приложение для защищённой связи с распределённой архитектурой
Comment=Jami is a secured and distributed communication software
Exec=gnome-ring %u
Exec=jami-gnome %u
Icon=jami
StartupNotify=true
Terminal=false
......
......@@ -4,7 +4,7 @@ GenericName=Jami
Comment[hu]=A Jami egy biztonságos és elosztott csevegőprogram
Comment[ru]=Jami — приложение для защищённой связи с распределённой архитектурой
Comment=Jami is a secured and distributed communication software
Exec=gnome-ring --restore-last-window-state
Exec=jami-gnome --restore-last-window-state
Icon=jami
StartupNotify=true
Terminal=false
......
......@@ -8,11 +8,11 @@
#define USE_LIBNM @USE_LIBNM@
#define USE_CANBERRA @USE_CANBERRA@
#define RING_CLIENT_APP_ID "cx.ring.RingGnome"
#define RING_CLIENT_APP_ID "net.jami.client.gnome"
#define RING_CLIENT_INSTALL "@RING_INSTALL_PREFIX@"
#define RING_DATA_DIR "/share/gnome-ring"
#define JAMI_DATA_DIR "/share/jami-gnome"
#define PACKAGE_NAME "@PROJECT_NAME@"
#define LOCALEDIR "@RING_INSTALL_PREFIX@/share/locale"
#define SOUNDSDIR "@RING_INSTALL_PREFIX@/share/sounds/gnome-ring"
#define SOUNDSDIR "@RING_INSTALL_PREFIX@/share/sounds/jami-gnome"
......@@ -26,11 +26,11 @@ if type "ring-kde" > /dev/null 2> /dev/null; then
HAS_KDE=1
fi
if type "gnome-ring" > /dev/null 2> /dev/null; then
if type "jami-gnome" > /dev/null 2> /dev/null; then
HAS_GNOME=1
fi
# No clients installd
# No clients installed
if [ $HAS_KDE == "0" ] && [ $HAS_GNOME == "0" ]; then
echo "Jami not found" >&2
exit 1
......@@ -41,14 +41,14 @@ if [ $HAS_KDE == "1" ] && [ $HAS_GNOME == "0" ]; then
ring-kde $*
exit $?
elif [ $HAS_KDE == "0" ] && [ $HAS_GNOME == "1" ]; then
gnome-ring $*
jami-gnome $*
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
gnome-ring $*
jami-gnome $*
exit $?
else
ring-kde $*
......
......@@ -29,13 +29,13 @@
void
autostart_symlink(gboolean autostart)
{
/* autostart is enabled by creating a symlink to gnome-ring.desktop in
/* autostart is enabled by creating a symlink to jami-gnome.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/gnome-ring.desktop", NULL);
gchar *autostart_path = g_strconcat(g_get_user_config_dir(), "/autostart/jami-gnome.desktop", NULL);
if (autostart) {
g_debug("enabling autostart");
......@@ -53,9 +53,9 @@ autostart_symlink(gboolean autostart)
*/
int num_paths = 3;
gchar *desktop_paths[num_paths];
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);
desktop_paths[0] = g_strconcat("/usr", JAMI_DATA_DIR, "/jami-gnome.desktop", NULL);
desktop_paths[1] = g_strconcat("/usr/local", JAMI_DATA_DIR, "/jami-gnome.desktop", NULL);
desktop_paths[2] = g_strconcat(RING_CLIENT_INSTALL, JAMI_DATA_DIR, "/jami-gnome.desktop", NULL);
for (int i = 0; i < num_paths && !desktop_path; ++i) {
g_debug("checking %s", desktop_paths[i]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment