From 1733fbe74b693e85528e9d724351fc21b8064e59 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Fri, 7 Sep 2012 11:57:48 +0200 Subject: Rename approver and text echoer to be prefix with phoenix- --- .../dbus-1/services/Phoenix.Approver.service.in | 2 +- .../dbus-1/services/Phoenix.EchoText.service.in | 2 +- src/approver.py | 38 -------------- src/echo-text.py | 61 ---------------------- src/phoenix-approver | 38 ++++++++++++++ src/phoenix-echo-text | 61 ++++++++++++++++++++++ 6 files changed, 101 insertions(+), 101 deletions(-) delete mode 100755 src/approver.py delete mode 100755 src/echo-text.py create mode 100755 src/phoenix-approver create mode 100755 src/phoenix-echo-text diff --git a/data/phoenix/uninstalled/dbus-1/services/Phoenix.Approver.service.in b/data/phoenix/uninstalled/dbus-1/services/Phoenix.Approver.service.in index 1513027..15b5c21 100644 --- a/data/phoenix/uninstalled/dbus-1/services/Phoenix.Approver.service.in +++ b/data/phoenix/uninstalled/dbus-1/services/Phoenix.Approver.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.Telepathy.Client.Phoenix.Approver -Exec=@abs_top_builddir@/src/approver.py +Exec=@abs_top_builddir@/src/phoenix-approver diff --git a/data/phoenix/uninstalled/dbus-1/services/Phoenix.EchoText.service.in b/data/phoenix/uninstalled/dbus-1/services/Phoenix.EchoText.service.in index 4b718da..66d481c 100644 --- a/data/phoenix/uninstalled/dbus-1/services/Phoenix.EchoText.service.in +++ b/data/phoenix/uninstalled/dbus-1/services/Phoenix.EchoText.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.Telepathy.Client.Phoenix.EchoText -Exec=@abs_top_builddir@/src/echo-text.py +Exec=@abs_top_builddir@/src/phoenix-echo-text diff --git a/src/approver.py b/src/approver.py deleted file mode 100755 index 85a40da..0000000 --- a/src/approver.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -import os - -from gi.repository import GObject, Gio -from gi.repository import TelepathyGLib as Tp - -def approve_channel_cb (approver, account, connection, - channels, dispatch, context, data): - print "Asked for approval" - handler = None - - context.accept () - - for h in dispatch.get_property ("possible-handlers"): - if h.startswith('org.freedesktop.Telepathy.Client.Phoenix'): - handler = h - - if handler == None: - print "No Phoenix handler, closing" - dispatch.close_channels_async (None, None) - else: - print "Handling with: " + handler - dispatch.handle_with_async (handler, None, None) - -if __name__ == '__main__': - Tp.debug_set_flags(os.getenv('PHOENIX_DEBUG', '')) - - loop = GObject.MainLoop() - - am = Tp.AccountManager.dup() - approver = Tp.SimpleApprover.new_with_am(am, - 'Phoenix.Approver', False, approve_channel_cb, None) - - approver.add_approver_filter({}) - approver.register() - - loop.run() diff --git a/src/echo-text.py b/src/echo-text.py deleted file mode 100755 index fd321b0..0000000 --- a/src/echo-text.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env python - -import os - -from gi.repository import GObject, Gio -from gi.repository import TelepathyGLib as Tp - -class TextEchoer: - def __init__ (self, channel): - self.channel = channel - self.channel.connect ('message-received', self.got_message, None) - self.ack_pending () - - def send_text (self, text): - print "Sending %s" % text - m = Tp.ClientMessage.new_text (Tp.ChannelTextMessageType.NORMAL, - text) - self.channel.send_message_async (m, 0, None, None) - - def got_message (self, channel, msg, data): - text, flags = msg.to_text() - self.send_text (text) - channel.ack_message_async (msg, None, None) - - def ack_pending (self): - messages = self.channel.get_pending_messages () - for m in messages: - text, flags = m.to_text() - self.send_text (text) - - self.channel.ack_messages_async (messages, None, None) - -def handle_channels_cb (handler, account, connection, - channels, satisfied, action_time, context, data): - print "Asked to handle" - - for c in channels: - TextEchoer (c) - - context.accept () - -if __name__ == '__main__': - Tp.debug_set_flags(os.getenv('PHOENIX_DEBUG', '')) - - loop = GObject.MainLoop() - - am = Tp.AccountManager.dup() - factory = am.get_factory() - - factory.add_channel_features ( - [Tp.TextChannel.get_feature_quark_incoming_messages ()]) - - handler = Tp.SimpleHandler.new_with_am(am, False, False, - 'Phoenix.EchoText', False, handle_channels_cb, None) - - handler.add_handler_filter({ - Tp.PROP_CHANNEL_CHANNEL_TYPE: Tp.IFACE_CHANNEL_TYPE_TEXT, - Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE: int(Tp.HandleType.CONTACT)}) - handler.register() - - loop.run() diff --git a/src/phoenix-approver b/src/phoenix-approver new file mode 100755 index 0000000..85a40da --- /dev/null +++ b/src/phoenix-approver @@ -0,0 +1,38 @@ +#!/usr/bin/env python + +import os + +from gi.repository import GObject, Gio +from gi.repository import TelepathyGLib as Tp + +def approve_channel_cb (approver, account, connection, + channels, dispatch, context, data): + print "Asked for approval" + handler = None + + context.accept () + + for h in dispatch.get_property ("possible-handlers"): + if h.startswith('org.freedesktop.Telepathy.Client.Phoenix'): + handler = h + + if handler == None: + print "No Phoenix handler, closing" + dispatch.close_channels_async (None, None) + else: + print "Handling with: " + handler + dispatch.handle_with_async (handler, None, None) + +if __name__ == '__main__': + Tp.debug_set_flags(os.getenv('PHOENIX_DEBUG', '')) + + loop = GObject.MainLoop() + + am = Tp.AccountManager.dup() + approver = Tp.SimpleApprover.new_with_am(am, + 'Phoenix.Approver', False, approve_channel_cb, None) + + approver.add_approver_filter({}) + approver.register() + + loop.run() diff --git a/src/phoenix-echo-text b/src/phoenix-echo-text new file mode 100755 index 0000000..fd321b0 --- /dev/null +++ b/src/phoenix-echo-text @@ -0,0 +1,61 @@ +#!/usr/bin/env python + +import os + +from gi.repository import GObject, Gio +from gi.repository import TelepathyGLib as Tp + +class TextEchoer: + def __init__ (self, channel): + self.channel = channel + self.channel.connect ('message-received', self.got_message, None) + self.ack_pending () + + def send_text (self, text): + print "Sending %s" % text + m = Tp.ClientMessage.new_text (Tp.ChannelTextMessageType.NORMAL, + text) + self.channel.send_message_async (m, 0, None, None) + + def got_message (self, channel, msg, data): + text, flags = msg.to_text() + self.send_text (text) + channel.ack_message_async (msg, None, None) + + def ack_pending (self): + messages = self.channel.get_pending_messages () + for m in messages: + text, flags = m.to_text() + self.send_text (text) + + self.channel.ack_messages_async (messages, None, None) + +def handle_channels_cb (handler, account, connection, + channels, satisfied, action_time, context, data): + print "Asked to handle" + + for c in channels: + TextEchoer (c) + + context.accept () + +if __name__ == '__main__': + Tp.debug_set_flags(os.getenv('PHOENIX_DEBUG', '')) + + loop = GObject.MainLoop() + + am = Tp.AccountManager.dup() + factory = am.get_factory() + + factory.add_channel_features ( + [Tp.TextChannel.get_feature_quark_incoming_messages ()]) + + handler = Tp.SimpleHandler.new_with_am(am, False, False, + 'Phoenix.EchoText', False, handle_channels_cb, None) + + handler.add_handler_filter({ + Tp.PROP_CHANNEL_CHANNEL_TYPE: Tp.IFACE_CHANNEL_TYPE_TEXT, + Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE: int(Tp.HandleType.CONTACT)}) + handler.register() + + loop.run() -- cgit v1.2.3