Remove MSN from URL handlers

3 files changed, 0 insertions, 62 deletions

diff --git a/libpurple/data/gconf/purple.schemas.in b/libpurple/data/gconf/purple.schemas.in
index e4fe0e4302..2fd0eb0ad6 100644
--- a/libpurple/data/gconf/purple.schemas.in
+++ b/libpurple/data/gconf/purple.schemas.in
@@ -138,40 +138,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/desktop/gnome/url-handlers/msnim/enabled</key>
-      <applyto>/desktop/gnome/url-handlers/msnim/enabled</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether the specified command should handle "msnim" URLs</short>
-        <long>True if the command specified in the "command" key should handle "msnim" URLs.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/msnim/command</key>
-      <applyto>/desktop/gnome/url-handlers/msnim/command</applyto>
-      <owner>purple</owner>
-      <type>string</type>
-      <default>purple-url-handler "%s"</default>
-      <locale name="C">
-        <short>The handler for "msnim" URLs</short>
-        <long>The command used to handle "msnim" URLs, if enabled.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/url-handlers/msnim/needs_terminal</key>
-      <applyto>/desktop/gnome/url-handlers/msnim/needs_terminal</applyto>
-      <owner>purple</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Run the command in a terminal</short>
-        <long>True if the command used to handle this type of URL should be run in a terminal.</long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/desktop/gnome/url-handlers/sip/enabled</key>
       <applyto>/desktop/gnome/url-handlers/sip/enabled</applyto>
       <owner>purple</owner>
diff --git a/libpurple/purple-url-handler b/libpurple/purple-url-handler
index 05a704862a..9c269abefa 100755
--- a/libpurple/purple-url-handler
+++ b/libpurple/purple-url-handler
@@ -224,29 +224,6 @@ def irc(uri):
                 channel = "#" + channel
             gochat(account, {"server": server, "channel": channel, "password": params.get("key", "")}, params.get("msg"))
 
-def msnim(uri):
-    protocol = "prpl-msn"
-    match = re.match(r"^msnim:([^?]*)(\?(.*))", uri)
-    if not match:
-        print("Invalid msnim 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)
-    screenname = params.get("contact", "")
-
-    account = findaccount(protocol)
-
-    if command.lower() == "chat":
-        goim(account, screenname)
-    elif command.lower() == "add":
-        addbuddy(account, screenname)
-
 def myim(uri):
         protocol = "prpl-myspace"
         print "TODO: send uri: ", uri
@@ -376,8 +353,6 @@ def main(argv=sys.argv):
             icq(uri)
         elif type == "irc":
             irc(uri)
-        elif type == "msnim":
-            msnim(uri)
         elif type == "myim":
             myim(uri)
         elif type == "sip":
diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi
index ee2be32da4..601f90ebed 100644
--- a/pidgin/win32/nsis/pidgin-installer.nsi
+++ b/pidgin/win32/nsis/pidgin-installer.nsi
@@ -388,7 +388,6 @@ SectionGroupEnd
 !macroend
 SectionGroup /e $(URIHANDLERSSECTIONTITLE) SecURIHandlers
   !insertmacro URI_SECTION "aim"
-  !insertmacro URI_SECTION "msnim"
   !insertmacro URI_SECTION "myim"
   !insertmacro URI_SECTION "ymsgr"
   !insertmacro URI_SECTION "xmpp"
@@ -506,8 +505,6 @@ Section Uninstall
     ; I can't think of an easy way to maintain a list in a single place
     Push "aim"
     Call un.UnregisterURIHandler
-    Push "msnim"
-    Call un.UnregisterURIHandler
     Push "myim"
     Call un.UnregisterURIHandler
     Push "ymsgr"