Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
J
jami-client-gnome
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-gnome
Commits
43e448a6
Unverified
Commit
43e448a6
authored
6 years ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
systray: change icon to jami
Change-Id: I7524c041d1cd70310b9b4408017332abfd381a8f Gitlab:
#940
parent
3ae5317f
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
gnome-ring.desktop
+1
-0
1 addition, 0 deletions
gnome-ring.desktop
gnome-ring.desktop.autostart
+1
-0
1 addition, 0 deletions
gnome-ring.desktop.autostart
src/ring_client.cpp
+17
-10
17 additions, 10 deletions
src/ring_client.cpp
with
19 additions
and
10 deletions
gnome-ring.desktop
+
1
−
0
View file @
43e448a6
[Desktop Entry]
Name=Jami
GenericName=Jami
Comment=Jami is a secured and distributed communication software.
Exec=gnome-ring %u
Icon=jami
...
...
This diff is collapsed.
Click to expand it.
gnome-ring.desktop.autostart
+
1
−
0
View file @
43e448a6
[Desktop Entry]
Name=Jami
GenericName=Jami
Comment=Jami is a secured and distributed communication software.
Exec=gnome-ring --restore-last-window-state
Icon=jami
...
...
This diff is collapsed.
Click to expand it.
src/ring_client.cpp
+
17
−
10
View file @
43e448a6
...
...
@@ -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,15 +287,22 @@ init_systray(RingClient *client)
#endif
if
(
!
use_appinidcator
)
{
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_
icon_name
(
"ring"
);
gtk_status_icon_set_title
(
status_icon
,
"
ring
"
);
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
;
}
}
}
static
void
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment