Merge lp:~ken-vandine/account-plugins/facebook_contacts into lp:account-plugins

Proposed by Ken VanDine on 2013-06-27
Status: Merged
Approved by: Alberto Mardegan on 2013-06-27
Approved revision: 123
Merged at revision: 123
Proposed branch: lp:~ken-vandine/account-plugins/facebook_contacts
Merge into: lp:account-plugins
Diff against target: 47 lines (+11/-0)
4 files modified
Makefile.am (+1/-0)
data/services/Makefile.am (+1/-0)
data/services/facebook-contacts.service.in (+8/-0)
debian/account-plugin-facebook.install (+1/-0)
To merge this branch: bzr merge lp:~ken-vandine/account-plugins/facebook_contacts
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) 2013-06-27 Approve on 2013-06-27
PS Jenkins bot (community) continuous-integration Approve on 2013-06-27
Review via email: mp+171810@code.launchpad.net

Commit message

added new service for facebook-contacts

Description of the change

added new service for facebook-contacts

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Alberto Mardegan (mardy) :
review: Approve

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 2013-06-06 11:41:25 +0000
3+++ Makefile.am 2013-06-27 14:20:44 +0000
4@@ -80,6 +80,7 @@
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-contacts.service.in \
9 data/services/facebook-im.service.in \
10 data/services/facebook-microblog.service.in \
11 data/services/facebook-sharing.service.in \
12
13=== modified file 'data/services/Makefile.am'
14--- data/services/Makefile.am 2012-10-04 14:18:34 +0000
15+++ data/services/Makefile.am 2013-06-27 14:20:44 +0000
16@@ -3,6 +3,7 @@
17 $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
18
19 services_in_files = \
20+ facebook-contacts.service.in \
21 facebook-im.service.in \
22 facebook-microblog.service.in \
23 facebook-sharing.service.in \
24
25=== added file 'data/services/facebook-contacts.service.in'
26--- data/services/facebook-contacts.service.in 1970-01-01 00:00:00 +0000
27+++ data/services/facebook-contacts.service.in 2013-06-27 14:20:44 +0000
28@@ -0,0 +1,8 @@
29+<?xml version="1.0" encoding="UTF-8" ?>
30+<service id="facebook-contacts">
31+ <type>contacts</type>
32+ <name>Facebook</name>
33+ <icon>facebook</icon>
34+ <provider>facebook</provider>
35+ <translations>account-plugins</translations>
36+</service>
37
38=== modified file 'debian/account-plugin-facebook.install'
39--- debian/account-plugin-facebook.install 2013-06-07 11:56:25 +0000
40+++ debian/account-plugin-facebook.install 2013-06-27 14:20:44 +0000
41@@ -1,5 +1,6 @@
42 etc/signon-ui/webkit-options.d/www.facebook.com.conf
43 usr/share/accounts/services/facebook-sharing.service
44+usr/share/accounts/services/facebook-contacts.service
45 usr/share/accounts/services/facebook-microblog.service
46 usr/share/accounts/services/facebook-im.service
47 usr/share/accounts/providers/facebook.provider

Subscribers

People subscribed via source and target branches

to all changes: