telephony-service

Merge lp:~laney/telephony-service/humanity-not-gnome into lp:telephony-service/rtm-15.04

  1. humanity-not-gnome
  2. Merge into rtm-15.04
Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 1010
Merged at revision: 1098
Proposed branch: lp:~laney/telephony-service/humanity-not-gnome
Merge into: lp:telephony-service/rtm-15.04
Diff against target: 31 lines (+5/-4)
2 files modified
debian/telephony-service.install (+3/-3)
indicator/icons/CMakeLists.txt (+2/-1)
To merge this branch: bzr merge lp:~laney/telephony-service/humanity-not-gnome
Reviewer Review Type Date Requested Status
Dmitry Shachnev Pending
Gustavo Pichorim Boiko Pending
Review via email: mp+263927@code.launchpad.net

This proposal supersedes a proposal from 2015-01-30.

Commit message

We don't inherit from the 'gnome' icon theme any more, so our icons weren't being found in a default Unity session using ubuntu-mono-dark. We do, however, inherit from Humanity, so put the icons under this theme.

Description of the change

This probably only makes sense with https://code.launchpad.net/~laney/notify-osd-icons/humanity-not-gnome/+merge/248127

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote : Posted in a previous version of this proposal

Not tested, but LGTM

review: Approve
Revision history for this message
Iain Lane (laney) wrote : Posted in a previous version of this proposal

Can someone from the telephony team look at this?

Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote : Posted in a previous version of this proposal

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/telephony-service.install'
2--- debian/telephony-service.install 2015-06-11 13:32:01 +0000
3+++ debian/telephony-service.install 2015-07-06 16:10:28 +0000
4@@ -8,9 +8,9 @@
5 usr/share/icons/ubuntu-mono-dark/status/*/indicator-call.svg
6 usr/share/icons/ubuntu-mono-light/status/*/indicator-call.svg
7 usr/share/locale/*/LC_MESSAGES/telephony-service.mo
8-usr/share/notify-osd/icons/gnome/scalable/status/notification-group-call.svg
9-usr/share/notify-osd/icons/gnome/scalable/status/notification-unavailable-image-call.svg
10-usr/share/notify-osd/icons/gnome/scalable/status/notification-unknown-call.svg
11+usr/share/notify-osd/icons/Humanity/scalable/status/notification-group-call.svg
12+usr/share/notify-osd/icons/Humanity/scalable/status/notification-unavailable-image-call.svg
13+usr/share/notify-osd/icons/Humanity/scalable/status/notification-unknown-call.svg
14 usr/share/polkit-1/actions/*TelephonyService*.policy
15 usr/share/telepathy/clients/TelephonyService*.client
16 usr/share/telephony-service/assets/*
17
18=== modified file 'indicator/icons/CMakeLists.txt'
19--- indicator/icons/CMakeLists.txt 2012-07-20 14:14:47 +0000
20+++ indicator/icons/CMakeLists.txt 2015-07-06 16:10:28 +0000
21@@ -1,3 +1,4 @@
22+set (icon-theme Humanity)
23
24 set(icons
25 notification-group-call.svg
26@@ -5,4 +6,4 @@
27 notification-unknown-call.svg
28 )
29
30-install(FILES ${icons} DESTINATION share/notify-osd/icons/gnome/scalable/status)
31+install(FILES ${icons} DESTINATION share/notify-osd/icons/${icon-theme}/scalable/status)

Subscribers

People subscribed via source and target branches

to all changes: