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

Proposed by Ken VanDine on 2012-12-10
Status: Merged
Approved by: Alberto Mardegan on 2012-12-10
Approved revision: 87
Merged at revision: 87
Proposed branch: lp:~ken-vandine/account-plugins/friends_transition
Merge into: lp:account-plugins
Diff against target: 72 lines (+18/-0)
5 files modified
data/services/facebook-microblog.service.in (+4/-0)
data/services/flickr-microblog.service.in (+3/-0)
data/services/foursquare-microblog.service.in (+3/-0)
data/services/identica-microblog.service.in (+4/-0)
data/services/twitter-microblog.service.in (+4/-0)
To merge this branch: bzr merge lp:~ken-vandine/account-plugins/friends_transition
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) 2012-12-10 Approve on 2012-12-10
PS Jenkins bot (community) continuous-integration Approve on 2012-12-10
Review via email: mp+139055@code.launchpad.net

Commit message

Added group settings to microblog service files for friends. These are
duplicated from the existing gwibber groups, we can drop those once friends
replaces gwibber in raring.

Description of the change

Added group settings to microblog service files for friends. These are
duplicated from the existing gwibber groups, we can drop those once friends
replaces gwibber in raring.

To post a comment you must log in.
Alberto Mardegan (mardy) wrote :

Looks fine, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/services/facebook-microblog.service.in'
--- data/services/facebook-microblog.service.in 2012-10-04 14:18:34 +0000
+++ data/services/facebook-microblog.service.in 2012-12-10 18:02:31 +0000
@@ -8,6 +8,10 @@
88
9 <!-- default settings (account settings have precedence over these) -->9 <!-- default settings (account settings have precedence over these) -->
10 <template>10 <template>
11 <group name="friends">
12 <setting name="send_enabled" type="bool">true</setting>
13 <setting name="color">#1169E1</setting>
14 </group>
11 <group name="gwibber">15 <group name="gwibber">
12 <setting name="send_enabled" type="bool">true</setting>16 <setting name="send_enabled" type="bool">true</setting>
13 <setting name="color">#1169E1</setting>17 <setting name="color">#1169E1</setting>
1418
=== modified file 'data/services/flickr-microblog.service.in'
--- data/services/flickr-microblog.service.in 2012-10-04 14:18:34 +0000
+++ data/services/flickr-microblog.service.in 2012-12-10 18:02:31 +0000
@@ -8,6 +8,9 @@
88
9 <!-- default settings (account settings have precedence over these) -->9 <!-- default settings (account settings have precedence over these) -->
10 <template>10 <template>
11 <group name="friends">
12 <setting name="color">#A63FF4</setting>
13 </group>
11 <group name="gwibber">14 <group name="gwibber">
12 <setting name="color">#A63FF4</setting>15 <setting name="color">#A63FF4</setting>
13 </group>16 </group>
1417
=== modified file 'data/services/foursquare-microblog.service.in'
--- data/services/foursquare-microblog.service.in 2012-10-04 14:18:34 +0000
+++ data/services/foursquare-microblog.service.in 2012-12-10 18:02:31 +0000
@@ -8,6 +8,9 @@
88
9 <!-- default settings (account settings have precedence over these) -->9 <!-- default settings (account settings have precedence over these) -->
10 <template>10 <template>
11 <group name="friends">
12 <setting name="color">#990099</setting>
13 </group>
11 <group name="gwibber">14 <group name="gwibber">
12 <setting name="color">#990099</setting>15 <setting name="color">#990099</setting>
13 </group>16 </group>
1417
=== modified file 'data/services/identica-microblog.service.in'
--- data/services/identica-microblog.service.in 2012-10-04 14:18:34 +0000
+++ data/services/identica-microblog.service.in 2012-12-10 18:02:31 +0000
@@ -8,6 +8,10 @@
88
9 <!-- default settings (account settings have precedence over these) -->9 <!-- default settings (account settings have precedence over these) -->
10 <template>10 <template>
11 <group name="friends">
12 <setting name="send_enabled" type="bool">true</setting>
13 <setting name="color">#4E9A06</setting>
14 </group>
11 <group name="gwibber">15 <group name="gwibber">
12 <setting name="send_enabled" type="bool">true</setting>16 <setting name="send_enabled" type="bool">true</setting>
13 <setting name="color">#4E9A06</setting>17 <setting name="color">#4E9A06</setting>
1418
=== modified file 'data/services/twitter-microblog.service.in'
--- data/services/twitter-microblog.service.in 2012-10-04 14:18:34 +0000
+++ data/services/twitter-microblog.service.in 2012-12-10 18:02:31 +0000
@@ -8,6 +8,10 @@
88
9 <!-- default settings (account settings have precedence over these) -->9 <!-- default settings (account settings have precedence over these) -->
10 <template>10 <template>
11 <group name="friends">
12 <setting name="send_enabled" type="bool">true</setting>
13 <setting name="color">#05BBFC</setting>
14 </group>
11 <group name="gwibber">15 <group name="gwibber">
12 <setting name="send_enabled" type="bool">true</setting>16 <setting name="send_enabled" type="bool">true</setting>
13 <setting name="color">#05BBFC</setting>17 <setting name="color">#05BBFC</setting>

Subscribers

People subscribed via source and target branches

to all changes: