Merge lp:~ken-vandine/empathy/no_unity_no_uoa into lp:~ubuntu-desktop/empathy/ubuntu

Proposed by Ken VanDine on 2017-04-28
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
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2017-04-28 Pending
Review via email: mp+323384@code.launchpad.net

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 on 2017-04-28

New upstream release

394. By Ken VanDine on 2017-05-02

bumped shlibs

395. By Ken VanDine on 2017-05-02

added Provides for the packages we are removing

396. By Ken VanDine on 2017-05-02

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

Subscribers

People subscribed via source and target branches

to all changes: