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
1=== modified file 'Makefile.am'
2--- Makefile.am 2014-09-10 07:47:30 +0000
3+++ Makefile.am 2015-04-17 09:59:46 +0000
4@@ -80,7 +80,6 @@
5 $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
6
7 services_in_files = \
8- data/services/facebook-im.service.in \
9 data/services/facebook-microblog.service.in \
10 data/services/facebook-sharing.service.in \
11 data/services/flickr-microblog.service.in \
12@@ -94,8 +93,7 @@
13 data/services/picasa.service.in \
14 data/services/sina-microblog.service.in \
15 data/services/sohu-microblog.service.in \
16- data/services/twitter-microblog.service.in \
17- data/services/wlm.service.in
18+ data/services/twitter-microblog.service.in
19
20 services_DATA = \
21 $(services_in_files:.service.in=.service)
22
23=== removed file 'data/services/facebook-im.service.in'
24--- data/services/facebook-im.service.in 2012-10-04 14:18:34 +0000
25+++ data/services/facebook-im.service.in 1970-01-01 00:00:00 +0000
26@@ -1,22 +0,0 @@
27-<?xml version="1.0" encoding="UTF-8" ?>
28-<service id="facebook-im">
29- <type>IM</type>
30- <name>Facebook</name>
31- <icon>facebook</icon>
32- <provider>facebook</provider>
33- <translations>account-plugins</translations>
34-
35- <!-- default settings (account settings have precedence over these) -->
36- <template>
37- <group name="telepathy">
38- <setting name="mc-readonly-params" type="b">true</setting>
39- <setting name="manager">gabble</setting>
40- <setting name="protocol">jabber</setting>
41-
42- <setting name="param-account">chat.facebook.com</setting>
43- <setting name="param-server">chat.facebook.com</setting>
44- <setting name="param-fallback-servers">chat.facebook.com:443</setting>
45- </group>
46- </template>
47-
48-</service>
49
50=== removed file 'data/services/wlm.service.in'
51--- data/services/wlm.service.in 2012-10-04 14:18:34 +0000
52+++ data/services/wlm.service.in 1970-01-01 00:00:00 +0000
53@@ -1,22 +0,0 @@
54-<?xml version="1.0" encoding="UTF-8" ?>
55-<service id="wlm">
56- <type>IM</type>
57- <name>Windows Live Messenger</name>
58- <icon>msn</icon>
59- <provider>windows-live</provider>
60- <translations>account-plugins</translations>
61-
62- <!-- default settings (account settings have precedence over these) -->
63- <template>
64- <group name="telepathy">
65- <setting name="mc-readonly-params" type="b">true</setting>
66- <setting name="manager">gabble</setting>
67- <setting name="protocol">jabber</setting>
68-
69- <setting name="param-account">messenger.live.com</setting>
70- <setting name="param-fallback-servers">xmpp.messenger.live.com</setting>
71- <setting name="param-extra-certificate-identities">*.gateway.messenger.live.com</setting>
72- </group>
73- </template>
74-
75-</service>
76
77=== modified file 'debian/account-plugin-facebook.install'
78--- debian/account-plugin-facebook.install 2014-09-10 07:47:30 +0000
79+++ debian/account-plugin-facebook.install 2015-04-17 09:59:46 +0000
80@@ -1,6 +1,5 @@
81 etc/signon-ui/webkit-options.d/www.facebook.com.conf
82 usr/share/accounts/services/facebook-sharing.service
83 usr/share/accounts/services/facebook-microblog.service
84-usr/share/accounts/services/facebook-im.service
85 usr/share/accounts/providers/facebook.provider
86 usr/share/accounts/qml-plugins/facebook/Main.qml
87
88=== modified file 'debian/account-plugin-windows-live.install'
89--- debian/account-plugin-windows-live.install 2013-03-19 14:47:46 +0000
90+++ debian/account-plugin-windows-live.install 2015-04-17 09:59:46 +0000
91@@ -1,3 +1,2 @@
92 etc/signon-ui/webkit-options.d/login.live.com.conf
93-usr/share/accounts/services/wlm.service
94 usr/share/accounts/providers/windows-live.provider
95
96=== modified file 'debian/control'
97--- debian/control 2014-03-25 13:30:39 +0000
98+++ debian/control 2015-04-17 09:59:46 +0000
99@@ -26,7 +26,8 @@
100 signon-plugin-oauth2,
101 Replaces: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
102 Breaks: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
103-Conflicts: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
104+Conflicts: account-plugin-generic-oauth (<< 0.10bzr13.04.30),
105+ account-plugin-windows-live,
106 Description: GNOME Control Center account plugin for single signon - generic OAuth
107 GNOME Control Center account plugins for single signon
108

Subscribers

People subscribed via source and target branches

to all changes: