Move API keys to hermes.postinst, and centralise browser checking into

main.py to reduce duplication.

diff --git a/package/debian/hermes.postinst b/package/debian/hermes.postinst
index 69b5b56..78940cc 100644 (file)
--- a/package/debian/hermes.postinst
+++ b/package/debian/hermes.postinst
@@ -3,9 +3,10 @@
 set -e
 gconftool-2 -s /apps/maemo/hermes/facebook_app 5916f12942feea4b3247d42a84371112 --type string
 gconftool-2 -s /apps/maemo/hermes/facebook_secret 19f7538edd96b6870f2da7e84a6390a4 --type string
-gconftool-2 -s /apps/maemo/hermes/gravatar_email TODO --type string
-gconftool-2 -s /apps/maemo/hermes/gravatar_key TODO --type string
-
+gconftool-2 -s /apps/maemo/hermes/gravatar_email maemohermes@wendt.se --type string
+gconftool-2 -s /apps/maemo/hermes/gravatar_key b14ec179822b --type string
+gconftool-2 -s /apps/maemo/hermes/linkedin_key 1et4G-VtmtqNfY7gF8PHtxMOf0KNWl9ericlTEtdKJeoA4ubk4wEQwf8lSL8AnYE --type string
+gconftool-2 -s /apps/maemo/hermes/linkedin_secret uk--OtmWcxER-Yh6Py5p0VeLPNlDJSMaXj1xfHILoFzrK7fM9eepNo5RbwGdkRo_ --type string
 
 # Version 0.2.1 changed type of /apps/maemo/hermes/uid
 OLD_UID=`gconftool-2 -g /apps/maemo/hermes/uid`

diff --git a/package/src/main.py b/package/src/main.py
index 9a50a38..05e7e45 100644 (file)
--- a/package/src/main.py
+++ b/package/src/main.py
@@ -1,11 +1,19 @@
 #!/usr/bin/env python
 
 import org.maemo.hermes.engine.facebook.provider
+import gnome.gconf
 import org.maemo.hermes.engine.twitter.provider
 import org.maemo.hermes.engine.gravatar.provider
 import org.maemo.hermes.engine.linkedin.provider
 from org.maemo.hermes.gui.gtkui import HermesGUI
 
+# -- Check environment...
+#
+if gnome.gconf.client_get_default().get_string('/desktop/gnome/url-handlers/http/command') == 'epiphany %s':
+    raise Exception('Browser in gconf invalid (see NB#136012). Installation error.')
+
+# -- Start the GUI with the known providers...
+#
 gui = HermesGUI(providers = [
                  org.maemo.hermes.engine.facebook.provider.Provider(),
                  org.maemo.hermes.engine.twitter.provider.Provider(),

diff --git a/package/src/org/maemo/hermes/engine/facebook/provider.py b/package/src/org/maemo/hermes/engine/facebook/provider.py
index e7d8dc6..9c84bbf 100644 (file)
--- a/package/src/org/maemo/hermes/engine/facebook/provider.py
+++ b/package/src/org/maemo/hermes/engine/facebook/provider.py
@@ -19,8 +19,6 @@ class Provider(org.maemo.hermes.engine.provider.Provider):
         """Initialise the provider, and ensure the environment is going to work."""
 
         self._gc = gnome.gconf.client_get_default()
-        if (self._gc.get_string('/desktop/gnome/url-handlers/http/command') == 'epiphany %s'):
-            raise Exception('Browser in gconf invalid (see NB#136012). Installation error.')
 
         key_app    = self._gc.get_string('/apps/maemo/hermes/facebook_app')
         key_secret = self._gc.get_string('/apps/maemo/hermes/facebook_secret')

diff --git a/package/src/org/maemo/hermes/engine/gravatar/provider.py b/package/src/org/maemo/hermes/engine/gravatar/provider.py
index 8ef1908..4627c28 100644 (file)
--- a/package/src/org/maemo/hermes/engine/gravatar/provider.py
+++ b/package/src/org/maemo/hermes/engine/gravatar/provider.py
@@ -37,8 +37,4 @@ class Provider(org.maemo.hermes.engine.provider.Provider):
         api_email = self._gconf.get_string('/apps/maemo/hermes/gravatar_email')
         api_key = self._gconf.get_string('/apps/maemo/hermes/gravatar_key')
 
-        # FIXME: put this in postinst
-        api_email = 'maemohermes@wendt.se'
-        api_key = 'b14ec179822b'
-
         return org.maemo.hermes.engine.gravatar.service.Service(api_email, api_key)

diff --git a/package/src/org/maemo/hermes/engine/linkedin/api.py b/package/src/org/maemo/hermes/engine/linkedin/api.py
index 5f2fd96..7188214 100644 (file)
--- a/package/src/org/maemo/hermes/engine/linkedin/api.py
+++ b/package/src/org/maemo/hermes/engine/linkedin/api.py
@@ -29,17 +29,8 @@ class LinkedInApi():
         
         self._gc = gnome.gconf.client_get_default()
         
-        # -- Check the environment is going to work...
-        # FIXME: duplication
-        if (self._gc.get_string('/desktop/gnome/url-handlers/http/command') == 'epiphany %s'):
-            raise Exception('Browser in gconf invalid (see NB#136012). Installation error.')
-
-        api_key = self._gc.get_string('/apps/maemo/hermes/linkedin_api_key')
-        secret_key = self._gc.get_string('/apps/maemo/hermes/linkedin_key_secret')
-
-        # FIXME: move this to gconf and postinst
-        api_key = '1et4G-VtmtqNfY7gF8PHtxMOf0KNWl9ericlTEtdKJeoA4ubk4wEQwf8lSL8AnYE'
-        secret_key = 'uk--OtmWcxER-Yh6Py5p0VeLPNlDJSMaXj1xfHILoFzrK7fM9eepNo5RbwGdkRo_'
+        api_key = self._gc.get_string('/apps/maemo/hermes/linkedin_key')
+        secret_key = self._gc.get_string('/apps/maemo/hermes/linkedin_secret')
 
         if api_key is None or secret_key is None:
             raise Exception('No LinkedIn application keys found. Installation error.')