Mercurial > pidgin.yaz
annotate libpurple/dbus-maybe.h @ 24425:7cf760f3560e
Don't try to free NULL xmlnodes stolen by jabber-receiving-xmlnode handlers
Handlers get a (xmlnode **) that they're meant to set to NULL if they steal
the node for their own nefarious purposes, signalling to the prpl that it
should forget about that node. But the prpl still tried to free the xmlnode*
even if it had been NULLified, triggering g_return_if_fail warnings.
Fixes the issue discussed by Arne Knig in
http://pidgin.im/pipermail/devel/2008-November/007035.html and the following
messages.
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Fri, 21 Nov 2008 12:12:31 +0000 |
parents | 1568dc7a14f8 |
children |
rev | line source |
---|---|
15823 | 1 /* This file contains macros that wrap calls to the purple dbus module. |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
2 These macros call the appropriate functions if the build includes |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
3 dbus support and do nothing otherwise. See "dbus-server.h" for |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
4 documentation. */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
5 |
15823 | 6 #ifndef _PURPLE_DBUS_MAYBE_H_ |
7 #define _PURPLE_DBUS_MAYBE_H_ | |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
8 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
9 #ifdef HAVE_DBUS |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
10 |
22983
410f1bf7f734
I have no idea why this only started being an issue now, but as I was
Stu Tomlinson <stu@nosnilmot.com>
parents:
15823
diff
changeset
|
11 #ifndef DBUS_API_SUBJECT_TO_CHANGE |
410f1bf7f734
I have no idea why this only started being an issue now, but as I was
Stu Tomlinson <stu@nosnilmot.com>
parents:
15823
diff
changeset
|
12 #define DBUS_API_SUBJECT_TO_CHANGE |
410f1bf7f734
I have no idea why this only started being an issue now, but as I was
Stu Tomlinson <stu@nosnilmot.com>
parents:
15823
diff
changeset
|
13 #endif |
410f1bf7f734
I have no idea why this only started being an issue now, but as I was
Stu Tomlinson <stu@nosnilmot.com>
parents:
15823
diff
changeset
|
14 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
15 #include "dbus-server.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
16 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
17 /* this provides a type check */ |
15823 | 18 #define PURPLE_DBUS_REGISTER_POINTER(ptr, type) { \ |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
19 type *typed_ptr = ptr; \ |
15823 | 20 purple_dbus_register_pointer(typed_ptr, PURPLE_DBUS_TYPE(type)); \ |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
21 } |
15823 | 22 #define PURPLE_DBUS_UNREGISTER_POINTER(ptr) purple_dbus_unregister_pointer(ptr) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
23 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
24 #else /* !HAVE_DBUS */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
25 |
23964
1568dc7a14f8
Warnings cleanup from Lee Roach. Fixes #6242.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
22983
diff
changeset
|
26 #define PURPLE_DBUS_REGISTER_POINTER(ptr, type) { \ |
1568dc7a14f8
Warnings cleanup from Lee Roach. Fixes #6242.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
22983
diff
changeset
|
27 if (ptr) {} \ |
1568dc7a14f8
Warnings cleanup from Lee Roach. Fixes #6242.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
22983
diff
changeset
|
28 } |
1568dc7a14f8
Warnings cleanup from Lee Roach. Fixes #6242.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
22983
diff
changeset
|
29 |
15823 | 30 #define PURPLE_DBUS_UNREGISTER_POINTER(ptr) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
31 #define DBUS_EXPORT |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
32 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
33 #endif /* HAVE_DBUS */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
34 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
35 #endif |