[Bug 34932] Use WockyMetaPorter

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=34932

--- Comment #11 from Will Thompson <will.thompson at collabora.co.uk> 2011-04-04 09:37:11 PDT ---
(In reply to comment #10)
> (In reply to comment #9)
> > Why isn't the MUC manager just registering a higher-priority handler (and
> > returning TRUE), rather than some other unrelated handler having to know
> > details of Clique?
> 
> Fair, done.

I think invite_stanza_callback in the MUC manager should return TRUE in all
cases: a malformed clique invite is still a clique invite. Otherwise we'll fall
back to showing the text of the <body/>.

> > disco: only delete the request if it hasn't been already done for us
> > 
> > This looks completely wrong to me, I'm sorry to say. As far as I can tell,
> > you'll *always* leak the SalutDiscoRequest if the cancellable is cancelled,
> > given this patch.
> 
> Yeah I guess this was the wrong to go about fixing this problem and didn't
> actually solve it in every case. I appended a patch.

@@ -490,17 +496,10 @@ out:
     {
       request->callback (request->disco, request, request->contact,
request->node,
           query_node, error, request->user_data);
-
-      /* if we really are cancelled, then don't delete the request as
-       * clearing the disco waiters is what caused us to be
-       * cancelled. */
-      if (error != NULL
-          && (error->domain != G_IO_ERROR || error->code !=
G_IO_ERROR_CANCELLED))
-        {
-          delete_request (request);
-        }
     }

+    delete_request (request);
+

nice indentation, bro.

and this is I think existing code, but while you're here you could replace
this:

  wocky_stanza_get_type_info (reply, NULL, &sub_type);

  if (sub_type == WOCKY_STANZA_SUB_TYPE_ERROR)
    {
      wocky_stanza_extract_errors (reply, NULL, &error, NULL, NULL);
      goto out;
    }

with this:

  if (wocky_stanza_extract_errors (reply, NULL, &error, NULL, NULL))
    goto out;

> > +        'nickname': re.sub(r'.*/', '', sys.argv[0]),
> [...]
> > +        name += ('-' + re.sub(r'.*/', '', sys.argv[0])[:-3])
> 
> Okay. I took this from your patch to do a similar thing in gabble
> (d7ae6c73bce69117).

Yeaaaaaaaaaaaaaaah. :D

> > Is there really no constant for this in the avahi library?
> 
> No.

:'(

So, fix the clique invite handler, fix the indentation (and if you're keen the
sub_type stuff), and merge away!

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug.
You are the assignee for the bug.