Merge lp:~ken-vandine/empathy/no_unity_no_uoa into lp:~ubuntu-desktop/empathy/ubuntu
- no_unity_no_uoa
- Merge into ubuntu
Proposed by
Ken VanDine
Status: | Merged |
---|---|
Merged at revision: | 396 |
Proposed branch: | lp:~ken-vandine/empathy/no_unity_no_uoa |
Merge into: | lp:~ubuntu-desktop/empathy/ubuntu |
Diff against target: |
1251 lines (+71/-1003) 28 files modified
debian/account-plugin-aim.install (+0/-2) debian/account-plugin-gadugadu.install (+0/-2) debian/account-plugin-groupwise.install (+0/-2) debian/account-plugin-icq.install (+0/-2) debian/account-plugin-irc.install (+0/-2) debian/account-plugin-jabber.install (+0/-2) debian/account-plugin-mxit.install (+0/-2) debian/account-plugin-myspace.install (+0/-2) debian/account-plugin-salut.install (+0/-2) debian/account-plugin-sametime.install (+0/-2) debian/account-plugin-sip.install (+0/-2) debian/account-plugin-yahoo.install (+0/-2) debian/account-plugin-yahoojp.install (+0/-2) debian/account-plugin-zephyr.install (+0/-2) debian/changelog (+20/-0) debian/compat (+1/-1) debian/control (+46/-305) debian/empathy.install (+1/-1) debian/mcp-account-manager-goa.install (+0/-1) debian/mcp-account-manager-uoa.install (+0/-4) debian/patches/10_use_notify_osd_icons.patch (+0/-48) debian/patches/23_idomessagedialog_for_voip_and_ft.patch (+0/-203) debian/patches/41_unity_launcher_progress.patch (+0/-251) debian/patches/43_quicklists.patch (+0/-29) debian/patches/series (+0/-5) debian/patches/ubuntu_launch_uoa_panel.patch (+0/-76) debian/rules (+1/-49) debian/shlibs.local (+2/-2) |
To merge this branch: | bzr merge lp:~ken-vandine/empathy/no_unity_no_uoa |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Desktop | Pending | ||
Review via email: mp+323384@code.launchpad.net |
Commit message
Description of the change
Dropped patches used for unity and UOA integration. Also dropped all the UOA related packages.
To post a comment you must log in.
- 393. By Ken VanDine
-
New upstream release
- 394. By Ken VanDine
-
bumped shlibs
- 395. By Ken VanDine
-
added Provides for the packages we are removing
- 396. By Ken VanDine
-
* debian/compat
- bumped to 9
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed file 'debian/account-plugin-aim.install' | |||
2 | --- debian/account-plugin-aim.install 2013-05-31 10:25:14 +0000 | |||
3 | +++ debian/account-plugin-aim.install 1970-01-01 00:00:00 +0000 | |||
4 | @@ -1,2 +0,0 @@ | |||
5 | 1 | usr/share/accounts/providers/aim.provider | ||
6 | 2 | usr/share/accounts/services/aim-im.service | ||
7 | 3 | 0 | ||
8 | === removed file 'debian/account-plugin-gadugadu.install' | |||
9 | --- debian/account-plugin-gadugadu.install 2013-05-31 10:25:14 +0000 | |||
10 | +++ debian/account-plugin-gadugadu.install 1970-01-01 00:00:00 +0000 | |||
11 | @@ -1,2 +0,0 @@ | |||
12 | 1 | usr/share/accounts/providers/gadugadu.provider | ||
13 | 2 | usr/share/accounts/services/gadugadu-im.service | ||
14 | 3 | 0 | ||
15 | === removed file 'debian/account-plugin-groupwise.install' | |||
16 | --- debian/account-plugin-groupwise.install 2013-05-31 10:25:14 +0000 | |||
17 | +++ debian/account-plugin-groupwise.install 1970-01-01 00:00:00 +0000 | |||
18 | @@ -1,2 +0,0 @@ | |||
19 | 1 | usr/share/accounts/providers/groupwise.provider | ||
20 | 2 | usr/share/accounts/services/groupwise-im.service | ||
21 | 3 | 0 | ||
22 | === removed file 'debian/account-plugin-icq.install' | |||
23 | --- debian/account-plugin-icq.install 2013-05-31 10:25:14 +0000 | |||
24 | +++ debian/account-plugin-icq.install 1970-01-01 00:00:00 +0000 | |||
25 | @@ -1,2 +0,0 @@ | |||
26 | 1 | usr/share/accounts/providers/icq.provider | ||
27 | 2 | usr/share/accounts/services/icq-im.service | ||
28 | 3 | 0 | ||
29 | === removed file 'debian/account-plugin-irc.install' | |||
30 | --- debian/account-plugin-irc.install 2013-05-31 10:25:14 +0000 | |||
31 | +++ debian/account-plugin-irc.install 1970-01-01 00:00:00 +0000 | |||
32 | @@ -1,2 +0,0 @@ | |||
33 | 1 | usr/share/accounts/providers/irc.provider | ||
34 | 2 | usr/share/accounts/services/irc-im.service | ||
35 | 3 | 0 | ||
36 | === removed file 'debian/account-plugin-jabber.install' | |||
37 | --- debian/account-plugin-jabber.install 2013-05-31 10:25:14 +0000 | |||
38 | +++ debian/account-plugin-jabber.install 1970-01-01 00:00:00 +0000 | |||
39 | @@ -1,2 +0,0 @@ | |||
40 | 1 | usr/share/accounts/providers/jabber.provider | ||
41 | 2 | usr/share/accounts/services/jabber-im.service | ||
42 | 3 | 0 | ||
43 | === removed file 'debian/account-plugin-mxit.install' | |||
44 | --- debian/account-plugin-mxit.install 2013-05-31 10:25:14 +0000 | |||
45 | +++ debian/account-plugin-mxit.install 1970-01-01 00:00:00 +0000 | |||
46 | @@ -1,2 +0,0 @@ | |||
47 | 1 | usr/share/accounts/providers/mxit.provider | ||
48 | 2 | usr/share/accounts/services/mxit-im.service | ||
49 | 3 | 0 | ||
50 | === removed file 'debian/account-plugin-myspace.install' | |||
51 | --- debian/account-plugin-myspace.install 2013-05-31 10:25:14 +0000 | |||
52 | +++ debian/account-plugin-myspace.install 1970-01-01 00:00:00 +0000 | |||
53 | @@ -1,2 +0,0 @@ | |||
54 | 1 | usr/share/accounts/providers/myspace.provider | ||
55 | 2 | usr/share/accounts/services/myspace-im.service | ||
56 | 3 | 0 | ||
57 | === removed file 'debian/account-plugin-salut.install' | |||
58 | --- debian/account-plugin-salut.install 2013-05-31 10:25:14 +0000 | |||
59 | +++ debian/account-plugin-salut.install 1970-01-01 00:00:00 +0000 | |||
60 | @@ -1,2 +0,0 @@ | |||
61 | 1 | usr/share/accounts/providers/local-xmpp.provider | ||
62 | 2 | usr/share/accounts/services/local-xmpp-im.service | ||
63 | 3 | 0 | ||
64 | === removed file 'debian/account-plugin-sametime.install' | |||
65 | --- debian/account-plugin-sametime.install 2013-05-31 10:25:14 +0000 | |||
66 | +++ debian/account-plugin-sametime.install 1970-01-01 00:00:00 +0000 | |||
67 | @@ -1,2 +0,0 @@ | |||
68 | 1 | usr/share/accounts/providers/sametime.provider | ||
69 | 2 | usr/share/accounts/services/sametime-im.service | ||
70 | 3 | 0 | ||
71 | === removed file 'debian/account-plugin-sip.install' | |||
72 | --- debian/account-plugin-sip.install 2013-05-31 10:25:14 +0000 | |||
73 | +++ debian/account-plugin-sip.install 1970-01-01 00:00:00 +0000 | |||
74 | @@ -1,2 +0,0 @@ | |||
75 | 1 | usr/share/accounts/providers/sip.provider | ||
76 | 2 | usr/share/accounts/services/sip-im.service | ||
77 | 3 | 0 | ||
78 | === removed file 'debian/account-plugin-yahoo.install' | |||
79 | --- debian/account-plugin-yahoo.install 2013-05-31 10:25:14 +0000 | |||
80 | +++ debian/account-plugin-yahoo.install 1970-01-01 00:00:00 +0000 | |||
81 | @@ -1,2 +0,0 @@ | |||
82 | 1 | usr/share/accounts/providers/yahoo.provider | ||
83 | 2 | usr/share/accounts/services/yahoo-im.service | ||
84 | 3 | 0 | ||
85 | === removed file 'debian/account-plugin-yahoojp.install' | |||
86 | --- debian/account-plugin-yahoojp.install 2013-05-31 10:25:14 +0000 | |||
87 | +++ debian/account-plugin-yahoojp.install 1970-01-01 00:00:00 +0000 | |||
88 | @@ -1,2 +0,0 @@ | |||
89 | 1 | usr/share/accounts/providers/yahoojp.provider | ||
90 | 2 | usr/share/accounts/services/yahoojp-im.service | ||
91 | 3 | 0 | ||
92 | === removed file 'debian/account-plugin-zephyr.install' | |||
93 | --- debian/account-plugin-zephyr.install 2013-05-31 10:25:14 +0000 | |||
94 | +++ debian/account-plugin-zephyr.install 1970-01-01 00:00:00 +0000 | |||
95 | @@ -1,2 +0,0 @@ | |||
96 | 1 | usr/share/accounts/providers/zephyr.provider | ||
97 | 2 | usr/share/accounts/services/zephyr-im.service | ||
98 | 3 | 0 | ||
99 | === modified file 'debian/changelog' | |||
100 | --- debian/changelog 2016-09-29 14:23:36 +0000 | |||
101 | +++ debian/changelog 2017-05-02 18:19:56 +0000 | |||
102 | @@ -1,3 +1,23 @@ | |||
103 | 1 | empathy (3.12.13-0ubuntu1) UNRELEASED; urgency=medium | ||
104 | 2 | |||
105 | 3 | * New upstream release | ||
106 | 4 | * Dropped unity related patches | ||
107 | 5 | -debian/patches/23_idomessagedialog_for_voip_and_ft.patch | ||
108 | 6 | -debian/patches/41_unity_launcher_progress.patch | ||
109 | 7 | -debian/patches/43_quicklists.patch | ||
110 | 8 | * Dropped UOA patch | ||
111 | 9 | -debian/patches/ubuntu_launch_uoa_panel.patch | ||
112 | 10 | * Dropped notify-osd icons patch | ||
113 | 11 | -debian/patches/10_use_notify_osd_icons.patch | ||
114 | 12 | * debian/control | ||
115 | 13 | - Removed account-plugin-*, and other UOA related packages. Include GOA | ||
116 | 14 | plugin in the empathy package as there's no benefit to splitting it out | ||
117 | 15 | without UOA | ||
118 | 16 | * debian/compat | ||
119 | 17 | - bumped to 9 | ||
120 | 18 | |||
121 | 19 | -- Ken VanDine <ken.vandine@canonical.com> Thu, 27 Apr 2017 14:40:30 -0400 | ||
122 | 20 | |||
123 | 1 | empathy (3.12.12-3ubuntu1) yakkety; urgency=medium | 21 | empathy (3.12.12-3ubuntu1) yakkety; urgency=medium |
124 | 2 | 22 | ||
125 | 3 | * Merge with Debian. Remaining changes: | 23 | * Merge with Debian. Remaining changes: |
126 | 4 | 24 | ||
127 | === modified file 'debian/compat' | |||
128 | --- debian/compat 2014-11-17 16:41:01 +0000 | |||
129 | +++ debian/compat 2017-05-02 18:19:56 +0000 | |||
130 | @@ -1,1 +1,1 @@ | |||
132 | 1 | 8 | 1 | 9 |
133 | 2 | 2 | ||
134 | === modified file 'debian/control' | |||
135 | --- debian/control 2016-09-29 14:23:30 +0000 | |||
136 | +++ debian/control 2017-05-02 18:19:56 +0000 | |||
137 | @@ -47,11 +47,6 @@ | |||
138 | 47 | libgoa-1.0-dev (>= 3.8), | 47 | libgoa-1.0-dev (>= 3.8), |
139 | 48 | libchamplain-gtk-0.12-dev (>= 0.12.1), | 48 | libchamplain-gtk-0.12-dev (>= 0.12.1), |
140 | 49 | libsecret-1-dev, | 49 | libsecret-1-dev, |
141 | 50 | libido3-0.1-dev (>= 0.2.90), | ||
142 | 51 | libaccount-plugin-1.0-dev, | ||
143 | 52 | libsignon-glib-dev (>= 1.8), | ||
144 | 53 | libaccounts-glib-dev (>= 1.1), | ||
145 | 54 | libunity-dev (>= 5.0.0) | ||
146 | 55 | Standards-Version: 3.9.8 | 50 | Standards-Version: 3.9.8 |
147 | 56 | Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/empathy/ubuntu | 51 | Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/empathy/ubuntu |
148 | 57 | Homepage: https://wiki.gnome.org/Apps/Empathy | 52 | Homepage: https://wiki.gnome.org/Apps/Empathy |
149 | @@ -73,10 +68,54 @@ | |||
150 | 73 | gvfs-backends, | 68 | gvfs-backends, |
151 | 74 | sound-theme-freedesktop, | 69 | sound-theme-freedesktop, |
152 | 75 | gnome-contacts, | 70 | gnome-contacts, |
153 | 76 | mcp-account-manager-uoa | mcp-account-manager-goa, | ||
154 | 77 | Suggests: vino, | 71 | Suggests: vino, |
155 | 78 | telepathy-idle | 72 | telepathy-idle |
157 | 79 | Replaces: libempathy-gtk-common | 73 | Breaks: account-plugin-gadugadu (<< 3.12.12-3ubuntu2), |
158 | 74 | account-plugin-groupwise (<< 3.12.12-3ubuntu2), | ||
159 | 75 | account-plugin-icq (<< 3.12.12-3ubuntu2), | ||
160 | 76 | account-plugin-irc (<< 3.12.12-3ubuntu2), | ||
161 | 77 | account-plugin-jabber (<< 3.12.12-3ubuntu2), | ||
162 | 78 | account-plugin-mxit (<< 3.12.12-3ubuntu2), | ||
163 | 79 | account-plugin-myspace (<< 3.12.12-3ubuntu2), | ||
164 | 80 | account-plugin-salut (<< 3.12.12-3ubuntu2), | ||
165 | 81 | account-plugin-sametime (<< 3.12.12-3ubuntu2), | ||
166 | 82 | account-plugin-sip (<< 3.12.12-3ubuntu2), | ||
167 | 83 | account-plugin-yahoo (<< 3.12.12-3ubuntu2), | ||
168 | 84 | account-plugin-yahoojp (<< 3.12.12-3ubuntu2), | ||
169 | 85 | account-plugin-zephyr (<< 3.12.12-3ubuntu2), | ||
170 | 86 | mcp-account-manager-goa (<< 3.12.12-3ubuntu2), | ||
171 | 87 | mcp-account-manager-uoa (<< 3.12.12-3ubuntu2), | ||
172 | 88 | Replaces: account-plugin-gadugadu (<< 3.12.12-3ubuntu2), | ||
173 | 89 | account-plugin-groupwise (<< 3.12.12-3ubuntu2), | ||
174 | 90 | account-plugin-icq (<< 3.12.12-3ubuntu2), | ||
175 | 91 | account-plugin-irc (<< 3.12.12-3ubuntu2), | ||
176 | 92 | account-plugin-jabber (<< 3.12.12-3ubuntu2), | ||
177 | 93 | account-plugin-mxit (<< 3.12.12-3ubuntu2), | ||
178 | 94 | account-plugin-myspace (<< 3.12.12-3ubuntu2), | ||
179 | 95 | account-plugin-salut (<< 3.12.12-3ubuntu2), | ||
180 | 96 | account-plugin-sametime (<< 3.12.12-3ubuntu2), | ||
181 | 97 | account-plugin-sip (<< 3.12.12-3ubuntu2), | ||
182 | 98 | account-plugin-yahoo (<< 3.12.12-3ubuntu2), | ||
183 | 99 | account-plugin-yahoojp (<< 3.12.12-3ubuntu2), | ||
184 | 100 | account-plugin-zephyr (<< 3.12.12-3ubuntu2), | ||
185 | 101 | libempathy-gtk-common, | ||
186 | 102 | mcp-account-manager-goa (<< 3.12.12-3ubuntu2), | ||
187 | 103 | mcp-account-manager-uoa (<< 3.12.12-3ubuntu2), | ||
188 | 104 | Provides: account-plugin-gadugadu, | ||
189 | 105 | account-plugin-groupwise, | ||
190 | 106 | account-plugin-icq, | ||
191 | 107 | account-plugin-irc, | ||
192 | 108 | account-plugin-jabber, | ||
193 | 109 | account-plugin-mxit, | ||
194 | 110 | account-plugin-myspace, | ||
195 | 111 | account-plugin-salut, | ||
196 | 112 | account-plugin-sametime, | ||
197 | 113 | account-plugin-sip, | ||
198 | 114 | account-plugin-yahoo, | ||
199 | 115 | account-plugin-yahoojp, | ||
200 | 116 | account-plugin-zephyr, | ||
201 | 117 | mcp-account-manager-goa, | ||
202 | 118 | mcp-account-manager-uoa, | ||
203 | 80 | Description: GNOME multi-protocol chat and call client | 119 | Description: GNOME multi-protocol chat and call client |
204 | 81 | Instant messaging program supporting text, voice, video, file transfers | 120 | Instant messaging program supporting text, voice, video, file transfers |
205 | 82 | and inter-application communication over many different protocols, | 121 | and inter-application communication over many different protocols, |
206 | @@ -100,301 +139,3 @@ | |||
207 | 100 | . | 139 | . |
208 | 101 | This package contains the architecture independent files for Empathy | 140 | This package contains the architecture independent files for Empathy |
209 | 102 | IM application. | 141 | IM application. |
210 | 103 | |||
211 | 104 | Package: mcp-account-manager-goa | ||
212 | 105 | Architecture: any | ||
213 | 106 | Depends: ${shlibs:Depends}, | ||
214 | 107 | ${misc:Depends}, | ||
215 | 108 | empathy (= ${binary:Version}) | ||
216 | 109 | Description: GNOME multi-protocol chat and call client (GOA plugin) | ||
217 | 110 | Instant messaging program supporting text, voice, video, file transfers | ||
218 | 111 | and inter-application communication over many different protocols, | ||
219 | 112 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
220 | 113 | Groupwise and ICQ. | ||
221 | 114 | . | ||
222 | 115 | This package contains GNOME Online Accounts plugin for Mission Control. | ||
223 | 116 | |||
224 | 117 | Package: mcp-account-manager-uoa | ||
225 | 118 | Architecture: any | ||
226 | 119 | Depends: ${shlibs:Depends}, | ||
227 | 120 | ${misc:Depends}, | ||
228 | 121 | empathy (= ${binary:Version}), | ||
229 | 122 | signon-plugin-password, | ||
230 | 123 | telepathy-mission-control-5 (>= 1:5.13.0-0ubuntu3) | ||
231 | 124 | Recommends: ubuntu-control-center-signon, | ||
232 | 125 | account-plugin-aim, | ||
233 | 126 | account-plugin-jabber, | ||
234 | 127 | account-plugin-google, | ||
235 | 128 | account-plugin-yahoo, | ||
236 | 129 | account-plugin-salut | ||
237 | 130 | Suggests: account-plugin-gadugadu, | ||
238 | 131 | account-plugin-groupwise, | ||
239 | 132 | account-plugin-icq, | ||
240 | 133 | account-plugin-irc, | ||
241 | 134 | account-plugin-mxit, | ||
242 | 135 | account-plugin-myspace, | ||
243 | 136 | account-plugin-sametime, | ||
244 | 137 | account-plugin-sip, | ||
245 | 138 | account-plugin-yahoojp, | ||
246 | 139 | account-plugin-zephyr | ||
247 | 140 | Breaks: account-plugin-empathy | ||
248 | 141 | Replaces: account-plugin-empathy | ||
249 | 142 | Description: GNOME multi-protocol chat and call client (UOA plugin) | ||
250 | 143 | Instant messaging program supporting text, voice, video, file transfers | ||
251 | 144 | and inter-application communication over many different protocols, | ||
252 | 145 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
253 | 146 | Groupwise and ICQ. | ||
254 | 147 | . | ||
255 | 148 | This package contains Ubuntu Online Accounts plugin for Mission Control. | ||
256 | 149 | |||
257 | 150 | Package: account-plugin-aim | ||
258 | 151 | Architecture: any | ||
259 | 152 | Depends: ${shlibs:Depends}, | ||
260 | 153 | ${misc:Depends}, | ||
261 | 154 | empathy (= ${binary:Version}), | ||
262 | 155 | telepathy-haze, | ||
263 | 156 | mcp-account-manager-uoa, | ||
264 | 157 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
265 | 158 | Breaks: account-plugin-empathy | ||
266 | 159 | Replaces: account-plugin-empathy | ||
267 | 160 | Description: Messaging account plugin for AIM | ||
268 | 161 | Instant messaging program supporting text, voice, video, file transfers | ||
269 | 162 | and inter-application communication over many different protocols, | ||
270 | 163 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
271 | 164 | Groupwise and ICQ. | ||
272 | 165 | . | ||
273 | 166 | This package contains UOA account plugins for the Empathy IM application. | ||
274 | 167 | |||
275 | 168 | Package: account-plugin-gadugadu | ||
276 | 169 | Architecture: any | ||
277 | 170 | Depends: ${shlibs:Depends}, | ||
278 | 171 | ${misc:Depends}, | ||
279 | 172 | empathy (= ${binary:Version}), | ||
280 | 173 | telepathy-haze, | ||
281 | 174 | mcp-account-manager-uoa, | ||
282 | 175 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
283 | 176 | Breaks: account-plugin-empathy | ||
284 | 177 | Replaces: account-plugin-empathy | ||
285 | 178 | Description: Messaging account plugin for GaduGadu | ||
286 | 179 | Instant messaging program supporting text, voice, video, file transfers | ||
287 | 180 | and inter-application communication over many different protocols, | ||
288 | 181 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
289 | 182 | Groupwise and ICQ. | ||
290 | 183 | . | ||
291 | 184 | This package contains UOA account plugins for the Empathy IM application. | ||
292 | 185 | |||
293 | 186 | Package: account-plugin-groupwise | ||
294 | 187 | Architecture: any | ||
295 | 188 | Depends: ${shlibs:Depends}, | ||
296 | 189 | ${misc:Depends}, | ||
297 | 190 | empathy (= ${binary:Version}), | ||
298 | 191 | telepathy-haze, | ||
299 | 192 | mcp-account-manager-uoa, | ||
300 | 193 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
301 | 194 | Breaks: account-plugin-empathy | ||
302 | 195 | Replaces: account-plugin-empathy | ||
303 | 196 | Description: Messaging account plugin for Groupwise | ||
304 | 197 | Instant messaging program supporting text, voice, video, file transfers | ||
305 | 198 | and inter-application communication over many different protocols, | ||
306 | 199 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
307 | 200 | Groupwise and ICQ. | ||
308 | 201 | . | ||
309 | 202 | This package contains UOA account plugins for the Empathy IM application. | ||
310 | 203 | |||
311 | 204 | Package: account-plugin-icq | ||
312 | 205 | Architecture: any | ||
313 | 206 | Depends: ${shlibs:Depends}, | ||
314 | 207 | ${misc:Depends}, | ||
315 | 208 | empathy (= ${binary:Version}), | ||
316 | 209 | telepathy-haze, | ||
317 | 210 | mcp-account-manager-uoa, | ||
318 | 211 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
319 | 212 | Breaks: account-plugin-empathy | ||
320 | 213 | Replaces: account-plugin-empathy | ||
321 | 214 | Description: Messaging account plugin for ICQ | ||
322 | 215 | Instant messaging program supporting text, voice, video, file transfers | ||
323 | 216 | and inter-application communication over many different protocols, | ||
324 | 217 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
325 | 218 | Groupwise and ICQ. | ||
326 | 219 | . | ||
327 | 220 | This package contains UOA account plugins for the Empathy IM application. | ||
328 | 221 | |||
329 | 222 | Package: account-plugin-irc | ||
330 | 223 | Architecture: any | ||
331 | 224 | Depends: ${shlibs:Depends}, | ||
332 | 225 | ${misc:Depends}, | ||
333 | 226 | empathy (= ${binary:Version}), | ||
334 | 227 | telepathy-idle, | ||
335 | 228 | mcp-account-manager-uoa, | ||
336 | 229 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
337 | 230 | Breaks: account-plugin-empathy | ||
338 | 231 | Replaces: account-plugin-empathy | ||
339 | 232 | Description: Messaging account plugin for IRC | ||
340 | 233 | Instant messaging program supporting text, voice, video, file transfers | ||
341 | 234 | and inter-application communication over many different protocols, | ||
342 | 235 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
343 | 236 | Groupwise and ICQ. | ||
344 | 237 | . | ||
345 | 238 | This package contains UOA account plugins for the Empathy IM application. | ||
346 | 239 | |||
347 | 240 | Package: account-plugin-jabber | ||
348 | 241 | Architecture: any | ||
349 | 242 | Depends: ${shlibs:Depends}, | ||
350 | 243 | ${misc:Depends}, | ||
351 | 244 | empathy (= ${binary:Version}), | ||
352 | 245 | telepathy-gabble, | ||
353 | 246 | mcp-account-manager-uoa, | ||
354 | 247 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
355 | 248 | Breaks: account-plugin-empathy | ||
356 | 249 | Replaces: account-plugin-empathy | ||
357 | 250 | Description: Messaging account plugin for Jabber/XMPP | ||
358 | 251 | Instant messaging program supporting text, voice, video, file transfers | ||
359 | 252 | and inter-application communication over many different protocols, | ||
360 | 253 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
361 | 254 | Groupwise and ICQ. | ||
362 | 255 | . | ||
363 | 256 | This package contains UOA account plugins for the Empathy IM application. | ||
364 | 257 | |||
365 | 258 | Package: account-plugin-mxit | ||
366 | 259 | Architecture: any | ||
367 | 260 | Depends: ${shlibs:Depends}, | ||
368 | 261 | ${misc:Depends}, | ||
369 | 262 | empathy (= ${binary:Version}), | ||
370 | 263 | telepathy-haze, | ||
371 | 264 | mcp-account-manager-uoa, | ||
372 | 265 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
373 | 266 | Breaks: account-plugin-empathy | ||
374 | 267 | Replaces: account-plugin-empathy | ||
375 | 268 | Description: Messaging account plugin for Mxit | ||
376 | 269 | Instant messaging program supporting text, voice, video, file transfers | ||
377 | 270 | and inter-application communication over many different protocols, | ||
378 | 271 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
379 | 272 | Groupwise and ICQ. | ||
380 | 273 | . | ||
381 | 274 | This package contains UOA account plugins for the Empathy IM application. | ||
382 | 275 | |||
383 | 276 | Package: account-plugin-myspace | ||
384 | 277 | Architecture: any | ||
385 | 278 | Depends: ${shlibs:Depends}, | ||
386 | 279 | ${misc:Depends}, | ||
387 | 280 | empathy (= ${binary:Version}), | ||
388 | 281 | telepathy-haze, | ||
389 | 282 | mcp-account-manager-uoa, | ||
390 | 283 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
391 | 284 | Breaks: account-plugin-empathy | ||
392 | 285 | Replaces: account-plugin-empathy | ||
393 | 286 | Description: Messaging account plugin for MySpace | ||
394 | 287 | Instant messaging program supporting text, voice, video, file transfers | ||
395 | 288 | and inter-application communication over many different protocols, | ||
396 | 289 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
397 | 290 | Groupwise and ICQ. | ||
398 | 291 | . | ||
399 | 292 | This package contains UOA account plugins for the Empathy IM application. | ||
400 | 293 | |||
401 | 294 | Package: account-plugin-salut | ||
402 | 295 | Architecture: any | ||
403 | 296 | Depends: ${shlibs:Depends}, | ||
404 | 297 | ${misc:Depends}, | ||
405 | 298 | empathy (= ${binary:Version}), | ||
406 | 299 | telepathy-salut, | ||
407 | 300 | mcp-account-manager-uoa, | ||
408 | 301 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
409 | 302 | Breaks: account-plugin-empathy | ||
410 | 303 | Replaces: account-plugin-empathy | ||
411 | 304 | Description: Messaging account plugin for Local XMPP (Salut) | ||
412 | 305 | Instant messaging program supporting text, voice, video, file transfers | ||
413 | 306 | and inter-application communication over many different protocols, | ||
414 | 307 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
415 | 308 | Groupwise and ICQ. | ||
416 | 309 | . | ||
417 | 310 | This package contains UOA account plugins for the Empathy IM application. | ||
418 | 311 | |||
419 | 312 | Package: account-plugin-sametime | ||
420 | 313 | Architecture: any | ||
421 | 314 | Depends: ${shlibs:Depends}, | ||
422 | 315 | ${misc:Depends}, | ||
423 | 316 | empathy (= ${binary:Version}), | ||
424 | 317 | telepathy-haze, | ||
425 | 318 | mcp-account-manager-uoa, | ||
426 | 319 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
427 | 320 | Breaks: account-plugin-empathy | ||
428 | 321 | Replaces: account-plugin-empathy | ||
429 | 322 | Description: Messaging account plugin for Sametime | ||
430 | 323 | Instant messaging program supporting text, voice, video, file transfers | ||
431 | 324 | and inter-application communication over many different protocols, | ||
432 | 325 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
433 | 326 | Groupwise and ICQ. | ||
434 | 327 | . | ||
435 | 328 | This package contains UOA account plugins for the Empathy IM application. | ||
436 | 329 | |||
437 | 330 | Package: account-plugin-sip | ||
438 | 331 | Architecture: any | ||
439 | 332 | Depends: ${shlibs:Depends}, | ||
440 | 333 | ${misc:Depends}, | ||
441 | 334 | empathy (= ${binary:Version}), | ||
442 | 335 | telepathy-rakia, | ||
443 | 336 | mcp-account-manager-uoa, | ||
444 | 337 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
445 | 338 | Breaks: account-plugin-empathy | ||
446 | 339 | Replaces: account-plugin-empathy | ||
447 | 340 | Description: Messaging account plugin for SIP | ||
448 | 341 | Instant messaging program supporting text, voice, video, file transfers | ||
449 | 342 | and inter-application communication over many different protocols, | ||
450 | 343 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
451 | 344 | Groupwise and ICQ. | ||
452 | 345 | . | ||
453 | 346 | This package contains UOA account plugins for the Empathy IM application. | ||
454 | 347 | |||
455 | 348 | Package: account-plugin-yahoo | ||
456 | 349 | Architecture: any | ||
457 | 350 | Depends: ${shlibs:Depends}, | ||
458 | 351 | ${misc:Depends}, | ||
459 | 352 | empathy (= ${binary:Version}), | ||
460 | 353 | telepathy-haze, | ||
461 | 354 | mcp-account-manager-uoa, | ||
462 | 355 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
463 | 356 | Breaks: account-plugin-empathy | ||
464 | 357 | Replaces: account-plugin-empathy | ||
465 | 358 | Description: Messaging account plugin for Yahoo! | ||
466 | 359 | Instant messaging program supporting text, voice, video, file transfers | ||
467 | 360 | and inter-application communication over many different protocols, | ||
468 | 361 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
469 | 362 | Groupwise and ICQ. | ||
470 | 363 | . | ||
471 | 364 | This package contains UOA account plugins for the Empathy IM application. | ||
472 | 365 | |||
473 | 366 | Package: account-plugin-yahoojp | ||
474 | 367 | Architecture: any | ||
475 | 368 | Depends: ${shlibs:Depends}, | ||
476 | 369 | ${misc:Depends}, | ||
477 | 370 | empathy (= ${binary:Version}), | ||
478 | 371 | telepathy-haze, | ||
479 | 372 | mcp-account-manager-uoa, | ||
480 | 373 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
481 | 374 | Breaks: account-plugin-empathy | ||
482 | 375 | Replaces: account-plugin-empathy | ||
483 | 376 | Description: Messaging account plugin for Yahoo Japan | ||
484 | 377 | Instant messaging program supporting text, voice, video, file transfers | ||
485 | 378 | and inter-application communication over many different protocols, | ||
486 | 379 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
487 | 380 | Groupwise and ICQ. | ||
488 | 381 | . | ||
489 | 382 | This package contains UOA account plugins for the Empathy IM application. | ||
490 | 383 | |||
491 | 384 | Package: account-plugin-zephyr | ||
492 | 385 | Architecture: any | ||
493 | 386 | Depends: ${shlibs:Depends}, | ||
494 | 387 | ${misc:Depends}, | ||
495 | 388 | empathy (= ${binary:Version}), | ||
496 | 389 | telepathy-haze, | ||
497 | 390 | mcp-account-manager-uoa, | ||
498 | 391 | unity-asset-pool (>> 0.8.24daily13.03.20.1) | ||
499 | 392 | Breaks: account-plugin-empathy | ||
500 | 393 | Replaces: account-plugin-empathy | ||
501 | 394 | Description: Messaging account plugin for Zephyr | ||
502 | 395 | Instant messaging program supporting text, voice, video, file transfers | ||
503 | 396 | and inter-application communication over many different protocols, | ||
504 | 397 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, | ||
505 | 398 | Groupwise and ICQ. | ||
506 | 399 | . | ||
507 | 400 | This package contains UOA account plugins for the Empathy IM application. | ||
508 | 401 | 142 | ||
509 | === modified file 'debian/empathy.install' | |||
510 | --- debian/empathy.install 2014-09-24 22:31:17 +0000 | |||
511 | +++ debian/empathy.install 2017-05-02 18:19:56 +0000 | |||
512 | @@ -9,4 +9,4 @@ | |||
513 | 9 | usr/share/GConf/gsettings/empathy.convert | 9 | usr/share/GConf/gsettings/empathy.convert |
514 | 10 | usr/share/glib-2.0/schemas/org.gnome.Empathy.gschema.xml | 10 | usr/share/glib-2.0/schemas/org.gnome.Empathy.gschema.xml |
515 | 11 | usr/share/glib-2.0/schemas/org.gnome.telepathy-account-widgets.gschema.xml | 11 | usr/share/glib-2.0/schemas/org.gnome.telepathy-account-widgets.gschema.xml |
517 | 12 | debian/indicators/empathy /usr/share/indicators/messages/applications/ | 12 | usr/lib/mission-control-plugins.0 |
518 | 13 | 13 | ||
519 | === removed file 'debian/mcp-account-manager-goa.install' | |||
520 | --- debian/mcp-account-manager-goa.install 2012-08-09 21:28:11 +0000 | |||
521 | +++ debian/mcp-account-manager-goa.install 1970-01-01 00:00:00 +0000 | |||
522 | @@ -1,1 +0,0 @@ | |||
523 | 1 | usr/lib/mission-control-plugins.0/mcp-account-manager-goa.* | ||
524 | 2 | 0 | ||
525 | === removed file 'debian/mcp-account-manager-uoa.install' | |||
526 | --- debian/mcp-account-manager-uoa.install 2013-05-31 10:25:14 +0000 | |||
527 | +++ debian/mcp-account-manager-uoa.install 1970-01-01 00:00:00 +0000 | |||
528 | @@ -1,4 +0,0 @@ | |||
529 | 1 | usr/lib/mission-control-plugins.0/mcp-account-manager-uoa.* | ||
530 | 2 | usr/lib/libaccount-plugin-1.0/applications | ||
531 | 3 | usr/lib/libaccount-plugin-1.0/providers/libempathy-accounts-plugin.so | ||
532 | 4 | usr/share/accounts/applications | ||
533 | 5 | 0 | ||
534 | === removed file 'debian/patches/10_use_notify_osd_icons.patch' | |||
535 | --- debian/patches/10_use_notify_osd_icons.patch 2014-09-24 06:05:14 +0000 | |||
536 | +++ debian/patches/10_use_notify_osd_icons.patch 1970-01-01 00:00:00 +0000 | |||
537 | @@ -1,48 +0,0 @@ | |||
538 | 1 | Description: Use the notify-osd image for new message notifications | ||
539 | 2 | Bug: https://bugs.launchpad.net/ubuntu/+source/empathy/+bug/409828 | ||
540 | 3 | |||
541 | 4 | === modified file 'libempathy-gtk/empathy-images.h' | ||
542 | 5 | --- | ||
543 | 6 | libempathy-gtk/empathy-images.h | 1 + | ||
544 | 7 | libempathy-gtk/empathy-ui-utils.c | 3 +++ | ||
545 | 8 | src/empathy-event-manager.c | 4 ++-- | ||
546 | 9 | 3 files changed, 6 insertions(+), 2 deletions(-) | ||
547 | 10 | |||
548 | 11 | --- a/libempathy-gtk/empathy-images.h | ||
549 | 12 | +++ b/libempathy-gtk/empathy-images.h | ||
550 | 13 | @@ -37,6 +37,7 @@ G_BEGIN_DECLS | ||
551 | 14 | |||
552 | 15 | #define EMPATHY_IMAGE_MESSAGE "im-message" | ||
553 | 16 | #define EMPATHY_IMAGE_NEW_MESSAGE "im-message-new" | ||
554 | 17 | +#define EMPATHY_IMAGE_NEW_MESSAGE_NOTIFY "notification-message-im" | ||
555 | 18 | #define EMPATHY_IMAGE_TYPING "user-typing" | ||
556 | 19 | #define EMPATHY_IMAGE_CONTACT_INFORMATION "gtk-info" | ||
557 | 20 | #define EMPATHY_IMAGE_GROUP_MESSAGE "system-users" | ||
558 | 21 | --- a/libempathy-gtk/empathy-ui-utils.c | ||
559 | 22 | +++ b/libempathy-gtk/empathy-ui-utils.c | ||
560 | 23 | @@ -60,6 +60,9 @@ empathy_gtk_init (void) | ||
561 | 24 | gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), | ||
562 | 25 | PKGDATADIR G_DIR_SEPARATOR_S "icons"); | ||
563 | 26 | |||
564 | 27 | + gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), | ||
565 | 28 | + DATADIR G_DIR_SEPARATOR_S "notify-osd" G_DIR_SEPARATOR_S "icons"); | ||
566 | 29 | + | ||
567 | 30 | /* Add icons from source dir if available */ | ||
568 | 31 | if (g_getenv ("EMPATHY_SRCDIR") != NULL) | ||
569 | 32 | { | ||
570 | 33 | --- a/src/empathy-event-manager.c | ||
571 | 34 | +++ b/src/empathy-event-manager.c | ||
572 | 35 | @@ -560,11 +560,11 @@ event_manager_chat_message_received_cb ( | ||
573 | 36 | msg = empathy_message_get_body (message); | ||
574 | 37 | |||
575 | 38 | if (event != NULL) | ||
576 | 39 | - event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE, header, | ||
577 | 40 | + event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE_NOTIFY, header, | ||
578 | 41 | msg); | ||
579 | 42 | else | ||
580 | 43 | event_manager_add (approval->manager, NULL, sender, | ||
581 | 44 | - EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_NEW_MESSAGE, header, msg, | ||
582 | 45 | + EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_NEW_MESSAGE_NOTIFY, header, msg, | ||
583 | 46 | approval, event_text_channel_process_func, NULL); | ||
584 | 47 | |||
585 | 48 | empathy_sound_manager_play (priv->sound_mgr, NULL, | ||
586 | 49 | 0 | ||
587 | === removed file 'debian/patches/23_idomessagedialog_for_voip_and_ft.patch' | |||
588 | --- debian/patches/23_idomessagedialog_for_voip_and_ft.patch 2015-06-17 03:50:03 +0000 | |||
589 | +++ debian/patches/23_idomessagedialog_for_voip_and_ft.patch 1970-01-01 00:00:00 +0000 | |||
590 | @@ -1,203 +0,0 @@ | |||
591 | 1 | Description: Use ido to provide messages for calls and file transfers | ||
592 | 2 | |||
593 | 3 | === modified file 'configure.ac' | ||
594 | 4 | Index: empathy-3.12.10/configure.ac | ||
595 | 5 | =================================================================== | ||
596 | 6 | --- empathy-3.12.10.orig/configure.ac | ||
597 | 7 | +++ empathy-3.12.10/configure.ac | ||
598 | 8 | @@ -68,6 +68,7 @@ GCR_REQUIRED=2.91.4 | ||
599 | 9 | LIBCANBERRA_GTK_REQUIRED=0.25 | ||
600 | 10 | LIBNOTIFY_REQUIRED=0.7.0 | ||
601 | 11 | TELEPATHY_LOGGER=0.8.0 | ||
602 | 12 | +IDO_REQUIRED=0.2.90 | ||
603 | 13 | WEBKIT_REQUIRED=1.9.1 | ||
604 | 14 | GOA_REQUIRED=3.5.1 | ||
605 | 15 | |||
606 | 16 | @@ -224,6 +225,7 @@ PKG_CHECK_MODULES(EMPATHY, | ||
607 | 17 | libxml-2.0 | ||
608 | 18 | telepathy-glib >= $TELEPATHY_GLIB_REQUIRED | ||
609 | 19 | telepathy-logger-0.2 >= $TELEPATHY_LOGGER | ||
610 | 20 | + libido3-0.1 >= $IDO_REQUIRED | ||
611 | 21 | x11 | ||
612 | 22 | gtk+-3.0 >= $GTK_REQUIRED | ||
613 | 23 | libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED | ||
614 | 24 | Index: empathy-3.12.10/src/empathy-event-manager.c | ||
615 | 25 | =================================================================== | ||
616 | 26 | --- empathy-3.12.10.orig/src/empathy-event-manager.c | ||
617 | 27 | +++ empathy-3.12.10/src/empathy-event-manager.c | ||
618 | 28 | @@ -39,6 +39,8 @@ | ||
619 | 29 | #include "empathy-ui-utils.h" | ||
620 | 30 | #include "empathy-utils.h" | ||
621 | 31 | |||
622 | 32 | +#include <libido/idomessagedialog.h> | ||
623 | 33 | + | ||
624 | 34 | #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER | ||
625 | 35 | #include "empathy-debug.h" | ||
626 | 36 | |||
627 | 37 | @@ -249,6 +251,17 @@ event_manager_add (EmpathyEventManager * | ||
628 | 38 | return; | ||
629 | 39 | } | ||
630 | 40 | |||
631 | 41 | + /* auto approve voip calls and file transfers to raise the idomessagedialog */ | ||
632 | 42 | + if (type == EMPATHY_EVENT_TYPE_CALL || type == EMPATHY_EVENT_TYPE_TRANSFER) | ||
633 | 43 | + { | ||
634 | 44 | + /* Don't fire the 'event-added' signal as we activate the event now */ | ||
635 | 45 | + if (approval != NULL) | ||
636 | 46 | + approval->auto_approved = TRUE; | ||
637 | 47 | + | ||
638 | 48 | + empathy_event_activate (&event->public); | ||
639 | 49 | + return; | ||
640 | 50 | + } | ||
641 | 51 | + | ||
642 | 52 | g_signal_emit (event->manager, signals[EVENT_ADDED], 0, event); | ||
643 | 53 | |||
644 | 54 | if (!event->public.must_ack) | ||
645 | 55 | @@ -416,6 +429,7 @@ reject_approval (EventManagerApproval *a | ||
646 | 56 | } | ||
647 | 57 | } | ||
648 | 58 | |||
649 | 59 | + | ||
650 | 60 | static void | ||
651 | 61 | event_manager_call_window_confirmation_dialog_response_cb (GtkDialog *dialog, | ||
652 | 62 | gint response, gpointer user_data) | ||
653 | 63 | @@ -441,6 +455,68 @@ event_manager_call_window_confirmation_d | ||
654 | 64 | } | ||
655 | 65 | } | ||
656 | 66 | |||
657 | 67 | + | ||
658 | 68 | +static void | ||
659 | 69 | +event_channel_process_ft_func (EventPriv *event) | ||
660 | 70 | +{ | ||
661 | 71 | + GtkWidget *dialog; | ||
662 | 72 | + GtkWidget *button; | ||
663 | 73 | + GtkWidget *image; | ||
664 | 74 | + gint width, height; | ||
665 | 75 | + GdkPixbuf *avatar; | ||
666 | 76 | + | ||
667 | 77 | + if (event->approval->dialog != NULL) | ||
668 | 78 | + { | ||
669 | 79 | + gtk_window_present (GTK_WINDOW (event->approval->dialog)); | ||
670 | 80 | + return; | ||
671 | 81 | + } | ||
672 | 82 | + | ||
673 | 83 | + dialog = ido_message_dialog_new (NULL, | ||
674 | 84 | + GTK_DIALOG_MODAL, | ||
675 | 85 | + GTK_MESSAGE_QUESTION, | ||
676 | 86 | + GTK_BUTTONS_NONE, | ||
677 | 87 | + _("Incoming file transfer from %s"), | ||
678 | 88 | + empathy_contact_get_alias (event->approval->contact)); | ||
679 | 89 | + gtk_message_dialog_format_secondary_markup (GTK_WINDOW (dialog), _("%s is sending you a file. Do you want to accept it?"), | ||
680 | 90 | + empathy_contact_get_alias (event->approval->contact)); | ||
681 | 91 | + | ||
682 | 92 | + avatar = empathy_pixbuf_avatar_from_contact_scaled (event->approval->contact, 48, 48); | ||
683 | 93 | + if (avatar != NULL) | ||
684 | 94 | + { | ||
685 | 95 | + image = gtk_image_new_from_pixbuf (avatar); | ||
686 | 96 | + } else { | ||
687 | 97 | + /* Set image of the dialog */ | ||
688 | 98 | + image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_DOCUMENT_SEND, | ||
689 | 99 | + GTK_ICON_SIZE_DIALOG); | ||
690 | 100 | + } | ||
691 | 101 | + | ||
692 | 102 | + gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image); | ||
693 | 103 | + gtk_widget_show (image); | ||
694 | 104 | + | ||
695 | 105 | + gtk_dialog_set_default_response (GTK_DIALOG (dialog), | ||
696 | 106 | + GTK_RESPONSE_OK); | ||
697 | 107 | + | ||
698 | 108 | + button = gtk_dialog_add_button (GTK_DIALOG (dialog), | ||
699 | 109 | + _("_Reject"), GTK_RESPONSE_REJECT); | ||
700 | 110 | + image = gtk_image_new_from_icon_name ("stop", | ||
701 | 111 | + GTK_ICON_SIZE_BUTTON); | ||
702 | 112 | + gtk_button_set_image (GTK_BUTTON (button), image); | ||
703 | 113 | + | ||
704 | 114 | + button = gtk_dialog_add_button (GTK_DIALOG (dialog), | ||
705 | 115 | + _("_Accept"), GTK_RESPONSE_ACCEPT); | ||
706 | 116 | + | ||
707 | 117 | + image = gtk_image_new_from_icon_name ("filesaveas.png", GTK_ICON_SIZE_BUTTON); | ||
708 | 118 | + gtk_button_set_image (GTK_BUTTON (button), image); | ||
709 | 119 | + | ||
710 | 120 | + g_signal_connect (dialog, "response", | ||
711 | 121 | + G_CALLBACK (event_manager_call_window_confirmation_dialog_response_cb), | ||
712 | 122 | + event->approval); | ||
713 | 123 | + | ||
714 | 124 | + gtk_widget_show (dialog); | ||
715 | 125 | + | ||
716 | 126 | + event->approval->dialog = dialog; | ||
717 | 127 | +} | ||
718 | 128 | + | ||
719 | 129 | static void | ||
720 | 130 | event_channel_process_voip_func (EventPriv *event) | ||
721 | 131 | { | ||
722 | 132 | @@ -448,7 +524,8 @@ event_channel_process_voip_func (EventPr | ||
723 | 133 | GtkWidget *button; | ||
724 | 134 | GtkWidget *image; | ||
725 | 135 | gboolean video; | ||
726 | 136 | - gchar *title; | ||
727 | 137 | + gint width, height; | ||
728 | 138 | + GdkPixbuf *avatar; | ||
729 | 139 | EmpathyEventType etype = event->public.type; | ||
730 | 140 | |||
731 | 141 | if (event->approval->dialog != NULL) | ||
732 | 142 | @@ -469,33 +546,33 @@ event_channel_process_voip_func (EventPr | ||
733 | 143 | return; | ||
734 | 144 | } | ||
735 | 145 | |||
736 | 146 | - dialog = gtk_message_dialog_new (NULL, 0, | ||
737 | 147 | - GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, | ||
738 | 148 | - video ? _("Incoming video call"): _("Incoming call")); | ||
739 | 149 | - | ||
740 | 150 | - gtk_message_dialog_format_secondary_text ( | ||
741 | 151 | - GTK_MESSAGE_DIALOG (dialog), video ? | ||
742 | 152 | - _("%s is video calling you. Do you want to answer?"): | ||
743 | 153 | - _("%s is calling you. Do you want to answer?"), | ||
744 | 154 | - empathy_contact_get_alias (event->approval->contact)); | ||
745 | 155 | - | ||
746 | 156 | - title = g_strdup_printf (_("Incoming call from %s"), | ||
747 | 157 | - empathy_contact_get_alias (event->approval->contact)); | ||
748 | 158 | - | ||
749 | 159 | - gtk_window_set_title (GTK_WINDOW (dialog), title); | ||
750 | 160 | - g_free (title); | ||
751 | 161 | - | ||
752 | 162 | - /* Set image of the dialog */ | ||
753 | 163 | - if (video) | ||
754 | 164 | + dialog = ido_message_dialog_new (NULL, | ||
755 | 165 | + GTK_DIALOG_MODAL, | ||
756 | 166 | + GTK_MESSAGE_QUESTION, | ||
757 | 167 | + GTK_BUTTONS_NONE, | ||
758 | 168 | + video ? _("Incoming video call from %s"): _("Incoming call from %s"), empathy_contact_get_alias (event->approval->contact)); | ||
759 | 169 | + gtk_message_dialog_format_secondary_markup (GTK_WINDOW (dialog), video ? | ||
760 | 170 | + _("%s is video calling you. Do you want to answer?"): | ||
761 | 171 | + _("%s is calling you. Do you want to answer?"), | ||
762 | 172 | + empathy_contact_get_alias (event->approval->contact)); | ||
763 | 173 | + | ||
764 | 174 | + avatar = empathy_pixbuf_avatar_from_contact_scaled (event->approval->contact, 48, 48); | ||
765 | 175 | + if (avatar != NULL) | ||
766 | 176 | + { | ||
767 | 177 | + image = gtk_image_new_from_pixbuf (avatar); | ||
768 | 178 | + } else { | ||
769 | 179 | + /* Set image of the dialog */ | ||
770 | 180 | + if (video) | ||
771 | 181 | { | ||
772 | 182 | image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VIDEO_CALL, | ||
773 | 183 | GTK_ICON_SIZE_DIALOG); | ||
774 | 184 | } | ||
775 | 185 | - else | ||
776 | 186 | + else | ||
777 | 187 | { | ||
778 | 188 | image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VOIP, | ||
779 | 189 | GTK_ICON_SIZE_DIALOG); | ||
780 | 190 | } | ||
781 | 191 | + } | ||
782 | 192 | |||
783 | 193 | gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image); | ||
784 | 194 | gtk_widget_show (image); | ||
785 | 195 | @@ -923,7 +1000,7 @@ approve_ft_channel (EmpathyEventManager | ||
786 | 196 | event_manager_add (approval->manager, NULL, | ||
787 | 197 | approval->contact, EMPATHY_EVENT_TYPE_TRANSFER, | ||
788 | 198 | EMPATHY_IMAGE_DOCUMENT_SEND, header, NULL, | ||
789 | 199 | - approval, event_channel_process_func, NULL); | ||
790 | 200 | + approval, event_channel_process_ft_func, NULL); | ||
791 | 201 | |||
792 | 202 | /* FIXME better sound for incoming file transfers ?*/ | ||
793 | 203 | empathy_sound_manager_play (priv->sound_mgr, NULL, | ||
794 | 204 | 0 | ||
795 | === removed file 'debian/patches/41_unity_launcher_progress.patch' | |||
796 | --- debian/patches/41_unity_launcher_progress.patch 2015-06-17 03:50:03 +0000 | |||
797 | +++ debian/patches/41_unity_launcher_progress.patch 1970-01-01 00:00:00 +0000 | |||
798 | @@ -1,251 +0,0 @@ | |||
799 | 1 | Description: Add Unity support to show file transfer progress in the launcher | ||
800 | 2 | |||
801 | 3 | === modified file 'configure.ac' | ||
802 | 4 | --- | ||
803 | 5 | configure.ac | 30 +++++++++++++++++++ | ||
804 | 6 | src/Makefile.am | 3 + | ||
805 | 7 | src/empathy-ft-manager.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++ | ||
806 | 8 | 3 files changed, 104 insertions(+) | ||
807 | 9 | |||
808 | 10 | Index: empathy-3.12.10/configure.ac | ||
809 | 11 | =================================================================== | ||
810 | 12 | --- empathy-3.12.10.orig/configure.ac | ||
811 | 13 | +++ empathy-3.12.10/configure.ac | ||
812 | 14 | @@ -79,6 +79,7 @@ GEOCODE_GLIB_REQUIRED=0.99.1 | ||
813 | 15 | ISO_CODES_REQUIRED=0.35 | ||
814 | 16 | NAUTILUS_SENDTO_REQUIRED=2.90.0 | ||
815 | 17 | NETWORK_MANAGER_REQUIRED=0.7.0 | ||
816 | 18 | +UNITY_REQUIRED=3.4.0 | ||
817 | 19 | CHAMPLAIN_REQUIRED=0.12.1 | ||
818 | 20 | CHEESE_GTK_REQUIRED=3.4.0 | ||
819 | 21 | LIBACCOUNTS_REQUIRED=1.4 | ||
820 | 22 | @@ -346,6 +347,34 @@ fi | ||
821 | 23 | |||
822 | 24 | AM_CONDITIONAL(HAVE_ENCHANT, test "x$have_enchant" = "xyes") | ||
823 | 25 | |||
824 | 26 | +# libunity | ||
825 | 27 | +# ----------------------------------------------------------- | ||
826 | 28 | +AC_ARG_ENABLE(libunity, | ||
827 | 29 | + AS_HELP_STRING([--enable-libunity=@<:@no/yes/auto@:>@], | ||
828 | 30 | + [build libunity support]), , | ||
829 | 31 | + enable_libunity=auto) | ||
830 | 32 | + | ||
831 | 33 | +if test "x$enable_unity" != "xno"; then | ||
832 | 34 | + PKG_CHECK_MODULES(UNITY, | ||
833 | 35 | + [ | ||
834 | 36 | + unity >= $UNITY_REQUIRED | ||
835 | 37 | + ], have_unity="yes", have_unity="no") | ||
836 | 38 | + | ||
837 | 39 | + if test "x$have_unity" = "xyes"; then | ||
838 | 40 | + AC_DEFINE(HAVE_UNITY, 1, [Define if you have unity]) | ||
839 | 41 | + fi | ||
840 | 42 | +else | ||
841 | 43 | + have_unity=no | ||
842 | 44 | +fi | ||
843 | 45 | + | ||
844 | 46 | +if test "x$enable_unity" = "xyes" -a "x$have_unity" != "xyes"; then | ||
845 | 47 | + AC_MSG_ERROR([Could not find libunity.]) | ||
846 | 48 | +fi | ||
847 | 49 | + | ||
848 | 50 | +AM_CONDITIONAL(HAVE_UNITY, test "x$have_unity" = "xyes") | ||
849 | 51 | +AC_SUBST([UNITY_CFLAGS]) | ||
850 | 52 | +AC_SUBST([UNITY_LIBS]) | ||
851 | 53 | + | ||
852 | 54 | # ----------------------------------------------------------- | ||
853 | 55 | # Map view checks: libchamplain | ||
854 | 56 | # ----------------------------------------------------------- | ||
855 | 57 | @@ -632,6 +661,7 @@ Configure summary: | ||
856 | 58 | Display maps (libchamplain).: ${have_libchamplain} | ||
857 | 59 | Location awareness (Geoclue): ${have_geoclue} | ||
858 | 60 | Geocode support (Geocode)...: ${have_geocode} | ||
859 | 61 | + Unity panel support (unity).: ${have_unity} | ||
860 | 62 | Cheese webcam support ......: ${have_cheese} | ||
861 | 63 | Camera monitoring...........: ${have_gudev} | ||
862 | 64 | |||
863 | 65 | Index: empathy-3.12.10/src/Makefile.am | ||
864 | 66 | =================================================================== | ||
865 | 67 | --- empathy-3.12.10.orig/src/Makefile.am | ||
866 | 68 | +++ empathy-3.12.10/src/Makefile.am | ||
867 | 69 | @@ -18,6 +18,7 @@ CPPFLAGS_COMMON = \ | ||
868 | 70 | AM_LDFLAGS = $(LIBM) | ||
869 | 71 | AM_CPPFLAGS = \ | ||
870 | 72 | $(CPPFLAGS_COMMON) \ | ||
871 | 73 | + $(UNITY_CFLAGS) \ | ||
872 | 74 | $(LIBCHAMPLAIN_CFLAGS) \ | ||
873 | 75 | $(UOA_CFLAGS) \ | ||
874 | 76 | $(NULL) | ||
875 | 77 | @@ -28,6 +29,7 @@ LDADD = \ | ||
876 | 78 | $(top_builddir)/extensions/libemp-extensions.la \ | ||
877 | 79 | $(GCR_LIBS) \ | ||
878 | 80 | $(EMPATHY_LIBS) \ | ||
879 | 81 | + $(UNITY_LIBS) \ | ||
880 | 82 | $(TPAW_LIBS) \ | ||
881 | 83 | $(LIBCHAMPLAIN_LIBS) \ | ||
882 | 84 | $(UOA_LIBS) \ | ||
883 | 85 | @@ -169,6 +171,7 @@ empathy_LDADD = \ | ||
884 | 86 | $(top_builddir)/libempathy/libempathy.la \ | ||
885 | 87 | $(top_builddir)/extensions/libemp-extensions.la \ | ||
886 | 88 | $(EMPATHY_LIBS) \ | ||
887 | 89 | + $(UNITY_LIBS) \ | ||
888 | 90 | $(LIBCHAMPLAIN_LIBS) \ | ||
889 | 91 | $(NULL) | ||
890 | 92 | |||
891 | 93 | Index: empathy-3.12.10/src/empathy-ft-manager.c | ||
892 | 94 | =================================================================== | ||
893 | 95 | --- empathy-3.12.10.orig/src/empathy-ft-manager.c | ||
894 | 96 | +++ empathy-3.12.10/src/empathy-ft-manager.c | ||
895 | 97 | @@ -40,6 +40,8 @@ | ||
896 | 98 | #define DEBUG_FLAG EMPATHY_DEBUG_FT | ||
897 | 99 | #include "empathy-debug.h" | ||
898 | 100 | |||
899 | 101 | +#include <unity.h> | ||
900 | 102 | + | ||
901 | 103 | enum | ||
902 | 104 | { | ||
903 | 105 | COL_PERCENT, | ||
904 | 106 | @@ -59,6 +61,7 @@ typedef struct { | ||
905 | 107 | GtkWidget *open_button; | ||
906 | 108 | GtkWidget *abort_button; | ||
907 | 109 | GtkWidget *clear_button; | ||
908 | 110 | + UnityLauncherEntry *launcher; | ||
909 | 111 | } EmpathyFTManagerPriv; | ||
910 | 112 | |||
911 | 113 | enum | ||
912 | 114 | @@ -78,6 +81,53 @@ static EmpathyFTManager *manager_singlet | ||
913 | 115 | static void ft_handler_hashing_started_cb (EmpathyFTHandler *handler, | ||
914 | 116 | EmpathyFTManager *manager); | ||
915 | 117 | |||
916 | 118 | +static gchar * ft_manager_format_progress_bytes_and_percentage ( | ||
917 | 119 | + guint64 current, | ||
918 | 120 | + guint64 total, | ||
919 | 121 | + gdouble speed, | ||
920 | 122 | + int *percentage); | ||
921 | 123 | + | ||
922 | 124 | +static void | ||
923 | 125 | +ft_update_unity_launcher (EmpathyFTManager *manager) | ||
924 | 126 | +{ | ||
925 | 127 | + EmpathyFTManagerPriv *priv; | ||
926 | 128 | + | ||
927 | 129 | + priv = GET_PRIV (manager); | ||
928 | 130 | + g_return_if_fail (priv->launcher != NULL); | ||
929 | 131 | + | ||
930 | 132 | + guint64 current_bytes = 0; | ||
931 | 133 | + guint64 total_bytes = 0; | ||
932 | 134 | + int percentage; | ||
933 | 135 | + gdouble progress; | ||
934 | 136 | + GHashTableIter iter; | ||
935 | 137 | + gpointer handler; | ||
936 | 138 | + | ||
937 | 139 | + g_hash_table_iter_init (&iter, priv->ft_handler_to_row_ref); | ||
938 | 140 | + while (g_hash_table_iter_next (&iter, &handler, NULL)) | ||
939 | 141 | + { | ||
940 | 142 | + if (!empathy_ft_handler_is_completed (handler) && | ||
941 | 143 | + !empathy_ft_handler_is_cancelled (handler)) | ||
942 | 144 | + { | ||
943 | 145 | + current_bytes = current_bytes + empathy_ft_handler_get_transferred_bytes (handler); | ||
944 | 146 | + total_bytes = total_bytes + empathy_ft_handler_get_total_bytes (handler); | ||
945 | 147 | + } | ||
946 | 148 | + } | ||
947 | 149 | + ft_manager_format_progress_bytes_and_percentage (current_bytes, total_bytes, -1, &percentage); | ||
948 | 150 | + | ||
949 | 151 | + progress = percentage; | ||
950 | 152 | + progress = progress / 100; | ||
951 | 153 | + | ||
952 | 154 | + unity_launcher_entry_set_progress (priv->launcher, progress); | ||
953 | 155 | + if (progress > 0 && progress < 100) | ||
954 | 156 | + { | ||
955 | 157 | + unity_launcher_entry_set_progress_visible (priv->launcher, TRUE); | ||
956 | 158 | + } | ||
957 | 159 | + else | ||
958 | 160 | + { | ||
959 | 161 | + unity_launcher_entry_set_progress_visible (priv->launcher, FALSE); | ||
960 | 162 | + } | ||
961 | 163 | +} | ||
962 | 164 | + | ||
963 | 165 | static gchar * | ||
964 | 166 | ft_manager_format_interval (guint interval) | ||
965 | 167 | { | ||
966 | 168 | @@ -387,6 +437,8 @@ ft_manager_update_handler_progress (Empa | ||
967 | 169 | COL_PERCENT, percentage, | ||
968 | 170 | -1); | ||
969 | 171 | |||
970 | 172 | + ft_update_unity_launcher (manager); | ||
971 | 173 | + | ||
972 | 174 | gtk_tree_path_free (path); | ||
973 | 175 | |||
974 | 176 | } | ||
975 | 177 | @@ -453,6 +505,8 @@ ft_handler_transfer_error_cb (EmpathyFTH | ||
976 | 178 | ft_manager_clear_handler_time (manager, row_ref); | ||
977 | 179 | ft_manager_update_buttons (manager); | ||
978 | 180 | |||
979 | 181 | + ft_update_unity_launcher (manager); | ||
980 | 182 | + | ||
981 | 183 | g_free (message); | ||
982 | 184 | } | ||
983 | 185 | |||
984 | 186 | @@ -460,6 +514,7 @@ static void | ||
985 | 187 | do_real_transfer_done (EmpathyFTManager *manager, | ||
986 | 188 | EmpathyFTHandler *handler) | ||
987 | 189 | { | ||
988 | 190 | + EmpathyFTManagerPriv *priv; | ||
989 | 191 | const char *contact_name; | ||
990 | 192 | const char *filename; | ||
991 | 193 | char *first_line, *second_line, *message; | ||
992 | 194 | @@ -469,6 +524,8 @@ do_real_transfer_done (EmpathyFTManager | ||
993 | 195 | GtkRecentManager *recent_manager; | ||
994 | 196 | GFile *file; | ||
995 | 197 | |||
996 | 198 | + priv = GET_PRIV (manager); | ||
997 | 199 | + | ||
998 | 200 | row_ref = ft_manager_get_row_from_handler (manager, handler); | ||
999 | 201 | g_return_if_fail (row_ref != NULL); | ||
1000 | 202 | |||
1001 | 203 | @@ -494,6 +551,8 @@ do_real_transfer_done (EmpathyFTManager | ||
1002 | 204 | ft_manager_update_handler_message (manager, row_ref, message); | ||
1003 | 205 | ft_manager_clear_handler_time (manager, row_ref); | ||
1004 | 206 | |||
1005 | 207 | + ft_update_unity_launcher (manager); | ||
1006 | 208 | + | ||
1007 | 209 | /* update buttons */ | ||
1008 | 210 | ft_manager_update_buttons (manager); | ||
1009 | 211 | |||
1010 | 212 | @@ -530,6 +589,8 @@ ft_handler_transfer_done_cb (EmpathyFTHa | ||
1011 | 213 | DEBUG ("Transfer done, no hashing"); | ||
1012 | 214 | |||
1013 | 215 | do_real_transfer_done (manager, handler); | ||
1014 | 216 | + | ||
1015 | 217 | + ft_update_unity_launcher (manager); | ||
1016 | 218 | } | ||
1017 | 219 | |||
1018 | 220 | static void | ||
1019 | 221 | @@ -571,6 +632,8 @@ ft_handler_transfer_started_cb (EmpathyF | ||
1020 | 222 | TpFileTransferChannel *channel, | ||
1021 | 223 | EmpathyFTManager *manager) | ||
1022 | 224 | { | ||
1023 | 225 | + EmpathyFTManagerPriv *priv; | ||
1024 | 226 | + priv = GET_PRIV (manager); | ||
1025 | 227 | guint64 transferred_bytes, total_bytes; | ||
1026 | 228 | |||
1027 | 229 | DEBUG ("Transfer started"); | ||
1028 | 230 | @@ -1078,6 +1141,12 @@ empathy_ft_manager_finalize (GObject *ob | ||
1029 | 231 | |||
1030 | 232 | g_hash_table_unref (priv->ft_handler_to_row_ref); | ||
1031 | 233 | |||
1032 | 234 | + if (priv->launcher != NULL) | ||
1033 | 235 | + { | ||
1034 | 236 | + g_object_unref(priv->launcher); | ||
1035 | 237 | + priv->launcher = NULL; | ||
1036 | 238 | + } | ||
1037 | 239 | + | ||
1038 | 240 | G_OBJECT_CLASS (empathy_ft_manager_parent_class)->finalize (object); | ||
1039 | 241 | } | ||
1040 | 242 | |||
1041 | 243 | @@ -1095,6 +1164,8 @@ empathy_ft_manager_init (EmpathyFTManage | ||
1042 | 244 | g_direct_equal, (GDestroyNotify) g_object_unref, | ||
1043 | 245 | (GDestroyNotify) gtk_tree_row_reference_free); | ||
1044 | 246 | |||
1045 | 247 | + priv->launcher = unity_launcher_entry_get_for_desktop_id ("empathy.desktop"); | ||
1046 | 248 | + | ||
1047 | 249 | ft_manager_build_ui (manager); | ||
1048 | 250 | } | ||
1049 | 251 | |||
1050 | 252 | 0 | ||
1051 | === removed file 'debian/patches/43_quicklists.patch' | |||
1052 | --- debian/patches/43_quicklists.patch 2014-04-03 15:01:20 +0000 | |||
1053 | +++ debian/patches/43_quicklists.patch 1970-01-01 00:00:00 +0000 | |||
1054 | @@ -1,29 +0,0 @@ | |||
1055 | 1 | Description: Add some Unity Quicklists | ||
1056 | 2 | |||
1057 | 3 | Index: b/data/empathy.desktop.in.in | ||
1058 | 4 | =================================================================== | ||
1059 | 5 | --- a/data/empathy.desktop.in.in | ||
1060 | 6 | +++ b/data/empathy.desktop.in.in | ||
1061 | 7 | @@ -15,4 +15,21 @@ | ||
1062 | 8 | X-GNOME-Bugzilla-Bugzilla=GNOME | ||
1063 | 9 | X-GNOME-Bugzilla-Product=empathy | ||
1064 | 10 | X-GNOME-Bugzilla-Component=General | ||
1065 | 11 | -X-GNOME-Bugzilla-Version=@VERSION@ | ||
1066 | 12 | +X-GNOME-Bugzilla-Version=@VERSION@8 | ||
1067 | 13 | +X-MessagingMenu-UsesChatSection=true | ||
1068 | 14 | +Actions=Hidden;Prefs;Accounts; | ||
1069 | 15 | + | ||
1070 | 16 | +[Desktop Action Hidden] | ||
1071 | 17 | +_Name=Open Hidden in Background | ||
1072 | 18 | +Exec=empathy -h | ||
1073 | 19 | +NotShowIn=Messaging Menu | ||
1074 | 20 | + | ||
1075 | 21 | +[Desktop Action Prefs] | ||
1076 | 22 | +_Name=Open Preferences | ||
1077 | 23 | +Exec=empathy -p | ||
1078 | 24 | +NotShowIn=Messaging Menu | ||
1079 | 25 | + | ||
1080 | 26 | +[Desktop Action Accounts] | ||
1081 | 27 | +_Name=Open Accounts | ||
1082 | 28 | +Exec=unity-control-center credentials | ||
1083 | 29 | +NotShowIn=Messaging Menu | ||
1084 | 30 | 0 | ||
1085 | === modified file 'debian/patches/series' | |||
1086 | --- debian/patches/series 2016-09-29 14:16:37 +0000 | |||
1087 | +++ debian/patches/series 2017-05-02 18:19:56 +0000 | |||
1088 | @@ -1,11 +1,6 @@ | |||
1089 | 1 | 00_linker-fixes.patch | 1 | 00_linker-fixes.patch |
1090 | 2 | 10_use_notify_osd_icons.patch | ||
1091 | 3 | 23_idomessagedialog_for_voip_and_ft.patch | ||
1092 | 4 | 34_start_raised_execpt_in_session.patch | 2 | 34_start_raised_execpt_in_session.patch |
1093 | 5 | 38_default_to_facebook_for_im.patch | 3 | 38_default_to_facebook_for_im.patch |
1094 | 6 | 39_default_to_freenode_for_irc.patch | 4 | 39_default_to_freenode_for_irc.patch |
1095 | 7 | 41_unity_launcher_progress.patch | ||
1096 | 8 | 42_shell_running.patch | 5 | 42_shell_running.patch |
1097 | 9 | 43_quicklists.patch | ||
1098 | 10 | ubuntu_launch_uoa_panel.patch | ||
1099 | 11 | clutter-gst-3.0.patch | 6 | clutter-gst-3.0.patch |
1100 | 12 | 7 | ||
1101 | === removed file 'debian/patches/ubuntu_launch_uoa_panel.patch' | |||
1102 | --- debian/patches/ubuntu_launch_uoa_panel.patch 2016-03-10 07:42:14 +0000 | |||
1103 | +++ debian/patches/ubuntu_launch_uoa_panel.patch 1970-01-01 00:00:00 +0000 | |||
1104 | @@ -1,76 +0,0 @@ | |||
1105 | 1 | From 906eb708198b655eb04a3eda08cdce58e8558b0c Mon Sep 17 00:00:00 2001 | ||
1106 | 2 | From: Tim Lunn <tim@feathertop.org> | ||
1107 | 3 | Date: Tue, 23 Jul 2013 12:30:11 +1000 | ||
1108 | 4 | Subject: [PATCH] Check desktop session to determine which accounts panel to | ||
1109 | 5 | launch | ||
1110 | 6 | |||
1111 | 7 | --- | ||
1112 | 8 | src/empathy-accounts-dialog.c | 14 ++++++++++---- | ||
1113 | 9 | 1 file changed, 10 insertions(+), 4 deletions(-) | ||
1114 | 10 | |||
1115 | 11 | Index: empathy-3.12.11/src/empathy-accounts-dialog.c | ||
1116 | 12 | =================================================================== | ||
1117 | 13 | --- empathy-3.12.11.orig/src/empathy-accounts-dialog.c | ||
1118 | 14 | +++ empathy-3.12.11/src/empathy-accounts-dialog.c | ||
1119 | 15 | @@ -2684,8 +2684,9 @@ launch_uoa_panel (TpAccount *selected_ac | ||
1120 | 16 | g_object_unref (manager); | ||
1121 | 17 | } | ||
1122 | 18 | |||
1123 | 19 | -#else /* HAVE_UOA */ | ||
1124 | 20 | +#endif /* HAVE_UOA */ | ||
1125 | 21 | |||
1126 | 22 | +#ifdef HAVE_GOA | ||
1127 | 23 | static void | ||
1128 | 24 | launch_empathy_accounts (TpAccount *selected_account, | ||
1129 | 25 | gboolean if_needed, | ||
1130 | 26 | @@ -2716,7 +2717,33 @@ launch_empathy_accounts (TpAccount *sele | ||
1131 | 27 | |||
1132 | 28 | g_string_free (args, TRUE); | ||
1133 | 29 | } | ||
1134 | 30 | -#endif /* HAVE_UOA */ | ||
1135 | 31 | +#endif /* HAVE_GOA */ | ||
1136 | 32 | + | ||
1137 | 33 | +#ifdef HAVE_UOA | ||
1138 | 34 | +static gboolean | ||
1139 | 35 | +in_desktop (const gchar *name) | ||
1140 | 36 | +{ | ||
1141 | 37 | + const gchar *desktop_name_list; | ||
1142 | 38 | + gchar **names; | ||
1143 | 39 | + gboolean in_list = FALSE; | ||
1144 | 40 | + gint i; | ||
1145 | 41 | + | ||
1146 | 42 | + desktop_name_list = g_getenv ("XDG_CURRENT_DESKTOP"); | ||
1147 | 43 | + if (!desktop_name_list) | ||
1148 | 44 | + return FALSE; | ||
1149 | 45 | + | ||
1150 | 46 | + names = g_strsplit (desktop_name_list, ":", -1); | ||
1151 | 47 | + for (i = 0; names[i] && !in_list; i++) | ||
1152 | 48 | + if (strcmp (names[i], name) == 0) | ||
1153 | 49 | + { | ||
1154 | 50 | + in_list = TRUE; | ||
1155 | 51 | + break; | ||
1156 | 52 | + } | ||
1157 | 53 | + g_strfreev (names); | ||
1158 | 54 | + | ||
1159 | 55 | + return in_list; | ||
1160 | 56 | +} | ||
1161 | 57 | +#endif | ||
1162 | 58 | |||
1163 | 59 | void | ||
1164 | 60 | empathy_accounts_dialog_show_application (GdkScreen *screen, | ||
1165 | 61 | @@ -2725,8 +2752,13 @@ empathy_accounts_dialog_show_application | ||
1166 | 62 | gboolean hidden) | ||
1167 | 63 | { | ||
1168 | 64 | #ifdef HAVE_UOA | ||
1169 | 65 | - launch_uoa_panel (selected_account, if_needed, hidden); | ||
1170 | 66 | -#else | ||
1171 | 67 | + if (in_desktop ("Unity")) { | ||
1172 | 68 | + launch_uoa_panel (selected_account, if_needed, hidden); | ||
1173 | 69 | + return; | ||
1174 | 70 | + } | ||
1175 | 71 | +#endif | ||
1176 | 72 | + | ||
1177 | 73 | +#ifdef HAVE_GOA | ||
1178 | 74 | launch_empathy_accounts (selected_account, if_needed, hidden); | ||
1179 | 75 | #endif | ||
1180 | 76 | } | ||
1181 | 77 | 0 | ||
1182 | === modified file 'debian/rules' | |||
1183 | --- debian/rules 2016-09-29 14:16:37 +0000 | |||
1184 | +++ debian/rules 2017-05-02 18:19:56 +0000 | |||
1185 | @@ -38,56 +38,8 @@ | |||
1186 | 38 | DEB_DH_SHLIBDEPS_ARGS_ALL = -Lempathy | 38 | DEB_DH_SHLIBDEPS_ARGS_ALL = -Lempathy |
1187 | 39 | DEB_DH_STRIP_ARGS = --dbgsym-migration='empathy-dbg (<< 3.12.11-2~)' | 39 | DEB_DH_STRIP_ARGS = --dbgsym-migration='empathy-dbg (<< 3.12.11-2~)' |
1188 | 40 | 40 | ||
1189 | 41 | binary-post-install/account-plugin-aim:: | ||
1190 | 42 | rm -f debian/account-plugin-aim/usr/lib/libaccount-plugin-1.0/*/*a | ||
1191 | 43 | |||
1192 | 44 | binary-post-install/account-plugin-gadugadu:: | ||
1193 | 45 | rm -f debian/account-plugin-gadugadu/usr/lib/libaccount-plugin-1.0/*/*a | ||
1194 | 46 | |||
1195 | 47 | binary-post-install/account-plugin-groupwise:: | ||
1196 | 48 | rm -f debian/account-plugin-groupwise/usr/lib/libaccount-plugin-1.0/*/*a | ||
1197 | 49 | |||
1198 | 50 | binary-post-install/account-plugin-icq:: | ||
1199 | 51 | rm -f debian/account-plugin-icq/usr/lib/libaccount-plugin-1.0/*/*a | ||
1200 | 52 | |||
1201 | 53 | binary-post-install/account-plugin-irc:: | ||
1202 | 54 | rm -f debian/account-plugin-irc/usr/lib/libaccount-plugin-1.0/*/*a | ||
1203 | 55 | |||
1204 | 56 | binary-post-install/account-plugin-jabber:: | ||
1205 | 57 | rm -f debian/account-plugin-jabber/usr/lib/libaccount-plugin-1.0/*/*a | ||
1206 | 58 | |||
1207 | 59 | binary-post-install/account-plugin-salut:: | ||
1208 | 60 | rm -f debian/account-plugin-salut/usr/lib/libaccount-plugin-1.0/*/*a | ||
1209 | 61 | |||
1210 | 62 | binary-post-install/account-plugin-mxit:: | ||
1211 | 63 | rm -f debian/account-plugin-mxit/usr/lib/libaccount-plugin-1.0/*/*a | ||
1212 | 64 | |||
1213 | 65 | binary-post-install/account-plugin-myspace:: | ||
1214 | 66 | rm -f debian/account-plugin-myspace/usr/lib/libaccount-plugin-1.0/*/*a | ||
1215 | 67 | |||
1216 | 68 | binary-post-install/account-plugin-sametime:: | ||
1217 | 69 | rm -f debian/account-plugin-sametime/usr/lib/libaccount-plugin-1.0/*/*a | ||
1218 | 70 | |||
1219 | 71 | binary-post-install/account-plugin-sip:: | ||
1220 | 72 | rm -f debian/account-plugin-sip/usr/lib/libaccount-plugin-1.0/*/*a | ||
1221 | 73 | |||
1222 | 74 | binary-post-install/account-plugin-yahoo:: | ||
1223 | 75 | rm -f debian/account-plugin-yahoo/usr/lib/libaccount-plugin-1.0/*/*a | ||
1224 | 76 | |||
1225 | 77 | binary-post-install/account-plugin-yahoojp:: | ||
1226 | 78 | rm -f debian/account-plugin-yahoojp/usr/lib/libaccount-plugin-1.0/*/*a | ||
1227 | 79 | |||
1228 | 80 | binary-post-install/account-plugin-zephyr:: | ||
1229 | 81 | rm -f debian/account-plugin-zephyr/usr/lib/libaccount-plugin-1.0/*/*a | ||
1230 | 82 | |||
1231 | 83 | binary-post-install/empathy:: | 41 | binary-post-install/empathy:: |
1232 | 84 | rm -f debian/empathy/usr/lib/empathy/*.*a | 42 | rm -f debian/empathy/usr/lib/empathy/*.*a |
1240 | 85 | 43 | rm -f debian/empathy/usr/lib/mission-control-plugins.0/*.*a | |
1234 | 86 | binary-post-install/mcp-account-manager-goa:: | ||
1235 | 87 | rm -f debian/mcp-account-manager-goa/usr/lib/mission-control-plugins.0/*.*a | ||
1236 | 88 | |||
1237 | 89 | binary-post-install/mcp-account-manager-uoa:: | ||
1238 | 90 | rm -f debian/mcp-account-manager-uoa/usr/lib/mission-control-plugins.0/*.*a | ||
1239 | 91 | rm -f debian/mcp-account-manager-uoa/usr/lib/libaccount-plugin-1.0/applications/*a | ||
1241 | 92 | 44 | ||
1242 | 93 | include $(CURDIR)/debian/update-patches.mk | 45 | include $(CURDIR)/debian/update-patches.mk |
1243 | 94 | 46 | ||
1244 | === modified file 'debian/shlibs.local' | |||
1245 | --- debian/shlibs.local 2016-09-29 14:16:37 +0000 | |||
1246 | +++ debian/shlibs.local 2017-05-02 18:19:56 +0000 | |||
1247 | @@ -1,2 +1,2 @@ | |||
1250 | 1 | libempathy-gtk 3.12.12 empathy (= ${binary:Version}) | 1 | libempathy-gtk 3.12.13 empathy (= ${binary:Version}) |
1251 | 2 | libempathy 3.12.12 empathy (= ${binary:Version}) | 2 | libempathy 3.12.13 empathy (= ${binary:Version}) |