Commit 76179eb5 authored by Amin Bandali's avatar Amin Bandali Committed by Sébastien Blin

pixmaps: rename jami.svg to jami-gnome.svg

This is to eliminate file name conflicts with jami-qt, so that the two
clients could be present at the same time without any conflicts.  Also
update the name string in the desktop files to help users
differentiate between the two clients in launcher menus and so on.

Change-Id: I502f4e0651ebd502ce01e1b8412f22451feba0df
parent 181627cc
......@@ -455,7 +455,7 @@ INSTALL(FILES ${PROJECT_SOURCE_DIR}/jami-gnome.desktop.autostart
jami-gnome.desktop
)
INSTALL(FILES pixmaps/jami.svg
INSTALL(FILES pixmaps/jami-gnome.svg
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
)
......
......@@ -4,9 +4,9 @@
<id>net.jami.Jami</id>
<metadata_license>CC-BY-SA-3.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<name>Jami</name>
<name>Jami (GNOME client)</name>
<summary>Privacy-oriented voice, video, chat, and conference platform</summary>
<icon type="stock">jami</icon>
<icon type="stock">jami-gnome</icon>
<description>
<p>
An end-to-end encrypted secure and distributed voice, video, and
......
[Desktop Entry]
Name=Jami
GenericName=Jami
Name=Jami (GNOME client)
GenericName=Jami (GNOME client)
Comment[hu]=A Jami egy biztonságos és elosztott csevegőprogram
Comment[ru]=Jami — приложение для защищённой связи с распределённой архитектурой
Comment=Jami is a secured and distributed communication software
Exec=jami-gnome %u
Icon=jami
Icon=jami-gnome
StartupNotify=true
Terminal=false
Type=Application
......
[Desktop Entry]
Name=Jami
GenericName=Jami
Name=Jami (GNOME client)
GenericName=Jami (GNOME client)
Comment[hu]=A Jami egy biztonságos és elosztott csevegőprogram
Comment[ru]=Jami — приложение для защищённой связи с распределённой архитектурой
Comment=Jami is a secured and distributed communication software
Exec=jami-gnome --restore-last-window-state
Icon=jami
Icon=jami-gnome
StartupNotify=true
Terminal=false
Type=Application
......
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/net/jami/JamiGnome">
<file alias="jami-symbol-blue">jami.svg</file>
<file alias="jami-symbol-blue">jami-gnome.svg</file>
<file alias="jami-logo-blue">LOGO_JAMI_201106.svg</file>
<file alias="jami-logo-white">LOGO_JAMI_201106_white.svg</file>
<file alias="addressbook_small">addressbook.svg</file>
......
......@@ -405,7 +405,7 @@ init_systray(Client *client)
}
#if HAVE_APPINDICATOR
auto indicator = app_indicator_new("jami", "jami", APP_INDICATOR_CATEGORY_COMMUNICATIONS);
auto indicator = app_indicator_new("jami-gnome", "jami-gnome", APP_INDICATOR_CATEGORY_COMMUNICATIONS);
app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE);
app_indicator_set_title(indicator, JAMI_CLIENT_NAME);
/* app indicator requires a menu */
......@@ -420,7 +420,7 @@ init_systray(Client *client)
} else {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS // GtkStatusIcon is deprecated since 3.14, but we fallback on it
auto status_icon = gtk_status_icon_new_from_pixbuf(icon);
gtk_status_icon_set_title(status_icon, "jami");
gtk_status_icon_set_title(status_icon, "jami-gnome");
G_GNUC_END_IGNORE_DEPRECATIONS
g_signal_connect_swapped(status_icon, "activate", G_CALLBACK(window_show), client);
g_signal_connect(status_icon, "popup-menu", G_CALLBACK(popup_menu), client);
......
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