Sat, 02 Jun 2007 04:39:53 +0000
A patch from o_sukhodolsky to fix a couple warnings like this:
dbus-bindings.c: In function 'purple_status_type_find_with_id_DBUS':
dbus-bindings.c:6801: warning: passing argument 1 of 'purple_dbus_pointer_to_id_error' discards qualifiers from pointer target type
I changed the patch to use gconstpointer instead of const gpointer.
References #1344
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
1 | /* |
| 15884 | 2 | * purple |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
3 | * |
| 15884 | 4 | * Purple is the legal property of its developers, whose names are too numerous |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
5 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
6 | * source distribution. |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
7 | * |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
8 | * This program is free software; you can redistribute it and/or modify |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
9 | * it under the terms of the GNU General Public License as published by |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
10 | * the Free Software Foundation; either version 2 of the License, or |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
11 | * (at your option) any later version. |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
12 | * |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
13 | * This program is distributed in the hope that it will be useful, |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
16 | * GNU General Public License for more details. |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
17 | * |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
18 | * You should have received a copy of the GNU General Public License |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
19 | * along with this program; if not, write to the Free Software |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
21 | * |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
22 | */ |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
23 | |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
24 | #define DBUS_API_SUBJECT_TO_CHANGE |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
25 | |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
26 | #include <stdio.h> |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
27 | #include <stdlib.h> |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
28 | #include <string.h> |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
29 | |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
30 | #include "account.h" |
|
11067
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
31 | #include "blist.h" |
|
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
32 | #include "conversation.h" |
| 15884 | 33 | #include "dbus-purple.h" |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
34 | #include "dbus-server.h" |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
35 | #include "dbus-useful.h" |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
36 | #include "dbus-bindings.h" |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
37 | #include "debug.h" |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
38 | #include "core.h" |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
39 | #include "internal.h" |
|
13763
dc4815a8f4aa
[gaim-migrate @ 16173]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13761
diff
changeset
|
40 | #include "savedstatuses.h" |
| 15001 | 41 | #include "util.h" |
|
11067
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
42 | #include "value.h" |
|
14414
31ca779c0f9f
[gaim-migrate @ 17058]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
14323
diff
changeset
|
43 | #include "xmlnode.h" |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
44 | |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
45 | |
|
11067
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
46 | /**************************************************************************/ |
| 15884 | 47 | /** @name Purple DBUS pointer registration mechanism */ |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
48 | /**************************************************************************/ |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
49 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
50 | /* |
| 15884 | 51 | * Here we include the list of #PURPLE_DBUS_DEFINE_TYPE statements for |
| 52 | * all structs defined in purple. This file has been generated by the | |
|
14197
1c504c3063f3
[gaim-migrate @ 16777]
Evan Schoenberg <evands@pidgin.im>
parents:
14184
diff
changeset
|
53 | * #dbus-analyze-types.py script. |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
54 | */ |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
55 | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
56 | #include "dbus-types.c" |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
57 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
58 | /* |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
59 | * The following three hashtables map are used to translate between |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
60 | * pointers (nodes) and the corresponding handles (ids). |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
61 | */ |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
62 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
63 | static GHashTable *map_node_id; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
64 | static GHashTable *map_id_node; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
65 | static GHashTable *map_id_type; |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
66 | |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
67 | static gchar *init_error; |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
68 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
69 | /** |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
70 | * This function initializes the pointer-id traslation system. It |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
71 | * creates the three above hashtables and defines parents of some types. |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
72 | */ |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
73 | void |
| 15884 | 74 | purple_dbus_init_ids(void) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
75 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
76 | map_id_node = g_hash_table_new(g_direct_hash, g_direct_equal); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
77 | map_id_type = g_hash_table_new(g_direct_hash, g_direct_equal); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
78 | map_node_id = g_hash_table_new(g_direct_hash, g_direct_equal); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
79 | |
| 15884 | 80 | PURPLE_DBUS_TYPE(PurpleBuddy)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode); |
| 81 | PURPLE_DBUS_TYPE(PurpleContact)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode); | |
| 82 | PURPLE_DBUS_TYPE(PurpleChat)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode); | |
| 83 | PURPLE_DBUS_TYPE(PurpleGroup)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode); | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
84 | } |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
85 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
86 | void |
| 15884 | 87 | purple_dbus_register_pointer(gpointer node, PurpleDBusType *type) |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
88 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
89 | static gint last_id = 0; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
90 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
91 | g_return_if_fail(map_node_id); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
92 | g_return_if_fail(g_hash_table_lookup(map_node_id, node) == NULL); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
93 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
94 | last_id++; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
95 | g_hash_table_insert(map_node_id, node, GINT_TO_POINTER(last_id)); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
96 | g_hash_table_insert(map_id_node, GINT_TO_POINTER(last_id), node); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
97 | g_hash_table_insert(map_id_type, GINT_TO_POINTER(last_id), type); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
98 | } |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
99 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
100 | void |
| 15884 | 101 | purple_dbus_unregister_pointer(gpointer node) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
102 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
103 | gpointer id = g_hash_table_lookup(map_node_id, node); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
104 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
105 | g_hash_table_remove(map_node_id, node); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
106 | g_hash_table_remove(map_id_node, GINT_TO_POINTER(id)); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
107 | g_hash_table_remove(map_id_type, GINT_TO_POINTER(id)); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
108 | } |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
109 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
110 | gint |
|
17516
4a5036965628
A patch from o_sukhodolsky to fix a couple warnings like this:
Richard Laager <rlaager@pidgin.im>
parents:
17514
diff
changeset
|
111 | purple_dbus_pointer_to_id(gconstpointer node) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
112 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
113 | gint id = GPOINTER_TO_INT(g_hash_table_lookup(map_node_id, node)); |
|
13761
059b30a9f13f
[gaim-migrate @ 16170]
Mark Doliner <markdoliner@pidgin.im>
parents:
13221
diff
changeset
|
114 | if ((id == 0) && (node != NULL)) |
|
059b30a9f13f
[gaim-migrate @ 16170]
Mark Doliner <markdoliner@pidgin.im>
parents:
13221
diff
changeset
|
115 | { |
| 15884 | 116 | purple_debug_warning("dbus", |
|
13761
059b30a9f13f
[gaim-migrate @ 16170]
Mark Doliner <markdoliner@pidgin.im>
parents:
13221
diff
changeset
|
117 | "Need to register an object with the dbus subsystem.\n"); |
|
13765
3db4ba7f3482
[gaim-migrate @ 16175]
Richard Laager <rlaager@pidgin.im>
parents:
13763
diff
changeset
|
118 | g_return_val_if_reached(0); |
|
13761
059b30a9f13f
[gaim-migrate @ 16170]
Mark Doliner <markdoliner@pidgin.im>
parents:
13221
diff
changeset
|
119 | } |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
120 | return id; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
121 | } |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
122 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
123 | gpointer |
| 15884 | 124 | purple_dbus_id_to_pointer(gint id, PurpleDBusType *type) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
125 | { |
| 15884 | 126 | PurpleDBusType *objtype; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
127 | |
| 15884 | 128 | objtype = (PurpleDBusType*)g_hash_table_lookup(map_id_type, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
129 | GINT_TO_POINTER(id)); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
130 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
131 | while (objtype != type && objtype != NULL) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
132 | objtype = objtype->parent; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
133 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
134 | if (objtype == type) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
135 | return g_hash_table_lookup(map_id_node, GINT_TO_POINTER(id)); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
136 | else |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
137 | return NULL; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
138 | } |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
139 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
140 | gint |
|
17516
4a5036965628
A patch from o_sukhodolsky to fix a couple warnings like this:
Richard Laager <rlaager@pidgin.im>
parents:
17514
diff
changeset
|
141 | purple_dbus_pointer_to_id_error(gconstpointer ptr, DBusError *error) |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
142 | { |
| 15884 | 143 | gint id = purple_dbus_pointer_to_id(ptr); |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
144 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
145 | if (ptr != NULL && id == 0) |
|
16205
397be242f4a4
Trac Ticket #149 from JensenDied
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
146 | dbus_set_error(error, "im.pidgin.purple.ObjectNotFound", |
| 15884 | 147 | "The return object is not mapped (this is a Purple error)"); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
148 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
149 | return id; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
150 | } |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
151 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
152 | gpointer |
| 15884 | 153 | purple_dbus_id_to_pointer_error(gint id, PurpleDBusType *type, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
154 | const char *typename, DBusError *error) |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
155 | { |
| 15884 | 156 | gpointer ptr = purple_dbus_id_to_pointer(id, type); |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
157 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
158 | if (ptr == NULL && id != 0) |
|
16205
397be242f4a4
Trac Ticket #149 from JensenDied
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
159 | dbus_set_error(error, "im.pidgin.purple.InvalidHandle", |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
160 | "%s object with ID = %i not found", typename, id); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
161 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
162 | return ptr; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
163 | } |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
164 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
165 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
166 | /**************************************************************************/ |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
167 | /** @name Modified versions of some DBus functions */ |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
168 | /**************************************************************************/ |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
169 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
170 | dbus_bool_t |
| 15884 | 171 | purple_dbus_message_get_args(DBusMessage *message, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
172 | DBusError *error, int first_arg_type, ...) |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
173 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
174 | dbus_bool_t retval; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
175 | va_list var_args; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
176 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
177 | va_start(var_args, first_arg_type); |
| 15884 | 178 | retval = purple_dbus_message_get_args_valist(message, error, first_arg_type, var_args); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
179 | va_end(var_args); |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
180 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
181 | return retval; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
182 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
183 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
184 | dbus_bool_t |
| 15884 | 185 | purple_dbus_message_get_args_valist(DBusMessage *message, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
186 | DBusError *error, int first_arg_type, va_list var_args) |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
187 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
188 | DBusMessageIter iter; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
189 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
190 | dbus_message_iter_init(message, &iter); |
| 15884 | 191 | return purple_dbus_message_iter_get_args_valist(&iter, error, first_arg_type, var_args); |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
192 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
193 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
194 | dbus_bool_t |
| 15884 | 195 | purple_dbus_message_iter_get_args(DBusMessageIter *iter, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
196 | DBusError *error, int first_arg_type, ...) |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
197 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
198 | dbus_bool_t retval; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
199 | va_list var_args; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
200 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
201 | va_start(var_args, first_arg_type); |
| 15884 | 202 | retval = purple_dbus_message_iter_get_args_valist(iter, error, first_arg_type, var_args); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
203 | va_end(var_args); |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
204 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
205 | return retval; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
206 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
207 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
208 | #define TYPE_IS_CONTAINER(typecode) \ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
209 | ((typecode) == DBUS_TYPE_STRUCT || \ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
210 | (typecode) == DBUS_TYPE_DICT_ENTRY || \ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
211 | (typecode) == DBUS_TYPE_VARIANT || \ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
212 | (typecode) == DBUS_TYPE_ARRAY) |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
213 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
214 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
215 | dbus_bool_t |
| 15884 | 216 | purple_dbus_message_iter_get_args_valist(DBusMessageIter *iter, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
217 | DBusError *error, int first_arg_type, va_list var_args) |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
218 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
219 | int spec_type, msg_type, i; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
220 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
221 | spec_type = first_arg_type; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
222 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
223 | for (i = 0; spec_type != DBUS_TYPE_INVALID; i++) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
224 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
225 | msg_type = dbus_message_iter_get_arg_type(iter); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
226 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
227 | if (msg_type != spec_type) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
228 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
229 | dbus_set_error(error, DBUS_ERROR_INVALID_ARGS, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
230 | "Argument %d is specified to be of type \"%i\", but " |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
231 | "is actually of type \"%i\"\n", i, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
232 | spec_type, msg_type); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
233 | return FALSE; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
234 | } |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
235 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
236 | if (!TYPE_IS_CONTAINER(spec_type)) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
237 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
238 | gpointer ptr; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
239 | ptr = va_arg (var_args, gpointer); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
240 | dbus_message_iter_get_basic(iter, ptr); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
241 | } |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
242 | else |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
243 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
244 | DBusMessageIter *sub; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
245 | sub = va_arg (var_args, DBusMessageIter*); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
246 | dbus_message_iter_recurse(iter, sub); |
| 15884 | 247 | purple_debug_info("dbus", "subiter %p:%p\n", sub, * (gpointer*) sub); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
248 | break; /* for testing only! */ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
249 | } |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
250 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
251 | spec_type = va_arg(var_args, int); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
252 | if (!dbus_message_iter_next(iter) && spec_type != DBUS_TYPE_INVALID) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
253 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
254 | dbus_set_error (error, DBUS_ERROR_INVALID_ARGS, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
255 | "Message has only %d arguments, but more were expected", i); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
256 | return FALSE; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
257 | } |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
258 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
259 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
260 | return TRUE; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
261 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
262 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
263 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
264 | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
265 | /**************************************************************************/ |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
266 | /** @name Useful functions */ |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
267 | /**************************************************************************/ |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
268 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
269 | const char *empty_to_null(const char *str) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
270 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
271 | if (str == NULL || str[0] == 0) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
272 | return NULL; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
273 | else |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
274 | return str; |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
275 | } |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
276 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
277 | const char * |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
278 | null_to_empty(const char *s) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
279 | { |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
280 | if (s) |
|
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
281 | return s; |
|
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
282 | else |
|
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
283 | return ""; |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
284 | } |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
285 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
286 | dbus_int32_t * |
| 15884 | 287 | purple_dbusify_GList(GList *list, gboolean free_memory, dbus_int32_t *len) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
288 | { |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
289 | dbus_int32_t *array; |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
290 | int i; |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
291 | GList *elem; |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
292 | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
293 | *len = g_list_length(list); |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
294 | array = g_new0(dbus_int32_t, g_list_length(list)); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
295 | for (i = 0, elem = list; elem != NULL; elem = elem->next, i++) |
| 15884 | 296 | array[i] = purple_dbus_pointer_to_id(elem->data); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
297 | |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
298 | if (free_memory) |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
299 | g_list_free(list); |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
300 | |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
301 | return array; |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
302 | } |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
303 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
304 | dbus_int32_t * |
| 15884 | 305 | purple_dbusify_GSList(GSList *list, gboolean free_memory, dbus_int32_t *len) |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
306 | { |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
307 | dbus_int32_t *array; |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
308 | int i; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
309 | GSList *elem; |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
310 | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
311 | *len = g_slist_length(list); |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
312 | array = g_new0(dbus_int32_t, g_slist_length(list)); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
313 | for (i = 0, elem = list; elem != NULL; elem = elem->next, i++) |
| 15884 | 314 | array[i] = purple_dbus_pointer_to_id(elem->data); |
|
11067
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
315 | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
316 | if (free_memory) |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
317 | g_slist_free(list); |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
318 | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
319 | return array; |
|
11067
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
320 | } |
|
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
321 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
322 | gpointer * |
| 15884 | 323 | purple_GList_to_array(GList *list, gboolean free_memory, dbus_int32_t *len) |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
324 | { |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
325 | gpointer *array; |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
326 | int i; |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
327 | GList *elem; |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
328 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
329 | *len = g_list_length(list); |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
330 | array = g_new0(gpointer, g_list_length(list)); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
331 | for (i = 0, elem = list; elem != NULL; elem = elem->next, i++) |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
332 | array[i] = elem->data; |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
333 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
334 | if (free_memory) |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
335 | g_list_free(list); |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
336 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
337 | return array; |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
338 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
339 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
340 | gpointer * |
| 15884 | 341 | purple_GSList_to_array(GSList *list, gboolean free_memory, dbus_int32_t *len) |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
342 | { |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
343 | gpointer *array; |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
344 | int i; |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
345 | GSList *elem; |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
346 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
347 | *len = g_slist_length(list); |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
348 | array = g_new0(gpointer, g_slist_length(list)); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
349 | for (i = 0, elem = list; elem != NULL; elem = elem->next, i++) |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
350 | array[i] = elem->data; |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
351 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
352 | if (free_memory) |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
353 | g_slist_free(list); |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
354 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
355 | return array; |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
356 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
357 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
358 | GHashTable * |
| 15884 | 359 | purple_dbus_iter_hash_table(DBusMessageIter *iter, DBusError *error) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
360 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
361 | GHashTable *hash; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
362 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
363 | /* we do not need to destroy strings because they are part of the message */ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
364 | hash = g_hash_table_new(g_str_hash, g_str_equal); |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
365 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
366 | do { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
367 | char *key, *value; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
368 | DBusMessageIter subiter; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
369 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
370 | if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_DICT_ENTRY) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
371 | goto error; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
372 | /* With all due respect to Dijkstra, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
373 | * this goto is for exception |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
374 | * handling, and it is ok because it |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
375 | * avoids duplication of the code |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
376 | * responsible for destroying the hash |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
377 | * table. Exceptional instructions |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
378 | * for exceptional situations. |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
379 | */ |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
380 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
381 | dbus_message_iter_recurse(iter, &subiter); |
| 15884 | 382 | if (!purple_dbus_message_iter_get_args(&subiter, error, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
383 | DBUS_TYPE_STRING, &key, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
384 | DBUS_TYPE_STRING, &value, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
385 | DBUS_TYPE_INVALID)) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
386 | goto error; /* same here */ |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
387 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
388 | g_hash_table_insert(hash, key, value); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
389 | } while (dbus_message_iter_next(iter)); |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
390 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
391 | return hash; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
392 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
393 | error: |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
394 | g_hash_table_destroy(hash); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
395 | return NULL; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
396 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
397 | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
398 | /**************************************************************/ |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
399 | /* DBus bindings ... */ |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
400 | /**************************************************************/ |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
401 | |
| 15884 | 402 | static DBusConnection *purple_dbus_connection; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
403 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
404 | DBusConnection * |
| 15884 | 405 | purple_dbus_get_connection(void) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
406 | { |
| 15884 | 407 | return purple_dbus_connection; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
408 | } |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
409 | |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
410 | #include "dbus-bindings.c" |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
411 | |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
412 | static gboolean |
| 15884 | 413 | purple_dbus_dispatch_cb(DBusConnection *connection, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
414 | DBusMessage *message, void *user_data) |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
415 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
416 | const char *name; |
| 15884 | 417 | PurpleDBusBinding *bindings; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
418 | int i; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
419 | |
| 15884 | 420 | bindings = (PurpleDBusBinding*) user_data; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
421 | |
| 15884 | 422 | if (!dbus_message_has_path(message, DBUS_PATH_PURPLE)) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
423 | return FALSE; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
424 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
425 | name = dbus_message_get_member(message); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
426 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
427 | if (name == NULL) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
428 | return FALSE; |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
429 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
430 | if (dbus_message_get_type(message) != DBUS_MESSAGE_TYPE_METHOD_CALL) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
431 | return FALSE; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
432 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
433 | for (i = 0; bindings[i].name; i++) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
434 | if (!strcmp(name, bindings[i].name)) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
435 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
436 | DBusMessage *reply; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
437 | DBusError error; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
438 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
439 | dbus_error_init(&error); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
440 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
441 | reply = bindings[i].handler(message, &error); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
442 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
443 | if (reply == NULL && dbus_error_is_set(&error)) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
444 | reply = dbus_message_new_error (message, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
445 | error.name, error.message); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
446 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
447 | if (reply != NULL) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
448 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
449 | dbus_connection_send(connection, reply, NULL); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
450 | dbus_message_unref(reply); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
451 | } |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
452 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
453 | return TRUE; /* return reply! */ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
454 | } |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
455 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
456 | return FALSE; |
|
11067
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
457 | } |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
458 | |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
459 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
460 | static const char * |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
461 | dbus_gettext(const char **ptr) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
462 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
463 | const char *text = *ptr; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
464 | *ptr += strlen(text) + 1; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
465 | return text; |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
466 | } |
|
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
467 | |
|
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
468 | static void |
| 15884 | 469 | purple_dbus_introspect_cb(GList **bindings_list, void *bindings) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
470 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
471 | *bindings_list = g_list_prepend(*bindings_list, bindings); |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
472 | } |
|
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
473 | |
| 15884 | 474 | static DBusMessage *purple_dbus_introspect(DBusMessage *message) |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
475 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
476 | DBusMessage *reply; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
477 | GString *str; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
478 | GList *bindings_list, *node; |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
479 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
480 | str = g_string_sized_new(0x1000); /* TODO: why this size? */ |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
481 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
482 | g_string_append(str, "<!DOCTYPE node PUBLIC '-//freedesktop//DTD D-BUS Object Introspection 1.0//EN' 'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>\n"); |
| 15884 | 483 | g_string_append_printf(str, "<node name='%s'>\n", DBUS_PATH_PURPLE); |
| 484 | g_string_append_printf(str, "<interface name='%s'>\n", DBUS_INTERFACE_PURPLE); | |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
485 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
486 | bindings_list = NULL; |
| 15884 | 487 | purple_signal_emit(purple_dbus_get_handle(), "dbus-introspect", &bindings_list); |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
488 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
489 | for (node = bindings_list; node; node = node->next) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
490 | { |
| 15884 | 491 | PurpleDBusBinding *bindings; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
492 | int i; |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
493 | |
| 15884 | 494 | bindings = (PurpleDBusBinding*)node->data; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
495 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
496 | for (i = 0; bindings[i].name; i++) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
497 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
498 | const char *text; |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
499 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
500 | g_string_append_printf(str, "<method name='%s'>\n", bindings[i].name); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
501 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
502 | text = bindings[i].parameters; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
503 | while (*text) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
504 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
505 | const char *name, *direction, *type; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
506 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
507 | direction = dbus_gettext(&text); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
508 | type = dbus_gettext(&text); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
509 | name = dbus_gettext(&text); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
510 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
511 | g_string_append_printf(str, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
512 | "<arg name='%s' type='%s' direction='%s'/>\n", |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
513 | name, type, direction); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
514 | } |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
515 | g_string_append(str, "</method>\n"); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
516 | } |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
517 | } |
|
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
518 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
519 | g_string_append(str, "</interface>\n</node>\n"); |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
520 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
521 | reply = dbus_message_new_method_return(message); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
522 | dbus_message_append_args(reply, DBUS_TYPE_STRING, &(str->str), |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
523 | DBUS_TYPE_INVALID); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
524 | g_string_free(str, TRUE); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
525 | g_list_free(bindings_list); |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
526 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
527 | return reply; |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
528 | } |
|
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
529 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
530 | static DBusHandlerResult |
| 15884 | 531 | purple_dbus_dispatch(DBusConnection *connection, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
532 | DBusMessage *message, void *user_data) |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
533 | { |
| 15884 | 534 | if (purple_signal_emit_return_1(purple_dbus_get_handle(), |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
535 | "dbus-method-called", connection, message)) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
536 | return DBUS_HANDLER_RESULT_HANDLED; |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
537 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
538 | if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_METHOD_CALL && |
| 15884 | 539 | dbus_message_has_path(message, DBUS_PATH_PURPLE) && |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
540 | dbus_message_has_interface(message, DBUS_INTERFACE_INTROSPECTABLE) && |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
541 | dbus_message_has_member(message, "Introspect")) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
542 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
543 | DBusMessage *reply; |
| 15884 | 544 | reply = purple_dbus_introspect(message); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
545 | dbus_connection_send (connection, reply, NULL); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
546 | dbus_message_unref(reply); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
547 | return DBUS_HANDLER_RESULT_HANDLED; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
548 | } |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
549 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
550 | return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; |
|
11067
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
551 | } |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
552 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
553 | void |
| 15884 | 554 | purple_dbus_register_bindings(void *handle, PurpleDBusBinding *bindings) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
555 | { |
| 15884 | 556 | purple_signal_connect(purple_dbus_get_handle(), "dbus-method-called", |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
557 | handle, |
| 15884 | 558 | PURPLE_CALLBACK(purple_dbus_dispatch_cb), |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
559 | bindings); |
| 15884 | 560 | purple_signal_connect(purple_dbus_get_handle(), "dbus-introspect", |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
561 | handle, |
| 15884 | 562 | PURPLE_CALLBACK(purple_dbus_introspect_cb), |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
563 | bindings); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
564 | } |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
565 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
566 | static void |
| 15884 | 567 | purple_dbus_dispatch_init(void) |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
568 | { |
| 15884 | 569 | static DBusObjectPathVTable vtable = {NULL, &purple_dbus_dispatch, NULL, NULL, NULL, NULL}; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
570 | DBusError error; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
571 | int result; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
572 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
573 | dbus_error_init(&error); |
| 15884 | 574 | purple_dbus_connection = dbus_bus_get(DBUS_BUS_STARTER, &error); |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
575 | |
| 15884 | 576 | if (purple_dbus_connection == NULL) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
577 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
578 | init_error = g_strdup_printf(N_("Failed to get connection: %s"), error.message); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
579 | dbus_error_free(&error); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
580 | return; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
581 | } |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
582 | |
| 14960 | 583 | /* Do not allow libdbus to exit on connection failure (This may |
| 584 | work around random exit(1) on SIGPIPE errors) */ | |
| 15884 | 585 | dbus_connection_set_exit_on_disconnect (purple_dbus_connection, FALSE); |
| 14960 | 586 | |
| 15884 | 587 | if (!dbus_connection_register_object_path(purple_dbus_connection, |
| 588 | DBUS_PATH_PURPLE, &vtable, NULL)) | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
589 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
590 | init_error = g_strdup_printf(N_("Failed to get name: %s"), error.name); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
591 | dbus_error_free(&error); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
592 | return; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
593 | } |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
594 | |
| 15884 | 595 | result = dbus_bus_request_name(purple_dbus_connection, |
| 596 | DBUS_SERVICE_PURPLE, 0, &error); | |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
597 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
598 | if (dbus_error_is_set(&error)) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
599 | { |
| 15884 | 600 | dbus_connection_unref(purple_dbus_connection); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
601 | dbus_error_free(&error); |
| 15884 | 602 | purple_dbus_connection = NULL; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
603 | init_error = g_strdup_printf(N_("Failed to get serv name: %s"), error.name); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
604 | return; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
605 | } |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
606 | |
| 15884 | 607 | dbus_connection_setup_with_g_main(purple_dbus_connection, NULL); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
608 | |
| 15884 | 609 | purple_debug_misc("dbus", "okkk\n"); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
610 | |
| 15884 | 611 | purple_signal_register(purple_dbus_get_handle(), "dbus-method-called", |
| 612 | purple_marshal_BOOLEAN__POINTER_POINTER, | |
| 613 | purple_value_new(PURPLE_TYPE_BOOLEAN), 2, | |
| 614 | purple_value_new(PURPLE_TYPE_POINTER), | |
| 615 | purple_value_new(PURPLE_TYPE_POINTER)); | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
616 | |
| 15884 | 617 | purple_signal_register(purple_dbus_get_handle(), "dbus-introspect", |
| 618 | purple_marshal_VOID__POINTER, NULL, 1, | |
| 619 | purple_value_new_outgoing(PURPLE_TYPE_POINTER)); | |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
620 | |
| 15884 | 621 | PURPLE_DBUS_REGISTER_BINDINGS(purple_dbus_get_handle()); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
622 | } |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
623 | |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
624 | |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
625 | |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
626 | /**************************************************************************/ |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
627 | /** @name Signals */ |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
628 | /**************************************************************************/ |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
629 | |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
630 | |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
631 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
632 | static char * |
| 15884 | 633 | purple_dbus_convert_signal_name(const char *purple_name) |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
634 | { |
| 15884 | 635 | int purple_index, g_index; |
| 636 | char *g_name = g_new(char, strlen(purple_name) + 1); | |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
637 | gboolean capitalize_next = TRUE; |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
638 | |
| 15884 | 639 | for (purple_index = g_index = 0; purple_name[purple_index]; purple_index++) |
| 640 | if (purple_name[purple_index] != '-' && purple_name[purple_index] != '_') | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
641 | { |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
642 | if (capitalize_next) |
| 15884 | 643 | g_name[g_index++] = g_ascii_toupper(purple_name[purple_index]); |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
644 | else |
| 15884 | 645 | g_name[g_index++] = purple_name[purple_index]; |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
646 | capitalize_next = FALSE; |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
647 | } else |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
648 | capitalize_next = TRUE; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
649 | |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
650 | g_name[g_index] = 0; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
651 | |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
652 | return g_name; |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
653 | } |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
654 | |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
655 | #define my_arg(type) (ptr != NULL ? * ((type *)ptr) : va_arg(data, type)) |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
656 | |
|
17063
db9b865713c4
Show some more useful information when some signal causes some dbus warning/error.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
16205
diff
changeset
|
657 | static gboolean |
| 15884 | 658 | purple_dbus_message_append_purple_values(DBusMessageIter *iter, |
| 659 | int number, PurpleValue **purple_values, va_list data) | |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
660 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
661 | int i; |
|
17063
db9b865713c4
Show some more useful information when some signal causes some dbus warning/error.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
16205
diff
changeset
|
662 | gboolean error = FALSE; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
663 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
664 | for (i = 0; i < number; i++) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
665 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
666 | const char *str; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
667 | int id; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
668 | gint xint; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
669 | guint xuint; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
670 | gboolean xboolean; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
671 | gpointer ptr = NULL; |
|
17063
db9b865713c4
Show some more useful information when some signal causes some dbus warning/error.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
16205
diff
changeset
|
672 | gpointer val; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
673 | |
| 15884 | 674 | if (purple_value_is_outgoing(purple_values[i])) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
675 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
676 | ptr = my_arg(gpointer); |
|
17063
db9b865713c4
Show some more useful information when some signal causes some dbus warning/error.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
16205
diff
changeset
|
677 | g_return_val_if_fail(ptr, TRUE); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
678 | } |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
679 | |
| 15884 | 680 | switch (purple_values[i]->type) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
681 | { |
| 15884 | 682 | case PURPLE_TYPE_INT: |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
683 | xint = my_arg(gint); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
684 | dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &xint); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
685 | break; |
| 15884 | 686 | case PURPLE_TYPE_UINT: |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
687 | xuint = my_arg(guint); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
688 | dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &xuint); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
689 | break; |
| 15884 | 690 | case PURPLE_TYPE_BOOLEAN: |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
691 | xboolean = my_arg(gboolean); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
692 | dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &xboolean); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
693 | break; |
| 15884 | 694 | case PURPLE_TYPE_STRING: |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
695 | str = null_to_empty(my_arg(char*)); |
| 15001 | 696 | if (!g_utf8_validate(str, -1, NULL)) { |
|
15142
32b4b0750b6c
[gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents:
15001
diff
changeset
|
697 | gchar *tmp; |
| 15884 | 698 | purple_debug_error("dbus", "Invalid UTF-8 string passed to signal, emitting salvaged string!\n"); |
| 699 | tmp = purple_utf8_salvage(str); | |
|
15142
32b4b0750b6c
[gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents:
15001
diff
changeset
|
700 | dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &tmp); |
|
32b4b0750b6c
[gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents:
15001
diff
changeset
|
701 | g_free(tmp); |
|
32b4b0750b6c
[gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents:
15001
diff
changeset
|
702 | } else { |
|
32b4b0750b6c
[gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents:
15001
diff
changeset
|
703 | dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &str); |
| 15001 | 704 | } |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
705 | break; |
| 15884 | 706 | case PURPLE_TYPE_SUBTYPE: /* registered pointers only! */ |
| 707 | case PURPLE_TYPE_POINTER: | |
| 708 | case PURPLE_TYPE_OBJECT: | |
| 709 | case PURPLE_TYPE_BOXED: | |
|
17063
db9b865713c4
Show some more useful information when some signal causes some dbus warning/error.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
16205
diff
changeset
|
710 | val = my_arg(gpointer); |
|
db9b865713c4
Show some more useful information when some signal causes some dbus warning/error.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
16205
diff
changeset
|
711 | id = purple_dbus_pointer_to_id(val); |
|
db9b865713c4
Show some more useful information when some signal causes some dbus warning/error.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
16205
diff
changeset
|
712 | if (id == 0 && val != NULL) |
|
db9b865713c4
Show some more useful information when some signal causes some dbus warning/error.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
16205
diff
changeset
|
713 | error = TRUE; /* Some error happened. */ |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
714 | dbus_message_iter_append_basic(iter, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
715 | (sizeof(void *) == 4) ? DBUS_TYPE_UINT32 : DBUS_TYPE_UINT64, &id); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
716 | break; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
717 | default: /* no conversion implemented */ |
|
17063
db9b865713c4
Show some more useful information when some signal causes some dbus warning/error.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
16205
diff
changeset
|
718 | g_return_val_if_reached(TRUE); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
719 | } |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
720 | } |
|
17063
db9b865713c4
Show some more useful information when some signal causes some dbus warning/error.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
16205
diff
changeset
|
721 | return error; |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
722 | } |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
723 | |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
724 | #undef my_arg |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
725 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
726 | void |
| 15884 | 727 | purple_dbus_signal_emit_purple(const char *name, int num_values, |
| 728 | PurpleValue **values, va_list vargs) | |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
729 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
730 | DBusMessage *signal; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
731 | DBusMessageIter iter; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
732 | char *newname; |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
733 | |
|
11903
56ae8af14a0d
[gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11291
diff
changeset
|
734 | #if 0 /* this is noisy with no dbus connection */ |
| 15884 | 735 | g_return_if_fail(purple_dbus_connection); |
|
11903
56ae8af14a0d
[gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11291
diff
changeset
|
736 | #else |
| 15884 | 737 | if (purple_dbus_connection == NULL) |
|
11903
56ae8af14a0d
[gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11291
diff
changeset
|
738 | return; |
|
56ae8af14a0d
[gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11291
diff
changeset
|
739 | #endif |
|
56ae8af14a0d
[gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11291
diff
changeset
|
740 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
741 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
742 | /* |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
743 | * The test below is a hack that prevents our "dbus-method-called" |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
744 | * signal from being propagated to dbus. What we really need is a |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
745 | * flag for each signal that states whether this signal is to be |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
746 | * dbus-propagated or not. |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
747 | */ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
748 | if (!strcmp(name, "dbus-method-called")) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
749 | return; |
|
11277
ab3c0b6c5ca5
[gaim-migrate @ 13467]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11187
diff
changeset
|
750 | |
| 15884 | 751 | newname = purple_dbus_convert_signal_name(name); |
| 752 | signal = dbus_message_new_signal(DBUS_PATH_PURPLE, DBUS_INTERFACE_PURPLE, newname); | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
753 | dbus_message_iter_init_append(signal, &iter); |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
754 | |
|
17063
db9b865713c4
Show some more useful information when some signal causes some dbus warning/error.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
16205
diff
changeset
|
755 | if (purple_dbus_message_append_purple_values(&iter, num_values, values, vargs)) |
|
db9b865713c4
Show some more useful information when some signal causes some dbus warning/error.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
16205
diff
changeset
|
756 | purple_debug_warning("dbus", "The signal \"%s\" caused some dbus error.\n", name); |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
757 | |
| 15884 | 758 | dbus_connection_send(purple_dbus_connection, signal, NULL); |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
759 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
760 | g_free(newname); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
761 | dbus_message_unref(signal); |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
762 | } |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
763 | |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
764 | const char * |
| 15884 | 765 | purple_dbus_get_init_error(void) |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
766 | { |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
767 | return init_error; |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
768 | } |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
769 | |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
770 | void * |
| 15884 | 771 | purple_dbus_get_handle(void) |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
772 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
773 | static int handle; |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
774 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
775 | return &handle; |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
776 | } |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
777 | |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
778 | void |
| 15884 | 779 | purple_dbus_init(void) |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
780 | { |
| 15884 | 781 | purple_dbus_init_ids(); |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
782 | |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
783 | g_free(init_error); |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
784 | init_error = NULL; |
| 15884 | 785 | purple_dbus_dispatch_init(); |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
786 | if (init_error != NULL) |
| 15884 | 787 | purple_debug_error("dbus", "%s\n", init_error); |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
788 | } |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
789 | |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
790 | void |
| 15884 | 791 | purple_dbus_uninit(void) |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
792 | { |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
793 | /* Surely we must do SOME kind of uninitialization? */ |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
794 | |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
795 | g_free(init_error); |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
796 | init_error = NULL; |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
797 | } |