changeset
Merged in default (pull request #436)
Fri, 30 Nov 2018 03:02:14 +0000
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Fri, 30 Nov 2018 03:02:14 +0000
- changeset 39342
- 3bb4d0f75c8e
- parent 39339
- c3977899ce84 (current diff)
- parent 39341
- ba9b67304fc6 (diff)
- child 39345
- dcb8989b93c2
- child 39346
- dc95f1b4984f
Merged in default (pull request #436)
Drop purple-url-handler in favor of GApplication URI handling
Approved-by: Elliott Sales de Andrade
Approved-by: Gary Kramlich
Approved-by: Eion Robb
| libpurple/data/purple-url-handler.desktop.in.in | file | annotate | diff | comparison | revisions | |
| libpurple/purple-url-handler | file | annotate | diff | comparison | revisions |
--- a/ChangeLog Thu Nov 29 20:53:45 2018 -0600 +++ b/ChangeLog Fri Nov 30 03:02:14 2018 +0000 @@ -41,6 +41,8 @@ multiple Pidgin instances is to pass --gapplication-app-id with an alternate, valid app id. Be careful not to use the same configuration directory as the primary instance. + * Replaced purple-url-handler script with the ability to call Pidgin + itself for URI handling. Finch: * Support the conversation-extended signal for extending the
--- a/libpurple/data/purple-url-handler.desktop.in.in Thu Nov 29 20:53:45 2018 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -[Desktop Entry] -Name=Pidgin -GenericName=Internet Messenger -Comment=Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, and more -Exec=purple-url-handler %u -TryExec=purple-url-handler -Icon=pidgin -StartupNotify=false -Terminal=false -NoDisplay=true -Type=Application -Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly; -MimeType=x-scheme-handler/aim;x-scheme-handler/gg;x-scheme-handler/icq;x-scheme-handler/irc;x-scheme-handler/msnim;x-scheme-handler/sip;x-scheme-handler/xmpp;x-scheme-handler/ymsgr -@USES_MM_CHAT_SECTION@
--- a/libpurple/meson.build Thu Nov 29 20:53:45 2018 -0600 +++ b/libpurple/meson.build Fri Nov 30 03:02:14 2018 +0000 @@ -372,7 +372,7 @@ # scripts -install_data(['purple-remote', 'purple-send', 'purple-send-async', 'purple-url-handler'], +install_data(['purple-remote', 'purple-send', 'purple-send-async'], install_dir : get_option('bindir')) else @@ -432,21 +432,6 @@ requires : ['glib-2.0'] + GPLUGIN_REQ, variables : ['plugindir=${libdir}/purple-@0@'.format(purple_major_version)]) -if INSTALL_I18N - DESKTOP_FILE = 'purple-url-handler.desktop' - desktop_file_in = configure_file( - input : 'data/' + DESKTOP_FILE + '.in.in', - output : DESKTOP_FILE + '.in', - configuration : conf) - desktop_file = i18n.merge_file( - input : desktop_file_in, - output : DESKTOP_FILE, - po_dir : meson.source_root() + '/po', - type : 'desktop', - install : true, - install_dir : get_option('datadir') + '/applications') -endif # INSTALL_I18N - if enable_introspection introspection_sources = (purple_coreheaders + purple_builtheaders + dbus_headers + purple_mediaheaders)
--- a/libpurple/purple-url-handler Thu Nov 29 20:53:45 2018 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,373 +0,0 @@ -#!/usr/bin/env python - -from __future__ import absolute_import, division, print_function - -import dbus -import re -import sys -import time -try: - from urllib.parse import unquote_plus -except ImportError: - from urllib import unquote_plus - - -bus = dbus.SessionBus() -obj = None -try: - obj = bus.get_object("im.pidgin.purple.PurpleService", - "/im/pidgin/purple/PurpleObject") -except dbus.DBusException as e: - if e._dbus_error_name == "org.freedesktop.DBus.Error.ServiceUnknown": - print("Error: no libpurple-powered client is running. " - "Try starting Pidgin or Finch.") - sys.exit(1) -purple = dbus.Interface(obj, "im.pidgin.purple.PurpleInterface") - - -class CheckedObject(object): - def __init__(self, obj): - self.obj = obj - - def __getattr__(self, attr): - return CheckedAttribute(self, attr) - - -class CheckedAttribute(object): - def __init__(self, cobj, attr): - self.cobj = cobj - self.attr = attr - - def __call__(self, *args): - # Redirect stderr to suppress the printing of an " Introspect error" - # message if nothing is listening on the bus. We print a friendly - # error message ourselves. - real_stderr = sys.stderr - sys.stderr = None - result = self.cobj.obj.__getattr__(self.attr)(*args) - sys.stderr = real_stderr - -# This can be useful for debugging. -# if result == 0: -# print("Error:", self.attr, str(args), "returned", str(result)) - - return result - - -cpurple = CheckedObject(purple) - - -def extendlist(list, length, fill): - if len(list) < length: - return list + [fill] * (length - len(list)) - else: - return list - - -def convert(value): - try: - return int(value) - except: - return value - - -def account_not_found(): - print("No matching account found.") - sys.exit(1) - - -def bring_account_online(account): - if not cpurple.PurpleAccountIsConnected(account): - # The last argument is meant to be a GList * but the D-Bus binding - # generator thing just wants a UInt32, which is pretty failing. - # Happily, passing a 0 to mean an empty list turns out to work anyway. - purple.PurpleAccountSetStatusList(account, "online", 1, 0) - purple.PurpleAccountConnect(account) - - -def findaccount(protocolname, accountname="", matcher=None): - if matcher: - for account in cpurple.PurpleAccountsGetAll(): - if protocolname != cpurple.PurpleAccountGetProtocolId(account): - continue - if (accountname != "" and - accountname != cpurple.PurpleAccountGetUsername(account)): - continue - if matcher(account): - bring_account_online(account) - return account - account_not_found() - - # prefer connected accounts - account = cpurple.PurpleAccountsFindConnected(accountname, protocolname) - if account != 0: - return account - - # try to get any account and connect it - account = cpurple.PurpleAccountsFindAny(accountname, protocolname) - if account == 0: - account_not_found() - - bring_account_online(account) - return account - - -def goim(account, screenname, message=None): - # XXX: 1 == PURPLE_CONV_TYPE_IM - conversation = cpurple.PurpleConversationNew(1, account, screenname) - if message: - purple.PurpleConvSendConfirm(conversation, message) - - -def gochat(account, params, message=None): - connection = cpurple.PurpleAccountGetConnection(account) - purple.PurpleServJoinChat(connection, params) - - if message is not None: - for i in range(20): - # XXX: 2 == PURPLE_CONV_TYPE_CHAT - conversation = purple.PurpleFindConversationWithAccount( - 2, - params.get("channel", params.get("room")), - account) - if conversation: - purple.PurpleConvSendConfirm(conversation, message) - break - else: - time.sleep(0.5) - - -def addbuddy(account, screenname, group="", alias=""): - cpurple.PurpleBlistRequestAddBuddy(account, screenname, group, alias) - - -def aim(uri): - protocol = "prpl-aim" - match = re.match(r"^aim:([^?]*)(\?(.*))", uri) - if not match: - print("Invalid aim URI: %s" % (uri, )) - return - - command = unquote_plus(match.group(1)) - paramstring = match.group(3) - params = {} - if paramstring: - for param in paramstring.split("&"): - key, value = extendlist(param.split("=", 1), 2, "") - params[key] = unquote_plus(value) - accountname = params.get("account", "") - screenname = params.get("screenname", "") - - account = findaccount(protocol, accountname) - - if command.lower() == "goim": - goim(account, screenname, params.get("message")) - elif command.lower() == "gochat": - gochat(account, params) - elif command.lower() == "addbuddy": - addbuddy(account, screenname, params.get("group", "")) - - -def gg(uri): - protocol = "prpl-gg" - match = re.match(r"^gg:(.*)", uri) - if not match: - print("Invalid gg URI: %s" % (uri, )) - return - - screenname = unquote_plus(match.group(1)) - account = findaccount(protocol) - goim(account, screenname) - - -def icq(uri): - protocol = "prpl-icq" - match = re.match(r"^icq:([^?]*)(\?(.*))", uri) - if not match: - print("Invalid icq URI: %s" % (uri, )) - return - - command = unquote_plus(match.group(1)) - paramstring = match.group(3) - params = {} - if paramstring: - for param in paramstring.split("&"): - key, value = extendlist(param.split("=", 1), 2, "") - params[key] = unquote_plus(value) - accountname = params.get("account", "") - screenname = params.get("screenname", "") - - account = findaccount(protocol, accountname) - - if command.lower() == "goim": - goim(account, screenname, params.get("message")) - elif command.lower() == "gochat": - gochat(account, params) - elif command.lower() == "addbuddy": - addbuddy(account, screenname, params.get("group", "")) - - -def irc(uri): - protocol = "prpl-irc" - match = re.match(r"^irc:(//([^/]*))?/?([^?]*)(\?(.*))?", uri) - if not match: - print("Invalid irc URI: %s" % (uri, )) - return - - server = unquote_plus(match.group(2) or "") - target = match.group(3) or "" - query = match.group(5) or "" - - modifiers = {} - if target: - for modifier in target.split(",")[1:]: - modifiers[modifier] = True - - paramstring = match.group(5) - params = {} - if paramstring: - for param in paramstring.split("&"): - key, value = extendlist(param.split("=", 1), 2, "") - params[key] = unquote_plus(value) - - def correct_server(account): - username = cpurple.PurpleAccountGetUsername(account) - return (server == "" or - "@" in username and server == username.split("@")[1]) - - account = findaccount(protocol, matcher=correct_server) - - if target != "": - if "isnick" in modifiers: - goim(account, unquote_plus(target.split(",")[0]), - params.get("msg")) - else: - channel = unquote_plus(target.split(",")[0]) - if channel[0] != "#": - channel = "#" + channel - gochat(account, - {"server": server, - "channel": channel, - "password": params.get("key", "")}, - params.get("msg")) - - -def sip(uri): - protocol = "prpl-simple" - match = re.match(r"^sip:(.*)", uri) - if not match: - print("Invalid sip URI: %s" % (uri, )) - return - - screenname = unquote_plus(match.group(1)) - account = findaccount(protocol) - goim(account, screenname) - - -def xmpp(uri): - protocol = "prpl-jabber" - match = re.match( - r"^xmpp:(//([^/?#]*)/?)?([^?#]*)(\?([^;#]*)(;([^#]*))?)?(#(.*))?", - uri) - if not match: - print("Invalid xmpp URI: %s" % (uri, )) - return - - tmp = match.group(2) - if tmp: - accountname = unquote_plus(tmp) - else: - accountname = "" - - screenname = unquote_plus(match.group(3)) - - tmp = match.group(5) - if tmp: - command = unquote_plus(tmp) - else: - command = "" - - paramstring = match.group(7) - params = {} - if paramstring: - for param in paramstring.split(";"): - key, value = extendlist(param.split("=", 1), 2, "") - params[key] = unquote_plus(value) - - account = findaccount(protocol, accountname) - - if command.lower() == "message": - goim(account, screenname, params.get("body")) - elif command.lower() == "join": - room, server = screenname.split("@") - gochat(account, {"room": room, "server": server}) - elif command.lower() == "roster": - addbuddy(account, screenname, params.get("group", ""), - params.get("name", "")) - else: - goim(account, screenname) - - -def gtalk(uri): - protocol = "prpl-jabber" - match = re.match(r"^gtalk:([^?]*)(\?(.*))", uri) - if not match: - print("Invalid gtalk URI: %s" % (uri, )) - return - - command = unquote_plus(match.group(1)) - paramstring = match.group(3) - params = {} - if paramstring: - for param in paramstring.split("&"): - key, value = extendlist(param.split("=", 1), 2, "") - params[key] = unquote_plus(value) - accountname = params.get("from_jid", "") - jid = params.get("jid", "") - - account = findaccount(protocol, accountname) - - if command.lower() == "chat": - goim(account, jid) - elif command.lower() == "call": - # XXX V&V prompt to establish call - goim(account, jid) - - -def main(argv=sys.argv): - if len(argv) != 2 or argv[1] == "--help" or argv[1] == "-h": - print("Usage: %s URI" % (argv[0], )) - print("Example: %s \"xmpp:romeo@montague.net?message\"" % (argv[0], )) - - if len(argv) != 2: - sys.exit(1) - else: - return 0 - - uri = argv[1] - type = uri.split(":")[0] - - try: - if type == "aim": - aim(uri) - elif type == "gg": - gg(uri) - elif type == "icq": - icq(uri) - elif type == "irc": - irc(uri) - elif type == "sip": - sip(uri) - elif type == "xmpp": - xmpp(uri) - elif type == "gtalk": - gtalk(uri) - else: - print("Unknown protocol: %s" % (type, )) - except dbus.DBusException as e: - print("Error: %s" % (str(e), )) - sys.exit(1) - - -if __name__ == "__main__": - main()
--- a/pidgin/data/im.pidgin.Pidgin.desktop.in.in Thu Nov 29 20:53:45 2018 -0600 +++ b/pidgin/data/im.pidgin.Pidgin.desktop.in.in Fri Nov 30 03:02:14 2018 +0000 @@ -2,10 +2,11 @@ Name=Pidgin GenericName=Internet Messenger Comment=Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, and more -Exec=pidgin +Exec=pidgin %U Icon=pidgin StartupNotify=true Terminal=false Type=Application Categories=Network;InstantMessaging; +MimeType=x-scheme-handler/aim;x-scheme-handler/gg;x-scheme-handler/icq;x-scheme-handler/irc;x-scheme-handler/msnim;x-scheme-handler/sip;x-scheme-handler/xmpp;x-scheme-handler/ymsgr @USES_MM_CHAT_SECTION@
