No paste!

--- libpurple/upnp.c    078d8ce871c253ca4e304ee8049fa3fb17f5a66b
+++ libpurple/upnp.c    ac80cd986dc45d99ba64e3bd241d6a2d3c67b909
@@ -403,6 +403,11 @@ upnp_parse_description_cb(PurpleUtilFetc
                lookup_internal_ip();
        }

+       if (dd->inpa > 0)
+               purple_input_remove(dd->inpa);
+       if (dd->tima > 0)
+               purple_timeout_remove(dd->tima);
+
        g_free(dd);
 }

@@ -610,7 +615,7 @@ purple_upnp_discover_send_broadcast(UPnP

        /* We have already done all our retries. Make sure that the callback
         * doesn't get called before the original function returns */
-       purple_timeout_add(10, purple_upnp_discover_timeout, dd);
+       dd->tima = purple_timeout_add(10, purple_upnp_discover_timeout, dd);
 }

 void
@@ -647,7 +652,7 @@ purple_upnp_discover(PurpleUPnPCallback
                        "purple_upnp_discover(): Failed In sock creation\n");
                /* Short circuit the retry attempts */
                dd->retry_count = NUM_UDP_ATTEMPTS;
-               purple_timeout_add(10, purple_upnp_discover_timeout, dd);
+               dd->tima = purple_timeout_add(10, purple_upnp_discover_timeout, dd);
                return;
        }

@@ -659,7 +664,7 @@ purple_upnp_discover(PurpleUPnPCallback
                        "purple_upnp_discover(): Failed In gethostbyname\n");
                /* Short circuit the retry attempts */
                dd->retry_count = NUM_UDP_ATTEMPTS;
-               purple_timeout_add(10, purple_upnp_discover_timeout, dd);
+               dd->tima = purple_timeout_add(10, purple_upnp_discover_timeout, dd);
                return;
        }