Merge lp:~robru/friends/gschema into lp:friends

Proposed by Robert Bruce Park
Status: Merged
Merged at revision: 21
Proposed branch: lp:~robru/friends/gschema
Merge into: lp:friends
Diff against target: 90 lines (+60/-2)
3 files modified
data/com.canonical.friends.gschema.xml (+54/-0)
friends/main.py (+2/-2)
setup.py (+4/-0)
To merge this branch: bzr merge lp:~robru/friends/gschema
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+131261@code.launchpad.net

Description of the change

Ken, I need your input on this gschema that I came up with for the new friends-service. It's based off the old gwibber schema, but I ripped out all the stuff that we didn't seem to be using.

Also, I modified setup.py to install the schema for us, and it seems to work, but I'm not sure if I did it the "right" way so I'd like your input on that.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks great and works fine

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'data'
=== added file 'data/com.canonical.friends.gschema.xml'
--- data/com.canonical.friends.gschema.xml 1970-01-01 00:00:00 +0000
+++ data/com.canonical.friends.gschema.xml 2012-10-24 18:58:20 +0000
@@ -0,0 +1,54 @@
1<schemalist>
2 <schema id="com.canonical.friends" path="/com/canonical/friends/">
3
4 <key name="interval" type="i">
5 <default>15</default>
6 <summary>Refresh interval in minutes.</summary>
7 <description>
8 The number of minutes friends-service will wait in between
9 attempts at downloading new messages.
10 </description>
11 </key>
12
13 <key name="notifications" type="b">
14 <default>true</default>
15 <summary>Display notifications?</summary>
16 <description>
17 True if you want to see unread message counts in the messaging
18 menu, false otherwise.
19 </description>
20 </key>
21
22 <key name="debug" type="b">
23 <default>false</default>
24 <summary>Display debugging messages?</summary>
25 <description>
26 Whether or not to show verbose debugging messages in the logfile.
27 </description>
28 </key>
29
30 <key name="shorten-urls" type="b">
31 <default>true</default>
32 <summary>Shorten URLs?</summary>
33 <description>
34 Whether or not to automatically shorten URLs in messages that
35 we send out to the world.
36 </description>
37 </key>
38
39 <key name="urlshorter" type="s">
40 <choices>
41 <choice value="is.gd"/>
42 <choice value="cli.gs"/>
43 <choice value="tinyurl.com"/>
44 <choice value="ur1.ca"/>
45 </choices>
46 <default>"is.gd"</default>
47 <summary>URL shortening service.</summary>
48 <description>
49 Choose the preferred URL shortening service.
50 </description>
51 </key>
52
53 </schema>
54</schemalist>
055
=== modified file 'friends/main.py'
--- friends/main.py 2012-10-20 14:42:21 +0000
+++ friends/main.py 2012-10-24 18:58:20 +0000
@@ -55,9 +55,9 @@
55 package, dot, class_name = cls.__name__.rpartition('.')55 package, dot, class_name = cls.__name__.rpartition('.')
56 print(class_name)56 print(class_name)
57 return57 return
58
58 # Initialize the logging subsystem.59 # Initialize the logging subsystem.
59 # XXX FIXME - this should be renamed to 'friends'.60 gsettings = Gio.Settings.new('com.canonical.friends')
60 gsettings = Gio.Settings.new('org.gwibber.preferences')
61 initialize(console=args.console,61 initialize(console=args.console,
62 debug=args.debug or gsettings.get_boolean('debug'))62 debug=args.debug or gsettings.get_boolean('debug'))
63 log = logging.getLogger(__name__)63 log = logging.getLogger(__name__)
6464
=== modified file 'setup.py'
--- setup.py 2012-10-18 19:20:52 +0000
+++ setup.py 2012-10-24 18:58:20 +0000
@@ -33,6 +33,10 @@
33 package_data = {33 package_data = {
34 'friends.service.templates': ['*.service.in'],34 'friends.service.templates': ['*.service.in'],
35 },35 },
36 data_files = [
37 ('/usr/share/glib-2.0/schemas',
38 ['data/com.canonical.friends.gschema.xml'])
39 ],
36 entry_points = {40 entry_points = {
37 'console_scripts': ['friends-service = friends.main:main'],41 'console_scripts': ['friends-service = friends.main:main'],
38 'distutils.commands': [42 'distutils.commands': [

Subscribers

People subscribed via source and target branches