Merge lp:~mardy/account-plugins/lp1432613 into lp:account-plugins

Proposed by Alberto Mardegan on 2015-04-17
Status: Merged
Approved by: David Barth on 2015-04-17
Approved revision: 148
Merged at revision: 148
Proposed branch: lp:~mardy/account-plugins/lp1432613
Merge into: lp:account-plugins
Diff against target: 107 lines (+3/-50)
6 files modified
Makefile.am (+1/-3)
data/services/facebook-im.service.in (+0/-22)
data/services/wlm.service.in (+0/-22)
debian/account-plugin-facebook.install (+0/-1)
debian/account-plugin-windows-live.install (+0/-1)
debian/control (+2/-1)
To merge this branch: bzr merge lp:~mardy/account-plugins/lp1432613
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2015-04-17
Online Accounts 2015-04-17 Pending
Review via email: mp+256629@code.launchpad.net

Commit message

Remove non-working services

Description of the change

Remove non-working services

To post a comment you must log in.
lp:~mardy/account-plugins/lp1432613 updated on 2015-04-17
149. By Alberto Mardegan on 2015-04-17

Force removal of windows live plugin

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile.am'
--- Makefile.am 2014-09-10 07:47:30 +0000
+++ Makefile.am 2015-04-17 09:59:46 +0000
@@ -80,7 +80,6 @@
80 $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@80 $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
8181
82services_in_files = \82services_in_files = \
83 data/services/facebook-im.service.in \
84 data/services/facebook-microblog.service.in \83 data/services/facebook-microblog.service.in \
85 data/services/facebook-sharing.service.in \84 data/services/facebook-sharing.service.in \
86 data/services/flickr-microblog.service.in \85 data/services/flickr-microblog.service.in \
@@ -94,8 +93,7 @@
94 data/services/picasa.service.in \93 data/services/picasa.service.in \
95 data/services/sina-microblog.service.in \94 data/services/sina-microblog.service.in \
96 data/services/sohu-microblog.service.in \95 data/services/sohu-microblog.service.in \
97 data/services/twitter-microblog.service.in \96 data/services/twitter-microblog.service.in
98 data/services/wlm.service.in
9997
100services_DATA = \98services_DATA = \
101 $(services_in_files:.service.in=.service)99 $(services_in_files:.service.in=.service)
102100
=== removed file 'data/services/facebook-im.service.in'
--- data/services/facebook-im.service.in 2012-10-04 14:18:34 +0000
+++ data/services/facebook-im.service.in 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2<service id="facebook-im">
3 <type>IM</type>
4 <name>Facebook</name>
5 <icon>facebook</icon>
6 <provider>facebook</provider>
7 <translations>account-plugins</translations>
8
9 <!-- default settings (account settings have precedence over these) -->
10 <template>
11 <group name="telepathy">
12 <setting name="mc-readonly-params" type="b">true</setting>
13 <setting name="manager">gabble</setting>
14 <setting name="protocol">jabber</setting>
15
16 <setting name="param-account">chat.facebook.com</setting>
17 <setting name="param-server">chat.facebook.com</setting>
18 <setting name="param-fallback-servers">chat.facebook.com:443</setting>
19 </group>
20 </template>
21
22</service>
230
=== removed file 'data/services/wlm.service.in'
--- data/services/wlm.service.in 2012-10-04 14:18:34 +0000
+++ data/services/wlm.service.in 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2<service id="wlm">
3 <type>IM</type>
4 <name>Windows Live Messenger</name>
5 <icon>msn</icon>
6 <provider>windows-live</provider>
7 <translations>account-plugins</translations>
8
9 <!-- default settings (account settings have precedence over these) -->
10 <template>
11 <group name="telepathy">
12 <setting name="mc-readonly-params" type="b">true</setting>
13 <setting name="manager">gabble</setting>
14 <setting name="protocol">jabber</setting>
15
16 <setting name="param-account">messenger.live.com</setting>
17 <setting name="param-fallback-servers">xmpp.messenger.live.com</setting>
18 <setting name="param-extra-certificate-identities">*.gateway.messenger.live.com</setting>
19 </group>
20 </template>
21
22</service>
230
=== modified file 'debian/account-plugin-facebook.install'
--- debian/account-plugin-facebook.install 2014-09-10 07:47:30 +0000
+++ debian/account-plugin-facebook.install 2015-04-17 09:59:46 +0000
@@ -1,6 +1,5 @@
1etc/signon-ui/webkit-options.d/www.facebook.com.conf1etc/signon-ui/webkit-options.d/www.facebook.com.conf
2usr/share/accounts/services/facebook-sharing.service2usr/share/accounts/services/facebook-sharing.service
3usr/share/accounts/services/facebook-microblog.service3usr/share/accounts/services/facebook-microblog.service
4usr/share/accounts/services/facebook-im.service
5usr/share/accounts/providers/facebook.provider4usr/share/accounts/providers/facebook.provider
6usr/share/accounts/qml-plugins/facebook/Main.qml5usr/share/accounts/qml-plugins/facebook/Main.qml
76
=== modified file 'debian/account-plugin-windows-live.install'
--- debian/account-plugin-windows-live.install 2013-03-19 14:47:46 +0000
+++ debian/account-plugin-windows-live.install 2015-04-17 09:59:46 +0000
@@ -1,3 +1,2 @@
1etc/signon-ui/webkit-options.d/login.live.com.conf1etc/signon-ui/webkit-options.d/login.live.com.conf
2usr/share/accounts/services/wlm.service
3usr/share/accounts/providers/windows-live.provider2usr/share/accounts/providers/windows-live.provider
43
=== modified file 'debian/control'
--- debian/control 2014-03-25 13:30:39 +0000
+++ debian/control 2015-04-17 09:59:46 +0000
@@ -26,7 +26,8 @@
26 signon-plugin-oauth2,26 signon-plugin-oauth2,
27Replaces: account-plugin-generic-oauth (<< 0.10bzr13.04.30)27Replaces: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
28Breaks: account-plugin-generic-oauth (<< 0.10bzr13.04.30)28Breaks: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
29Conflicts: account-plugin-generic-oauth (<< 0.10bzr13.04.30)29Conflicts: account-plugin-generic-oauth (<< 0.10bzr13.04.30),
30 account-plugin-windows-live,
30Description: GNOME Control Center account plugin for single signon - generic OAuth31Description: GNOME Control Center account plugin for single signon - generic OAuth
31 GNOME Control Center account plugins for single signon32 GNOME Control Center account plugins for single signon
3233

Subscribers

People subscribed via source and target branches

to all changes: