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

[Ken VanDine]

Dropped patches used for unity and UOA integration. Also dropped all the UOA related packages.

[lp:~ken-vandine/empathy/no_unity_no_uoa]

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

=== removed file 'debian/account-plugin-aim.install'
--- debian/account-plugin-aim.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-aim.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/aim.provider
-usr/share/accounts/services/aim-im.service

=== removed file 'debian/account-plugin-gadugadu.install'
--- debian/account-plugin-gadugadu.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-gadugadu.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/gadugadu.provider
-usr/share/accounts/services/gadugadu-im.service

=== removed file 'debian/account-plugin-groupwise.install'
--- debian/account-plugin-groupwise.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-groupwise.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/groupwise.provider
-usr/share/accounts/services/groupwise-im.service

=== removed file 'debian/account-plugin-icq.install'
--- debian/account-plugin-icq.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-icq.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/icq.provider
-usr/share/accounts/services/icq-im.service

=== removed file 'debian/account-plugin-irc.install'
--- debian/account-plugin-irc.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-irc.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/irc.provider
-usr/share/accounts/services/irc-im.service

=== removed file 'debian/account-plugin-jabber.install'
--- debian/account-plugin-jabber.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-jabber.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/jabber.provider
-usr/share/accounts/services/jabber-im.service

=== removed file 'debian/account-plugin-mxit.install'
--- debian/account-plugin-mxit.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-mxit.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/mxit.provider
-usr/share/accounts/services/mxit-im.service

=== removed file 'debian/account-plugin-myspace.install'
--- debian/account-plugin-myspace.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-myspace.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/myspace.provider
-usr/share/accounts/services/myspace-im.service

=== removed file 'debian/account-plugin-salut.install'
--- debian/account-plugin-salut.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-salut.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/local-xmpp.provider
-usr/share/accounts/services/local-xmpp-im.service

=== removed file 'debian/account-plugin-sametime.install'
--- debian/account-plugin-sametime.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-sametime.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/sametime.provider
-usr/share/accounts/services/sametime-im.service

=== removed file 'debian/account-plugin-sip.install'
--- debian/account-plugin-sip.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-sip.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/sip.provider
-usr/share/accounts/services/sip-im.service

=== removed file 'debian/account-plugin-yahoo.install'
--- debian/account-plugin-yahoo.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-yahoo.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/yahoo.provider
-usr/share/accounts/services/yahoo-im.service

=== removed file 'debian/account-plugin-yahoojp.install'
--- debian/account-plugin-yahoojp.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-yahoojp.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/yahoojp.provider
-usr/share/accounts/services/yahoojp-im.service

=== removed file 'debian/account-plugin-zephyr.install'
--- debian/account-plugin-zephyr.install	2013-05-31 10:25:14 +0000
+++ debian/account-plugin-zephyr.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/accounts/providers/zephyr.provider
-usr/share/accounts/services/zephyr-im.service

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-29 14:23:36 +0000
+++ debian/changelog	2017-05-02 18:19:56 +0000
@@ -1,3 +1,23 @@
+empathy (3.12.13-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Dropped unity related patches
+    -debian/patches/23_idomessagedialog_for_voip_and_ft.patch
+    -debian/patches/41_unity_launcher_progress.patch
+    -debian/patches/43_quicklists.patch
+  * Dropped UOA patch
+    -debian/patches/ubuntu_launch_uoa_panel.patch
+  * Dropped notify-osd icons patch
+    -debian/patches/10_use_notify_osd_icons.patch
+  * debian/control
+    - Removed account-plugin-*, and other UOA related packages.  Include GOA
+      plugin in the empathy package as there's no benefit to splitting it out
+      without UOA
+  * debian/compat
+    - bumped to 9
+
+ -- Ken VanDine <[e-mail]>  Thu, 27 Apr 2017 14:40:30 -0400
+
 empathy (3.12.12-3ubuntu1) yakkety; urgency=medium
 
   * Merge with Debian. Remaining changes:

=== modified file 'debian/compat'
--- debian/compat	2014-11-17 16:41:01 +0000
+++ debian/compat	2017-05-02 18:19:56 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2016-09-29 14:23:30 +0000
+++ debian/control	2017-05-02 18:19:56 +0000
@@ -47,11 +47,6 @@
                libgoa-1.0-dev (>= 3.8),
                libchamplain-gtk-0.12-dev (>= 0.12.1),
                libsecret-1-dev,
-               libido3-0.1-dev (>= 0.2.90),
-               libaccount-plugin-1.0-dev,
-               libsignon-glib-dev (>= 1.8),
-               libaccounts-glib-dev (>= 1.1),
-               libunity-dev (>= 5.0.0)
 Standards-Version: 3.9.8
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/empathy/ubuntu
 Homepage: https://wiki.gnome.org/Apps/Empathy
@@ -73,10 +68,54 @@
             gvfs-backends,
             sound-theme-freedesktop,
             gnome-contacts,
-            mcp-account-manager-uoa | mcp-account-manager-goa,
 Suggests: vino,
           telepathy-idle
-Replaces: libempathy-gtk-common
+Breaks: account-plugin-gadugadu (<< 3.12.12-3ubuntu2),
+        account-plugin-groupwise (<< 3.12.12-3ubuntu2),
+        account-plugin-icq (<< 3.12.12-3ubuntu2),
+        account-plugin-irc (<< 3.12.12-3ubuntu2),
+        account-plugin-jabber (<< 3.12.12-3ubuntu2),
+        account-plugin-mxit (<< 3.12.12-3ubuntu2),
+        account-plugin-myspace (<< 3.12.12-3ubuntu2),
+        account-plugin-salut (<< 3.12.12-3ubuntu2),
+        account-plugin-sametime (<< 3.12.12-3ubuntu2),
+        account-plugin-sip (<< 3.12.12-3ubuntu2),
+        account-plugin-yahoo (<< 3.12.12-3ubuntu2),
+        account-plugin-yahoojp (<< 3.12.12-3ubuntu2),
+        account-plugin-zephyr (<< 3.12.12-3ubuntu2),
+        mcp-account-manager-goa (<< 3.12.12-3ubuntu2),
+        mcp-account-manager-uoa (<< 3.12.12-3ubuntu2),
+Replaces: account-plugin-gadugadu (<< 3.12.12-3ubuntu2),
+          account-plugin-groupwise (<< 3.12.12-3ubuntu2),
+          account-plugin-icq (<< 3.12.12-3ubuntu2),
+          account-plugin-irc (<< 3.12.12-3ubuntu2),
+          account-plugin-jabber (<< 3.12.12-3ubuntu2),
+          account-plugin-mxit (<< 3.12.12-3ubuntu2),
+          account-plugin-myspace (<< 3.12.12-3ubuntu2),
+          account-plugin-salut (<< 3.12.12-3ubuntu2),
+          account-plugin-sametime (<< 3.12.12-3ubuntu2),
+          account-plugin-sip (<< 3.12.12-3ubuntu2),
+          account-plugin-yahoo (<< 3.12.12-3ubuntu2),
+          account-plugin-yahoojp (<< 3.12.12-3ubuntu2),
+          account-plugin-zephyr (<< 3.12.12-3ubuntu2),
+          libempathy-gtk-common,
+          mcp-account-manager-goa (<< 3.12.12-3ubuntu2),
+          mcp-account-manager-uoa (<< 3.12.12-3ubuntu2),
+Provides: account-plugin-gadugadu,
+          account-plugin-groupwise,
+          account-plugin-icq,
+          account-plugin-irc,
+          account-plugin-jabber,
+          account-plugin-mxit,
+          account-plugin-myspace,
+          account-plugin-salut,
+          account-plugin-sametime,
+          account-plugin-sip,
+          account-plugin-yahoo,
+          account-plugin-yahoojp,
+          account-plugin-zephyr,
+          mcp-account-manager-goa,
+          mcp-account-manager-uoa,
 Description: GNOME multi-protocol chat and call client
  Instant messaging program supporting text, voice, video, file transfers
  and inter-application communication over many different protocols,
@@ -100,301 +139,3 @@
  .
  This package contains the architecture independent files for Empathy
  IM application.
-
-Package: mcp-account-manager-goa
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version})
-Description: GNOME multi-protocol chat and call client (GOA plugin)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains GNOME Online Accounts plugin for Mission Control.
-
-Package: mcp-account-manager-uoa
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         signon-plugin-password,
-         telepathy-mission-control-5 (>= 1:5.13.0-0ubuntu3)
-Recommends: ubuntu-control-center-signon,
-            account-plugin-aim,
-            account-plugin-jabber, 
-            account-plugin-google,
-            account-plugin-yahoo, 
-            account-plugin-salut 
-Suggests: account-plugin-gadugadu,
-          account-plugin-groupwise,
-          account-plugin-icq,
-          account-plugin-irc,
-          account-plugin-mxit,
-          account-plugin-myspace,
-          account-plugin-sametime,
-          account-plugin-sip,
-          account-plugin-yahoojp,
-          account-plugin-zephyr
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: GNOME multi-protocol chat and call client (UOA plugin)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains Ubuntu Online Accounts plugin for Mission Control.
-
-Package: account-plugin-aim
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-haze,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for AIM
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.
-
-Package: account-plugin-gadugadu
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-haze,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for GaduGadu
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.
-
-Package: account-plugin-groupwise
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-haze,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for Groupwise
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.
-
-Package: account-plugin-icq
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-haze,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for ICQ
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.
-
-Package: account-plugin-irc
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-idle,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for IRC
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.
-
-Package: account-plugin-jabber
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-gabble,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for Jabber/XMPP
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.
-
-Package: account-plugin-mxit
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-haze,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for Mxit
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.
-
-Package: account-plugin-myspace
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-haze,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for MySpace
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.
-
-Package: account-plugin-salut
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-salut,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for Local XMPP (Salut)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.
-
-Package: account-plugin-sametime
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-haze,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for Sametime
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.
-
-Package: account-plugin-sip
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-rakia,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for SIP
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.
-
-Package: account-plugin-yahoo
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-haze,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for Yahoo!
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.
-
-Package: account-plugin-yahoojp
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-haze,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for Yahoo Japan
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.
-
-Package: account-plugin-zephyr
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         empathy (= ${binary:Version}),
-         telepathy-haze,
-         mcp-account-manager-uoa,
-         unity-asset-pool (>> 0.8.24daily13.03.20.1)
-Breaks: account-plugin-empathy
-Replaces: account-plugin-empathy
-Description: Messaging account plugin for Zephyr
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
- Groupwise and ICQ.
- .
- This package contains UOA account plugins for the Empathy IM application.

=== modified file 'debian/empathy.install'
--- debian/empathy.install	2014-09-24 22:31:17 +0000
+++ debian/empathy.install	2017-05-02 18:19:56 +0000
@@ -9,4 +9,4 @@
 usr/share/GConf/gsettings/empathy.convert
 usr/share/glib-2.0/schemas/org.gnome.Empathy.gschema.xml
 usr/share/glib-2.0/schemas/org.gnome.telepathy-account-widgets.gschema.xml
-debian/indicators/empathy /usr/share/indicators/messages/applications/
+usr/lib/mission-control-plugins.0

=== removed file 'debian/mcp-account-manager-goa.install'
--- debian/mcp-account-manager-goa.install	2012-08-09 21:28:11 +0000
+++ debian/mcp-account-manager-goa.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/mission-control-plugins.0/mcp-account-manager-goa.*

=== removed file 'debian/mcp-account-manager-uoa.install'
--- debian/mcp-account-manager-uoa.install	2013-05-31 10:25:14 +0000
+++ debian/mcp-account-manager-uoa.install	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-usr/lib/mission-control-plugins.0/mcp-account-manager-uoa.*
-usr/lib/libaccount-plugin-1.0/applications
-usr/lib/libaccount-plugin-1.0/providers/libempathy-accounts-plugin.so
-usr/share/accounts/applications

=== removed file 'debian/patches/10_use_notify_osd_icons.patch'
--- debian/patches/10_use_notify_osd_icons.patch	2014-09-24 06:05:14 +0000
+++ debian/patches/10_use_notify_osd_icons.patch	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-Description: Use the notify-osd image for new message notifications
-Bug: https://bugs.launchpad.net/ubuntu/+source/empathy/+bug/409828
-
-=== modified file 'libempathy-gtk/empathy-images.h'
----
- libempathy-gtk/empathy-images.h   |    1 +
- libempathy-gtk/empathy-ui-utils.c |    3 +++
- src/empathy-event-manager.c       |    4 ++--
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
---- a/libempathy-gtk/empathy-images.h
-+++ b/libempathy-gtk/empathy-images.h
-@@ -37,6 +37,7 @@ G_BEGIN_DECLS
- 
- #define EMPATHY_IMAGE_MESSAGE             "im-message"
- #define EMPATHY_IMAGE_NEW_MESSAGE         "im-message-new"
-+#define EMPATHY_IMAGE_NEW_MESSAGE_NOTIFY  "notification-message-im"
- #define EMPATHY_IMAGE_TYPING              "user-typing"
- #define EMPATHY_IMAGE_CONTACT_INFORMATION "gtk-info"
- #define EMPATHY_IMAGE_GROUP_MESSAGE       "system-users"
---- a/libempathy-gtk/empathy-ui-utils.c
-+++ b/libempathy-gtk/empathy-ui-utils.c
-@@ -60,6 +60,9 @@ empathy_gtk_init (void)
-   gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-       PKGDATADIR G_DIR_SEPARATOR_S "icons");
- 
-+  gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-+      DATADIR G_DIR_SEPARATOR_S "notify-osd" G_DIR_SEPARATOR_S "icons");
-+
-   /* Add icons from source dir if available */
-   if (g_getenv ("EMPATHY_SRCDIR") != NULL)
-     {
---- a/src/empathy-event-manager.c
-+++ b/src/empathy-event-manager.c
-@@ -560,11 +560,11 @@ event_manager_chat_message_received_cb (
-   msg = empathy_message_get_body (message);
- 
-   if (event != NULL)
--    event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE, header,
-+    event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE_NOTIFY, header,
-         msg);
-   else
-     event_manager_add (approval->manager, NULL, sender,
--        EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_NEW_MESSAGE, header, msg,
-+        EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_NEW_MESSAGE_NOTIFY, header, msg,
-         approval, event_text_channel_process_func, NULL);
- 
-   empathy_sound_manager_play (priv->sound_mgr, NULL,

=== removed file 'debian/patches/23_idomessagedialog_for_voip_and_ft.patch'
--- debian/patches/23_idomessagedialog_for_voip_and_ft.patch	2015-06-17 03:50:03 +0000
+++ debian/patches/23_idomessagedialog_for_voip_and_ft.patch	1970-01-01 00:00:00 +0000
@@ -1,203 +0,0 @@
-Description: Use ido to provide messages for calls and file transfers
-
-=== modified file 'configure.ac'
-Index: empathy-3.12.10/configure.ac
-===================================================================
---- empathy-3.12.10.orig/configure.ac
-+++ empathy-3.12.10/configure.ac
-@@ -68,6 +68,7 @@ GCR_REQUIRED=2.91.4
- LIBCANBERRA_GTK_REQUIRED=0.25
- LIBNOTIFY_REQUIRED=0.7.0
- TELEPATHY_LOGGER=0.8.0
-+IDO_REQUIRED=0.2.90
- WEBKIT_REQUIRED=1.9.1
- GOA_REQUIRED=3.5.1
- 
-@@ -224,6 +225,7 @@ PKG_CHECK_MODULES(EMPATHY,
-    libxml-2.0
-    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-    telepathy-logger-0.2 >= $TELEPATHY_LOGGER
-+   libido3-0.1 >= $IDO_REQUIRED
-    x11
-    gtk+-3.0 >= $GTK_REQUIRED
-    libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED
-Index: empathy-3.12.10/src/empathy-event-manager.c
-===================================================================
---- empathy-3.12.10.orig/src/empathy-event-manager.c
-+++ empathy-3.12.10/src/empathy-event-manager.c
-@@ -39,6 +39,8 @@
- #include "empathy-ui-utils.h"
- #include "empathy-utils.h"
- 
-+#include <libido/idomessagedialog.h>
-+
- #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
- #include "empathy-debug.h"
- 
-@@ -249,6 +251,17 @@ event_manager_add (EmpathyEventManager *
-       return;
-     }
- 
-+  /* auto approve voip calls and file transfers to raise the idomessagedialog */
-+  if (type == EMPATHY_EVENT_TYPE_CALL || type == EMPATHY_EVENT_TYPE_TRANSFER)
-+    {
-+      /* Don't fire the 'event-added' signal as we activate the event now */
-+      if (approval != NULL)
-+        approval->auto_approved = TRUE;
-+
-+      empathy_event_activate (&event->public);
-+      return;
-+    }
-+
-   g_signal_emit (event->manager, signals[EVENT_ADDED], 0, event);
- 
-   if (!event->public.must_ack)
-@@ -416,6 +429,7 @@ reject_approval (EventManagerApproval *a
-     }
- }
- 
-+
- static void
- event_manager_call_window_confirmation_dialog_response_cb (GtkDialog *dialog,
-   gint response, gpointer user_data)
-@@ -441,6 +455,68 @@ event_manager_call_window_confirmation_d
-     }
- }
- 
-+
-+static void
-+event_channel_process_ft_func (EventPriv *event)
-+{
-+  GtkWidget *dialog;
-+  GtkWidget *button;
-+  GtkWidget *image;
-+  gint width, height;
-+  GdkPixbuf *avatar;
-+
-+  if (event->approval->dialog != NULL)
-+    {
-+      gtk_window_present (GTK_WINDOW (event->approval->dialog));
-+      return;
-+    }
-+
-+  dialog = ido_message_dialog_new (NULL,
-+                                   GTK_DIALOG_MODAL,
-+                                   GTK_MESSAGE_QUESTION,
-+                                   GTK_BUTTONS_NONE,
-+                                   _("Incoming file transfer from %s"),
-+                                   empathy_contact_get_alias (event->approval->contact));
-+  gtk_message_dialog_format_secondary_markup (GTK_WINDOW (dialog), _("%s is sending you a file. Do you want to accept it?"),
-+                                              empathy_contact_get_alias (event->approval->contact));
-+
-+  avatar = empathy_pixbuf_avatar_from_contact_scaled (event->approval->contact, 48, 48);
-+  if (avatar != NULL)
-+  {
-+    image = gtk_image_new_from_pixbuf (avatar);
-+  } else {
-+    /* Set image of the dialog */
-+    image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_DOCUMENT_SEND,
-+          GTK_ICON_SIZE_DIALOG);
-+  }
-+
-+  gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
-+  gtk_widget_show (image);
-+
-+  gtk_dialog_set_default_response (GTK_DIALOG (dialog),
-+      GTK_RESPONSE_OK);
-+
-+  button = gtk_dialog_add_button (GTK_DIALOG (dialog),
-+      _("_Reject"), GTK_RESPONSE_REJECT);
-+  image = gtk_image_new_from_icon_name ("stop",
-+    GTK_ICON_SIZE_BUTTON);
-+  gtk_button_set_image (GTK_BUTTON (button), image);
-+
-+  button = gtk_dialog_add_button (GTK_DIALOG (dialog),
-+      _("_Accept"), GTK_RESPONSE_ACCEPT);
-+
-+  image = gtk_image_new_from_icon_name ("filesaveas.png", GTK_ICON_SIZE_BUTTON);
-+  gtk_button_set_image (GTK_BUTTON (button), image);
-+
-+  g_signal_connect (dialog, "response",
-+      G_CALLBACK (event_manager_call_window_confirmation_dialog_response_cb),
-+      event->approval);
-+
-+  gtk_widget_show (dialog);
-+
-+  event->approval->dialog = dialog;
-+}
-+
- static void
- event_channel_process_voip_func (EventPriv *event)
- {
-@@ -448,7 +524,8 @@ event_channel_process_voip_func (EventPr
-   GtkWidget *button;
-   GtkWidget *image;
-   gboolean video;
--  gchar *title;
-+  gint width, height;
-+  GdkPixbuf *avatar;
-   EmpathyEventType etype = event->public.type;
- 
-   if (event->approval->dialog != NULL)
-@@ -469,33 +546,33 @@ event_channel_process_voip_func (EventPr
-       return;
-     }
- 
--  dialog = gtk_message_dialog_new (NULL, 0,
--      GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
--      video ? _("Incoming video call"): _("Incoming call"));
--
--  gtk_message_dialog_format_secondary_text (
--    GTK_MESSAGE_DIALOG (dialog), video ?
--      _("%s is video calling you. Do you want to answer?"):
--      _("%s is calling you. Do you want to answer?"),
--      empathy_contact_get_alias (event->approval->contact));
--
--  title = g_strdup_printf (_("Incoming call from %s"),
--      empathy_contact_get_alias (event->approval->contact));
--
--  gtk_window_set_title (GTK_WINDOW (dialog), title);
--  g_free (title);
--
--  /* Set image of the dialog */
--  if (video)
-+  dialog = ido_message_dialog_new (NULL,
-+                                              GTK_DIALOG_MODAL,
-+                                              GTK_MESSAGE_QUESTION,
-+                                              GTK_BUTTONS_NONE,
-+                                              video ? _("Incoming video call from %s"): _("Incoming call from %s"), empathy_contact_get_alias (event->approval->contact));
-+  gtk_message_dialog_format_secondary_markup (GTK_WINDOW (dialog), video ?
-+                                              _("%s is video calling you. Do you want to answer?"):
-+                                              _("%s is calling you. Do you want to answer?"),
-+                                              empathy_contact_get_alias (event->approval->contact));
-+
-+  avatar = empathy_pixbuf_avatar_from_contact_scaled (event->approval->contact, 48, 48);
-+  if (avatar != NULL)
-+  {
-+    image = gtk_image_new_from_pixbuf (avatar);
-+  } else {
-+    /* Set image of the dialog */
-+    if (video)
-     {
-       image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VIDEO_CALL,
-           GTK_ICON_SIZE_DIALOG);
-     }
--  else
-+    else
-     {
-       image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VOIP,
-           GTK_ICON_SIZE_DIALOG);
-     }
-+  }
- 
-   gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
-   gtk_widget_show (image);
-@@ -923,7 +1000,7 @@ approve_ft_channel (EmpathyEventManager
-   event_manager_add (approval->manager, NULL,
-       approval->contact, EMPATHY_EVENT_TYPE_TRANSFER,
-       EMPATHY_IMAGE_DOCUMENT_SEND, header, NULL,
--      approval, event_channel_process_func, NULL);
-+      approval, event_channel_process_ft_func, NULL);
- 
-   /* FIXME better sound for incoming file transfers ?*/
-   empathy_sound_manager_play (priv->sound_mgr, NULL,

=== removed file 'debian/patches/41_unity_launcher_progress.patch'
--- debian/patches/41_unity_launcher_progress.patch	2015-06-17 03:50:03 +0000
+++ debian/patches/41_unity_launcher_progress.patch	1970-01-01 00:00:00 +0000
@@ -1,251 +0,0 @@
-Description: Add Unity support to show file transfer progress in the launcher
-
-=== modified file 'configure.ac'
----
- configure.ac             |   30 +++++++++++++++++++
- src/Makefile.am          |    3 +
- src/empathy-ft-manager.c |   71 +++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 104 insertions(+)
-
-Index: empathy-3.12.10/configure.ac
-===================================================================
---- empathy-3.12.10.orig/configure.ac
-+++ empathy-3.12.10/configure.ac
-@@ -79,6 +79,7 @@ GEOCODE_GLIB_REQUIRED=0.99.1
- ISO_CODES_REQUIRED=0.35
- NAUTILUS_SENDTO_REQUIRED=2.90.0
- NETWORK_MANAGER_REQUIRED=0.7.0
-+UNITY_REQUIRED=3.4.0
- CHAMPLAIN_REQUIRED=0.12.1
- CHEESE_GTK_REQUIRED=3.4.0
- LIBACCOUNTS_REQUIRED=1.4
-@@ -346,6 +347,34 @@ fi
- 
- AM_CONDITIONAL(HAVE_ENCHANT, test "x$have_enchant" = "xyes")
- 
-+# libunity
-+# -----------------------------------------------------------
-+AC_ARG_ENABLE(libunity,
-+               AS_HELP_STRING([--enable-libunity=@<:@no/yes/auto@:>@],
-+                       [build libunity support]), ,
-+                       enable_libunity=auto)
-+
-+if test "x$enable_unity" != "xno"; then
-+   PKG_CHECK_MODULES(UNITY,
-+   [
-+     unity >= $UNITY_REQUIRED
-+   ], have_unity="yes", have_unity="no")
-+
-+   if test "x$have_unity" = "xyes"; then
-+      AC_DEFINE(HAVE_UNITY, 1, [Define if you have unity])
-+   fi
-+else
-+   have_unity=no
-+fi
-+
-+if test "x$enable_unity" = "xyes" -a "x$have_unity" != "xyes"; then
-+   AC_MSG_ERROR([Could not find libunity.])
-+fi
-+
-+AM_CONDITIONAL(HAVE_UNITY, test "x$have_unity" = "xyes")
-+AC_SUBST([UNITY_CFLAGS])
-+AC_SUBST([UNITY_LIBS])
-+
- # -----------------------------------------------------------
- # Map view checks: libchamplain
- # -----------------------------------------------------------
-@@ -632,6 +661,7 @@ Configure summary:
- 	Display maps (libchamplain).:  ${have_libchamplain}
- 	Location awareness (Geoclue):  ${have_geoclue}
- 	Geocode support (Geocode)...:  ${have_geocode}
-+	Unity panel support (unity).:  ${have_unity}
- 	Cheese webcam support ......:  ${have_cheese}
- 	Camera monitoring...........:  ${have_gudev}
- 
-Index: empathy-3.12.10/src/Makefile.am
-===================================================================
---- empathy-3.12.10.orig/src/Makefile.am
-+++ empathy-3.12.10/src/Makefile.am
-@@ -18,6 +18,7 @@ CPPFLAGS_COMMON =					\
- AM_LDFLAGS = $(LIBM)
- AM_CPPFLAGS =						\
- 	$(CPPFLAGS_COMMON)				\
-+	$(UNITY_CFLAGS)					\
- 	$(LIBCHAMPLAIN_CFLAGS)				\
- 	$(UOA_CFLAGS)					\
- 	$(NULL)
-@@ -28,6 +29,7 @@ LDADD =								\
- 	$(top_builddir)/extensions/libemp-extensions.la		\
- 	$(GCR_LIBS) 						\
- 	$(EMPATHY_LIBS)						\
-+	$(UNITY_LIBS)						\
- 	$(TPAW_LIBS)						\
- 	$(LIBCHAMPLAIN_LIBS)					\
- 	$(UOA_LIBS)						\
-@@ -169,6 +171,7 @@ empathy_LDADD =								\
-         $(top_builddir)/libempathy/libempathy.la			\
-         $(top_builddir)/extensions/libemp-extensions.la			\
-         $(EMPATHY_LIBS)							\
-+	$(UNITY_LIBS)							\
-         $(LIBCHAMPLAIN_LIBS)						\
- 	$(NULL)
- 
-Index: empathy-3.12.10/src/empathy-ft-manager.c
-===================================================================
---- empathy-3.12.10.orig/src/empathy-ft-manager.c
-+++ empathy-3.12.10/src/empathy-ft-manager.c
-@@ -40,6 +40,8 @@
- #define DEBUG_FLAG EMPATHY_DEBUG_FT
- #include "empathy-debug.h"
- 
-+#include <unity.h>
-+
- enum
- {
-   COL_PERCENT,
-@@ -59,6 +61,7 @@ typedef struct {
-   GtkWidget *open_button;
-   GtkWidget *abort_button;
-   GtkWidget *clear_button;
-+  UnityLauncherEntry *launcher;
- } EmpathyFTManagerPriv;
- 
- enum
-@@ -78,6 +81,53 @@ static EmpathyFTManager *manager_singlet
- static void ft_handler_hashing_started_cb (EmpathyFTHandler *handler,
-     EmpathyFTManager *manager);
- 
-+static gchar * ft_manager_format_progress_bytes_and_percentage (
-+                                                 guint64 current,
-+                                                 guint64 total,
-+                                                 gdouble speed,
-+                                                 int *percentage);
-+
-+static void
-+ft_update_unity_launcher (EmpathyFTManager *manager)
-+{
-+  EmpathyFTManagerPriv *priv;
-+
-+  priv = GET_PRIV (manager);
-+  g_return_if_fail (priv->launcher != NULL);
-+
-+  guint64 current_bytes = 0;
-+  guint64 total_bytes = 0;
-+  int percentage;
-+  gdouble progress;
-+  GHashTableIter iter;
-+  gpointer handler;
-+
-+  g_hash_table_iter_init (&iter, priv->ft_handler_to_row_ref);
-+  while (g_hash_table_iter_next (&iter, &handler, NULL)) 
-+  {
-+      if (!empathy_ft_handler_is_completed (handler) &&
-+          !empathy_ft_handler_is_cancelled (handler))
-+      {
-+          current_bytes = current_bytes + empathy_ft_handler_get_transferred_bytes (handler);
-+          total_bytes = total_bytes + empathy_ft_handler_get_total_bytes (handler);
-+      }
-+  }
-+  ft_manager_format_progress_bytes_and_percentage (current_bytes, total_bytes, -1, &percentage);
-+
-+  progress = percentage;
-+  progress = progress / 100;
-+
-+  unity_launcher_entry_set_progress (priv->launcher, progress);
-+  if (progress > 0 && progress < 100)
-+  {
-+    unity_launcher_entry_set_progress_visible (priv->launcher, TRUE);
-+  } 
-+  else 
-+  {
-+    unity_launcher_entry_set_progress_visible (priv->launcher, FALSE);
-+  }
-+}
-+
- static gchar *
- ft_manager_format_interval (guint interval)
- {
-@@ -387,6 +437,8 @@ ft_manager_update_handler_progress (Empa
-       COL_PERCENT, percentage,
-       -1);
- 
-+  ft_update_unity_launcher (manager);
-+
-   gtk_tree_path_free (path);
- 
- }
-@@ -453,6 +505,8 @@ ft_handler_transfer_error_cb (EmpathyFTH
-   ft_manager_clear_handler_time (manager, row_ref);
-   ft_manager_update_buttons (manager);
- 
-+  ft_update_unity_launcher (manager);
-+
-   g_free (message);
- }
- 
-@@ -460,6 +514,7 @@ static void
- do_real_transfer_done (EmpathyFTManager *manager,
-                        EmpathyFTHandler *handler)
- {
-+  EmpathyFTManagerPriv *priv;
-   const char *contact_name;
-   const char *filename;
-   char *first_line, *second_line, *message;
-@@ -469,6 +524,8 @@ do_real_transfer_done (EmpathyFTManager
-   GtkRecentManager *recent_manager;
-   GFile *file;
- 
-+  priv = GET_PRIV (manager); 
-+
-   row_ref = ft_manager_get_row_from_handler (manager, handler);
-   g_return_if_fail (row_ref != NULL);
- 
-@@ -494,6 +551,8 @@ do_real_transfer_done (EmpathyFTManager
-   ft_manager_update_handler_message (manager, row_ref, message);
-   ft_manager_clear_handler_time (manager, row_ref);
- 
-+  ft_update_unity_launcher (manager);
-+
-   /* update buttons */
-   ft_manager_update_buttons (manager);
- 
-@@ -530,6 +589,8 @@ ft_handler_transfer_done_cb (EmpathyFTHa
-   DEBUG ("Transfer done, no hashing");
- 
-   do_real_transfer_done (manager, handler);
-+
-+  ft_update_unity_launcher (manager);
- }
- 
- static void
-@@ -571,6 +632,8 @@ ft_handler_transfer_started_cb (EmpathyF
-                                 TpFileTransferChannel *channel,
-                                 EmpathyFTManager *manager)
- {
-+  EmpathyFTManagerPriv *priv;
-+  priv = GET_PRIV (manager);
-   guint64 transferred_bytes, total_bytes;
- 
-   DEBUG ("Transfer started");
-@@ -1078,6 +1141,12 @@ empathy_ft_manager_finalize (GObject *ob
- 
-   g_hash_table_unref (priv->ft_handler_to_row_ref);
- 
-+  if (priv->launcher != NULL)
-+  {
-+    g_object_unref(priv->launcher);
-+    priv->launcher = NULL;
-+  }
-+ 
-   G_OBJECT_CLASS (empathy_ft_manager_parent_class)->finalize (object);
- }
- 
-@@ -1095,6 +1164,8 @@ empathy_ft_manager_init (EmpathyFTManage
-       g_direct_equal, (GDestroyNotify) g_object_unref,
-       (GDestroyNotify) gtk_tree_row_reference_free);
- 
-+  priv->launcher = unity_launcher_entry_get_for_desktop_id ("empathy.desktop");
-+
-   ft_manager_build_ui (manager);
- }
- 

=== removed file 'debian/patches/43_quicklists.patch'
--- debian/patches/43_quicklists.patch	2014-04-03 15:01:20 +0000
+++ debian/patches/43_quicklists.patch	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-Description: Add some Unity Quicklists
-
-Index: b/data/empathy.desktop.in.in
-===================================================================
---- a/data/empathy.desktop.in.in
-+++ b/data/empathy.desktop.in.in
-@@ -15,4 +15,21 @@
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=empathy
- X-GNOME-Bugzilla-Component=General
--X-GNOME-Bugzilla-Version=@VERSION@
-+X-GNOME-Bugzilla-Version=@VERSION@8
-+X-MessagingMenu-UsesChatSection=true
-+Actions=Hidden;Prefs;Accounts;
-+
-+[Desktop Action Hidden]
-+_Name=Open Hidden in Background
-+Exec=empathy -h
-+NotShowIn=Messaging Menu
-+
-+[Desktop Action Prefs]
-+_Name=Open Preferences
-+Exec=empathy -p
-+NotShowIn=Messaging Menu
-+
-+[Desktop Action Accounts]
-+_Name=Open Accounts
-+Exec=unity-control-center credentials
-+NotShowIn=Messaging Menu

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-09-29 14:16:37 +0000
+++ debian/patches/series	2017-05-02 18:19:56 +0000
@@ -1,11 +1,6 @@
 00_linker-fixes.patch
-10_use_notify_osd_icons.patch
-23_idomessagedialog_for_voip_and_ft.patch
 34_start_raised_execpt_in_session.patch
 38_default_to_facebook_for_im.patch
 39_default_to_freenode_for_irc.patch
-41_unity_launcher_progress.patch
 42_shell_running.patch
-43_quicklists.patch
-ubuntu_launch_uoa_panel.patch
 clutter-gst-3.0.patch

=== removed file 'debian/patches/ubuntu_launch_uoa_panel.patch'
--- debian/patches/ubuntu_launch_uoa_panel.patch	2016-03-10 07:42:14 +0000
+++ debian/patches/ubuntu_launch_uoa_panel.patch	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-From 906eb708198b655eb04a3eda08cdce58e8558b0c Mon Sep 17 00:00:00 2001
-From: Tim Lunn <[e-mail]>
-Date: Tue, 23 Jul 2013 12:30:11 +1000
-Subject: [PATCH] Check desktop session to determine which accounts panel to
- launch
-
----
- src/empathy-accounts-dialog.c |   14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-Index: empathy-3.12.11/src/empathy-accounts-dialog.c
-===================================================================
---- empathy-3.12.11.orig/src/empathy-accounts-dialog.c
-+++ empathy-3.12.11/src/empathy-accounts-dialog.c
-@@ -2684,8 +2684,9 @@ launch_uoa_panel (TpAccount *selected_ac
-   g_object_unref (manager);
- }
- 
--#else /* HAVE_UOA */
-+#endif /* HAVE_UOA */
- 
-+#ifdef HAVE_GOA
- static void
- launch_empathy_accounts (TpAccount *selected_account,
-     gboolean if_needed,
-@@ -2716,7 +2717,33 @@ launch_empathy_accounts (TpAccount *sele
- 
-   g_string_free (args, TRUE);
- }
--#endif /* HAVE_UOA */
-+#endif /* HAVE_GOA */
-+
-+#ifdef HAVE_UOA
-+static gboolean
-+in_desktop (const gchar *name)
-+{
-+  const gchar *desktop_name_list;
-+  gchar **names;
-+  gboolean in_list = FALSE;
-+  gint i;
-+
-+  desktop_name_list = g_getenv ("XDG_CURRENT_DESKTOP");
-+  if (!desktop_name_list)
-+    return FALSE;
-+
-+  names = g_strsplit (desktop_name_list, ":", -1);
-+  for (i = 0; names[i] && !in_list; i++)
-+    if (strcmp (names[i], name) == 0)
-+      {
-+        in_list = TRUE;
-+        break;
-+      }
-+  g_strfreev (names);
-+
-+  return in_list;
-+}
-+#endif
- 
- void
- empathy_accounts_dialog_show_application (GdkScreen *screen,
-@@ -2725,8 +2752,13 @@ empathy_accounts_dialog_show_application
-     gboolean hidden)
- {
- #ifdef HAVE_UOA
--  launch_uoa_panel (selected_account, if_needed, hidden);
--#else
-+  if (in_desktop ("Unity")) {
-+    launch_uoa_panel (selected_account, if_needed, hidden);
-+    return;
-+  }
-+#endif
-+
-+#ifdef HAVE_GOA
-   launch_empathy_accounts (selected_account, if_needed, hidden);
- #endif
- }

=== modified file 'debian/rules'
--- debian/rules	2016-09-29 14:16:37 +0000
+++ debian/rules	2017-05-02 18:19:56 +0000
@@ -38,56 +38,8 @@
 DEB_DH_SHLIBDEPS_ARGS_ALL = -Lempathy
 DEB_DH_STRIP_ARGS = --dbgsym-migration='empathy-dbg (<< 3.12.11-2~)'
 
-binary-post-install/account-plugin-aim::
-	rm -f debian/account-plugin-aim/usr/lib/libaccount-plugin-1.0/*/*a
-
-binary-post-install/account-plugin-gadugadu::
-	rm -f debian/account-plugin-gadugadu/usr/lib/libaccount-plugin-1.0/*/*a
-
-binary-post-install/account-plugin-groupwise::
-	rm -f debian/account-plugin-groupwise/usr/lib/libaccount-plugin-1.0/*/*a
-
-binary-post-install/account-plugin-icq::
-	rm -f debian/account-plugin-icq/usr/lib/libaccount-plugin-1.0/*/*a
-
-binary-post-install/account-plugin-irc::
-	rm -f debian/account-plugin-irc/usr/lib/libaccount-plugin-1.0/*/*a
-
-binary-post-install/account-plugin-jabber::
-	rm -f debian/account-plugin-jabber/usr/lib/libaccount-plugin-1.0/*/*a
-
-binary-post-install/account-plugin-salut::
-	rm -f debian/account-plugin-salut/usr/lib/libaccount-plugin-1.0/*/*a
-
-binary-post-install/account-plugin-mxit::
-	rm -f debian/account-plugin-mxit/usr/lib/libaccount-plugin-1.0/*/*a
-
-binary-post-install/account-plugin-myspace::
-	rm -f debian/account-plugin-myspace/usr/lib/libaccount-plugin-1.0/*/*a
-
-binary-post-install/account-plugin-sametime::
-	rm -f debian/account-plugin-sametime/usr/lib/libaccount-plugin-1.0/*/*a
-
-binary-post-install/account-plugin-sip::
-	rm -f debian/account-plugin-sip/usr/lib/libaccount-plugin-1.0/*/*a
-
-binary-post-install/account-plugin-yahoo::
-	rm -f debian/account-plugin-yahoo/usr/lib/libaccount-plugin-1.0/*/*a
-
-binary-post-install/account-plugin-yahoojp::
-	rm -f debian/account-plugin-yahoojp/usr/lib/libaccount-plugin-1.0/*/*a
-
-binary-post-install/account-plugin-zephyr::
-	rm -f debian/account-plugin-zephyr/usr/lib/libaccount-plugin-1.0/*/*a
-
 binary-post-install/empathy::
 	rm -f debian/empathy/usr/lib/empathy/*.*a
-
-binary-post-install/mcp-account-manager-goa::
-	rm -f debian/mcp-account-manager-goa/usr/lib/mission-control-plugins.0/*.*a
-
-binary-post-install/mcp-account-manager-uoa::
-	rm -f debian/mcp-account-manager-uoa/usr/lib/mission-control-plugins.0/*.*a
-	rm -f debian/mcp-account-manager-uoa/usr/lib/libaccount-plugin-1.0/applications/*a
+	rm -f debian/empathy/usr/lib/mission-control-plugins.0/*.*a
 
 include $(CURDIR)/debian/update-patches.mk

=== modified file 'debian/shlibs.local'
--- debian/shlibs.local	2016-09-29 14:16:37 +0000
+++ debian/shlibs.local	2017-05-02 18:19:56 +0000
@@ -1,2 +1,2 @@
-libempathy-gtk 3.12.12 empathy (= ${binary:Version})
-libempathy 3.12.12 empathy (= ${binary:Version})
+libempathy-gtk 3.12.13 empathy (= ${binary:Version})
+libempathy 3.12.13 empathy (= ${binary:Version})