Changeset 56985aa

Timestamp:

2015-03-03T23:18:43Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

e6f47fb

Parents:

d93c8beb

Message:

Revert "purple: cleanup, remove one usage of static local_bee"

This reverts commit 5ff46180e5378acd6d103d9314175c78530bda7e.

Turns out that libpurple really doesn't provide any context at all for
some queries.

Also, not going to say "Shouldn't affect anything" again. I'm getting
good at writing code that looks good, but actually breaks stuff.
That's not good. At all.

File:

• protocols/purple/purple.c (modified) (2 diffs)

protocols/purple/purple.c

@@ -1015 +1015 @@
 {
         struct prplcb_request_action_data *pqad;
-        struct im_connection *ic = purple_ic_by_pa(account);
         int i;
         char *q;
@@ -1041 +1040 @@
         /* TODO: IRC stuff here :-( */
         q = g_strdup_printf("Request: %s\n\n%s\n\n%s", title, primary, secondary);
-        pqad->bee_data = query_add(ic->bee->ui_data, ic, q,
+        pqad->bee_data = query_add(local_bee->ui_data, purple_ic_by_pa(account), q,
                                    prplcb_request_action_yes, prplcb_request_action_no, g_free, pqad);