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

[Robert Bruce Park]

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.

[Ken VanDine (ken-vandine)]

Looks great and works fine

=== 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 @@
+<schemalist>
+  <schema id="com.canonical.friends" path="/com/canonical/friends/">
+
+    <key name="interval" type="i">
+      <default>15</default>
+      <summary>Refresh interval in minutes.</summary>
+      <description>
+        The number of minutes friends-service will wait in between
+        attempts at downloading new messages.
+      </description>
+    </key>
+
+    <key name="notifications" type="b">
+      <default>true</default>
+      <summary>Display notifications?</summary>
+      <description>
+        True if you want to see unread message counts in the messaging
+        menu, false otherwise.
+      </description>
+    </key>
+
+    <key name="debug" type="b">
+      <default>false</default>
+      <summary>Display debugging messages?</summary>
+      <description>
+        Whether or not to show verbose debugging messages in the logfile.
+      </description>
+    </key>
+
+    <key name="shorten-urls" type="b">
+      <default>true</default>
+      <summary>Shorten URLs?</summary>
+      <description>
+        Whether or not to automatically shorten URLs in messages that
+        we send out to the world.
+      </description>
+    </key>
+
+    <key name="urlshorter" type="s">
+      <choices>
+        <choice value="is.gd"/>
+        <choice value="cli.gs"/>
+        <choice value="tinyurl.com"/>
+        <choice value="ur1.ca"/>
+      </choices>
+      <default>"is.gd"</default>
+      <summary>URL shortening service.</summary>
+      <description>
+        Choose the preferred URL shortening service.
+      </description>
+    </key>
+
+  </schema>
+</schemalist>

=== 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 @@
             package, dot, class_name = cls.__name__.rpartition('.')
             print(class_name)
         return
+
     # Initialize the logging subsystem.
-    # XXX FIXME - this should be renamed to 'friends'.
-    gsettings = Gio.Settings.new('org.gwibber.preferences')
+    gsettings = Gio.Settings.new('com.canonical.friends')
     initialize(console=args.console,
                debug=args.debug or gsettings.get_boolean('debug'))
     log = logging.getLogger(__name__)

=== 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 @@
     package_data = {
         'friends.service.templates': ['*.service.in'],
         },
+    data_files = [
+        ('/usr/share/glib-2.0/schemas',
+         ['data/com.canonical.friends.gschema.xml'])
+        ],
     entry_points = {
         'console_scripts': ['friends-service = friends.main:main'],
         'distutils.commands': [