Online Accounts: Account plugins

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

  1. facebook_contacts
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Alberto Mardegan
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) Approve
PS Jenkins bot (community) continuous-integration Approve
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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:123
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-saucy-amd64-ci/9

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/15/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alberto Mardegan (mardy) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile.am'
--- Makefile.am 2013-06-06 11:41:25 +0000
+++ Makefile.am 2013-06-27 14:20:44 +0000
@@ -80,6 +80,7 @@
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-contacts.service.in \
83 data/services/facebook-im.service.in \84 data/services/facebook-im.service.in \
84 data/services/facebook-microblog.service.in \85 data/services/facebook-microblog.service.in \
85 data/services/facebook-sharing.service.in \86 data/services/facebook-sharing.service.in \
8687
=== modified file 'data/services/Makefile.am'
--- data/services/Makefile.am 2012-10-04 14:18:34 +0000
+++ data/services/Makefile.am 2013-06-27 14:20:44 +0000
@@ -3,6 +3,7 @@
3 $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@3 $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
44
5services_in_files = \5services_in_files = \
6 facebook-contacts.service.in \
6 facebook-im.service.in \7 facebook-im.service.in \
7 facebook-microblog.service.in \8 facebook-microblog.service.in \
8 facebook-sharing.service.in \9 facebook-sharing.service.in \
910
=== added file 'data/services/facebook-contacts.service.in'
--- data/services/facebook-contacts.service.in 1970-01-01 00:00:00 +0000
+++ data/services/facebook-contacts.service.in 2013-06-27 14:20:44 +0000
@@ -0,0 +1,8 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2<service id="facebook-contacts">
3 <type>contacts</type>
4 <name>Facebook</name>
5 <icon>facebook</icon>
6 <provider>facebook</provider>
7 <translations>account-plugins</translations>
8</service>
09
=== modified file 'debian/account-plugin-facebook.install'
--- debian/account-plugin-facebook.install 2013-06-07 11:56:25 +0000
+++ debian/account-plugin-facebook.install 2013-06-27 14:20:44 +0000
@@ -1,5 +1,6 @@
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-contacts.service
3usr/share/accounts/services/facebook-microblog.service4usr/share/accounts/services/facebook-microblog.service
4usr/share/accounts/services/facebook-im.service5usr/share/accounts/services/facebook-im.service
5usr/share/accounts/providers/facebook.provider6usr/share/accounts/providers/facebook.provider

Subscribers

People subscribed via source and target branches