Minature bug fixes to help things progress along

diff --git a/Makefile b/Makefile
index c461fc8..cf97536 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ package: $(OBJ)
        $(foreach file, $(DATA), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
        $(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
        cp support/$(PROJECT_NAME).manager $(BUILD_PATH)/generic
-       cp support/org.freedesktop.Telepathy.ConnectionManager.$(PROJECT_NAME).service.in $(BUILD_PATH)/generic
+       cp support/org.freedesktop.Telepathy.ConnectionManager.$(PROJECT_NAME).service $(BUILD_PATH)/generic
        cp support/icons/*-$(PROJECT_NAME).png $(BUILD_PATH)/generic/
        cp support/builddeb.py $(BUILD_PATH)/generic
        cp support/py2deb.py $(BUILD_PATH)/generic

diff --git a/src/channel/text.py b/src/channel/text.py
index 5261690..41a750d 100644 (file)
--- a/src/channel/text.py
+++ b/src/channel/text.py
@@ -74,6 +74,7 @@ class TextChannel(telepathy.server.ChannelTypeText):
                self._report_conversation(conversation)
 
        def _report_conversation(self, conversation):
+               # @bug Check if messages sent need to be filtered out
                completeMessageHistory = conversation["messageParts"]
                messages = self._filter_seen_messages(completeMessageHistory)
                self._lastMessageTimestamp = messages[-1][0]

diff --git a/src/connection.py b/src/connection.py
index 5fe94de..2db7df6 100644 (file)
--- a/src/connection.py
+++ b/src/connection.py
@@ -37,8 +37,8 @@ class TheOneRingConnection(
        }
 
        def __init__(self, manager, parameters):
+               self.check_parameters(parameters)
                try:
-                       self.check_parameters(parameters)
                        account = unicode(parameters['username'])
 
                        # Connection init must come first

diff --git a/src/telepathy-theonering b/src/telepathy-theonering
index a98f62e..6d08aaa 100755 (executable)
--- a/src/telepathy-theonering
+++ b/src/telepathy-theonering
@@ -83,6 +83,10 @@ def run_theonering(persist):
 if __name__ == '__main__':
        telepathy_utils.debug_divert_messages(os.getenv('THEONERING_LOGFILE'))
        logging.basicConfig(level=logging.DEBUG)
+       logging.info("telepathy-theonering %s-%s" % (constants.__version__, constants.__build__))
+       logging.info("OS: %s" % (os.uname()[0], ))
+       logging.info("Kernel: %s (%s) for %s" % os.uname()[2:])
+       logging.info("Hostname: %s" % os.uname()[1])
 
        persist = 'THEONERING_PERSIST' in os.environ
        persist = True

diff --git a/support/builddeb.py b/support/builddeb.py
index 0ce60ea..05b02ff 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -100,7 +100,7 @@ def build_package(distribution):
                        "|".join((oldName, newName))
                        for (oldName, newName) in files
                )
-       p["/usr/share/dbus-1/services"] = ["org.freedesktop.Telepathy.ConnectionManager.theonering.service.in"]
+       p["/usr/share/dbus-1/services"] = ["org.freedesktop.Telepathy.ConnectionManager.theonering.service"]
        p["/usr/share/telepathy/managers"] = ["theonering.manager"]
        p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-theonering.png|theonering.png"]
        p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-theonering.png|theonering.png"]