[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Sebastian Krzyszkowiak]

The following commit has been merged in the debian branch:
commit f018a085b8177601f3abb88c7e525349c1045417
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Sat Jul 25 17:57:34 2009 +0200

    opimd: move factory from __init__.py to opimd.py
    
    Signed-off-by: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>

diff --git a/framework/subsystems/opimd/__init__.py b/framework/subsystems/opimd/__init__.py
index d2d29e4..e69de29 100755
--- a/framework/subsystems/opimd/__init__.py
+++ b/framework/subsystems/opimd/__init__.py
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-"""
-Open PIM Daemon
-
-(C) 2008 by Soeren Apel <abraxa at dar-clan.de>
-(C) 2008-2009 Openmoko, Inc.
-(C) 2009 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
-(C) 2009 by Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
-GPLv2 or later
-
-Framework plugin factory
-"""
-
-MODULE_NAME = "opimd"
-
-from opimd import *
-
-# We import the domain modules, so that there classes get registered
-import pimd_contacts
-import pimd_messages
-import pimd_calls
-# Same thing for the backend modules
-import pimb_sim_contacts_fso
-import pimb_sim_messages_fso
-import pimb_csv_contacts
-import pimb_sqlite_contacts
-import pimb_sqlite_messages
-import pimb_sqlite_calls
-import pimb_ogsmd_calls
-
-import logging
-logger = logging.getLogger( MODULE_NAME )
-
-#----------------------------------------------------------------------------#
-def factory( prefix, subsystem ):
-#----------------------------------------------------------------------------#
-    """
-    frameworkd factory method.
-    """
-    # TODO Check for exceptions
-    from domain_manager import DomainManager
-    DomainManager.init()
-
-    from backend_manager import BackendManager
-    backend_manager = BackendManager()
-
-    dbus_objects = []
-
-    # Create a list of all d-bus objects
-    for dbus_obj in DomainManager.enumerate_dbus_objects():
-        logger.debug( "adding object %s" % dbus_obj )
-        dbus_objects.append(dbus_obj)
-
-    dbus_objects.append(backend_manager)
-
-    return dbus_objects
-
-#----------------------------------------------------------------------------#
-if __name__ == '__main__':
-#----------------------------------------------------------------------------#
-    import sys
-    result = main_pyneo()
-    sys.exit(result)
diff --git a/framework/subsystems/opimd/opimd.py b/framework/subsystems/opimd/opimd.py
index ea53bb6..44275ac 100644
--- a/framework/subsystems/opimd/opimd.py
+++ b/framework/subsystems/opimd/opimd.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 #
 #   Openmoko PIM Daemon
 #   Settings storage
@@ -5,7 +7,10 @@
 #   http://openmoko.org/
 #   http://pyneo.org/
 #
-#   Copyright (C) 2008 by Soeren Apel (abraxa at dar-clan.de)
+#   (C) 2008 Soeren Apel <abraxa at dar-clan.de>
+#   (C) 2008-2009 Openmoko, Inc.
+#   (C) 2009 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+#   (C) 2009 by Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -28,3 +33,47 @@ DIN_BASE_FSO = "org.freesmartphone.PIM"
 
 DBUS_PATH_BASE = None
 DIN_BASE = None
+
+MODULE_NAME = "opimd"
+
+from opimd import *
+
+# We import the domain modules, so that there classes get registered
+import pimd_contacts
+import pimd_messages
+import pimd_calls
+# Same thing for the backend modules
+import pimb_sim_contacts_fso
+import pimb_sim_messages_fso
+import pimb_csv_contacts
+import pimb_sqlite_contacts
+import pimb_sqlite_messages
+import pimb_sqlite_calls
+import pimb_ogsmd_calls
+
+import logging
+logger = logging.getLogger( MODULE_NAME )
+
+#----------------------------------------------------------------------------#
+def factory( prefix, subsystem ):
+#----------------------------------------------------------------------------#
+    """
+    frameworkd factory method.
+    """
+    # TODO Check for exceptions
+    from domain_manager import DomainManager
+    DomainManager.init()
+
+    from backend_manager import BackendManager
+    backend_manager = BackendManager()
+
+    dbus_objects = []
+
+    # Create a list of all d-bus objects
+    for dbus_obj in DomainManager.enumerate_dbus_objects():
+        logger.debug( "adding object %s" % dbus_obj )
+        dbus_objects.append(dbus_obj)
+
+    dbus_objects.append(backend_manager)
+
+    return dbus_objects

-- 
FSO frameworkd Debian packaging