From 43e448a6ee9dd41d2012326850ce82235ff0030b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 11 Dec 2018 14:00:09 -0500
Subject: [PATCH] systray: change icon to jami
Change-Id: I7524c041d1cd70310b9b4408017332abfd381a8f
Gitlab: #940
---
gnome-ring.desktop | 1 +
gnome-ring.desktop.autostart | 1 +
src/ring_client.cpp | 27 +++++++++++++++++----------
3 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/gnome-ring.desktop b/gnome-ring.desktop
index 0a9f5ba1..d7a9c768 100644
--- a/gnome-ring.desktop
+++ b/gnome-ring.desktop
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=Jami
+GenericName=Jami
Comment=Jami is a secured and distributed communication software.
Exec=gnome-ring %u
Icon=jami
diff --git a/gnome-ring.desktop.autostart b/gnome-ring.desktop.autostart
index 02fbcdd4..46dfc858 100644
--- a/gnome-ring.desktop.autostart
+++ b/gnome-ring.desktop.autostart
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=Jami
+GenericName=Jami
Comment=Jami is a secured and distributed communication software.
Exec=gnome-ring --restore-last-window-state
Icon=jami
diff --git a/src/ring_client.cpp b/src/ring_client.cpp
index a4d27b52..600a4da3 100644
--- a/src/ring_client.cpp
+++ b/src/ring_client.cpp
@@ -277,9 +277,9 @@ init_systray(RingClient *client)
if (g_strcmp0("Unity", desktop) == 0 || g_strcmp0("KDE", desktop) == 0) {
use_appinidcator = TRUE;
- auto indicator = app_indicator_new("ring", "ring", APP_INDICATOR_CATEGORY_COMMUNICATIONS);
+ auto indicator = app_indicator_new("jami", "jami", APP_INDICATOR_CATEGORY_COMMUNICATIONS);
app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE);
- app_indicator_set_title(indicator, "ring");
+ app_indicator_set_title(indicator, "jami");
/* app indicator requires a menu */
app_indicator_set_menu(indicator, GTK_MENU(priv->icon_menu));
priv->systray_icon = indicator;
@@ -287,14 +287,21 @@ init_systray(RingClient *client)
#endif
if (!use_appinidcator) {
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS // GtkStatusIcon is deprecated since 3.14, but we fallback on it
- auto status_icon = gtk_status_icon_new_from_icon_name("ring");
- gtk_status_icon_set_title(status_icon, "ring");
-G_GNUC_END_IGNORE_DEPRECATIONS
- g_signal_connect_swapped(status_icon, "activate", G_CALLBACK(ring_window_show), client);
- g_signal_connect(status_icon, "popup-menu", G_CALLBACK(popup_menu), client);
-
- priv->systray_icon = status_icon;
+ GError *error = NULL;
+ GdkPixbuf* icon = gdk_pixbuf_new_from_resource("/cx/jami/JamiGnome/jami-symbol-blue", &error);
+ if (icon == nullptr) {
+ g_debug("Could not load icon: %s", error->message);
+ g_clear_error(&error);
+ } 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");
+ G_GNUC_END_IGNORE_DEPRECATIONS
+ g_signal_connect_swapped(status_icon, "activate", G_CALLBACK(ring_window_show), client);
+ g_signal_connect(status_icon, "popup-menu", G_CALLBACK(popup_menu), client);
+ priv->systray_icon = status_icon;
+ }
+
}
}
--
GitLab