Thu, 13 May 2010 05:06:46 +0000
ChangeLog Elliott's fix for buddy icons on MSN.
|
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 |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
18223
diff
changeset
|
20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
11055
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 | |
|
22582
838faa931042
Avoid a compile warning when building with NetworkManager support because
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22223
diff
changeset
|
24 | #ifndef DBUS_API_SUBJECT_TO_CHANGE |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
25 | #define DBUS_API_SUBJECT_TO_CHANGE |
|
22582
838faa931042
Avoid a compile warning when building with NetworkManager support because
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22223
diff
changeset
|
26 | #endif |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
27 | |
|
28995
0f01bb38e32a
Fix dbus bindings. Refs #10523. Thanks, dvpdiner2.
Paul Aurich <darkrain42@pidgin.im>
parents:
28981
diff
changeset
|
28 | /* Allow the code below to see deprecated functions, so we can continue to |
|
0f01bb38e32a
Fix dbus bindings. Refs #10523. Thanks, dvpdiner2.
Paul Aurich <darkrain42@pidgin.im>
parents:
28981
diff
changeset
|
29 | * export them via DBus. */ |
|
0f01bb38e32a
Fix dbus bindings. Refs #10523. Thanks, dvpdiner2.
Paul Aurich <darkrain42@pidgin.im>
parents:
28981
diff
changeset
|
30 | #undef PURPLE_DISABLE_DEPRECATED |
|
0f01bb38e32a
Fix dbus bindings. Refs #10523. Thanks, dvpdiner2.
Paul Aurich <darkrain42@pidgin.im>
parents:
28981
diff
changeset
|
31 | |
|
28981
4e3922ab4844
Include 'internal.h' before all other headers to make some non-gcc compilers happy.
Paul Aurich <darkrain42@pidgin.im>
parents:
28574
diff
changeset
|
32 | #include "internal.h" |
|
4e3922ab4844
Include 'internal.h' before all other headers to make some non-gcc compilers happy.
Paul Aurich <darkrain42@pidgin.im>
parents:
28574
diff
changeset
|
33 | |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
34 | #include <stdio.h> |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
35 | #include <stdlib.h> |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
36 | #include <string.h> |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
37 | |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
38 | #include "account.h" |
|
11067
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
39 | #include "blist.h" |
|
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
40 | #include "conversation.h" |
| 15884 | 41 | #include "dbus-purple.h" |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
42 | #include "dbus-server.h" |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
43 | #include "dbus-useful.h" |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
44 | #include "dbus-bindings.h" |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
45 | #include "debug.h" |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
46 | #include "core.h" |
|
13763
dc4815a8f4aa
[gaim-migrate @ 16173]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13761
diff
changeset
|
47 | #include "savedstatuses.h" |
|
23022
ed4aeaec12e3
Expose the smiley API to dbus.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22582
diff
changeset
|
48 | #include "smiley.h" |
| 15001 | 49 | #include "util.h" |
|
11067
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
50 | #include "value.h" |
|
14414
31ca779c0f9f
[gaim-migrate @ 17058]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
14323
diff
changeset
|
51 | #include "xmlnode.h" |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
52 | |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
53 | |
|
11067
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
54 | /**************************************************************************/ |
| 15884 | 55 | /** @name Purple DBUS pointer registration mechanism */ |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
56 | /**************************************************************************/ |
|
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 | /* |
| 15884 | 59 | * Here we include the list of #PURPLE_DBUS_DEFINE_TYPE statements for |
| 60 | * 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
|
61 | * #dbus-analyze-types.py script. |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
62 | */ |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
63 | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
64 | #include "dbus-types.c" |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
65 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
66 | /* |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
67 | * The following three hashtables map are used to translate between |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
68 | * pointers (nodes) and the corresponding handles (ids). |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
69 | */ |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
70 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
71 | static GHashTable *map_node_id; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
72 | static GHashTable *map_id_node; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
73 | static GHashTable *map_id_type; |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
74 | |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
75 | static gchar *init_error; |
|
17121
43d41f5ce17b
Alternative dbus_uniq implementation
Gabriel Schulhof <nix@go-nix.ca>
parents:
17120
diff
changeset
|
76 | static int dbus_request_name_reply = DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER; |
|
43d41f5ce17b
Alternative dbus_uniq implementation
Gabriel Schulhof <nix@go-nix.ca>
parents:
17120
diff
changeset
|
77 | |
|
43d41f5ce17b
Alternative dbus_uniq implementation
Gabriel Schulhof <nix@go-nix.ca>
parents:
17120
diff
changeset
|
78 | gboolean purple_dbus_is_owner(void) |
|
43d41f5ce17b
Alternative dbus_uniq implementation
Gabriel Schulhof <nix@go-nix.ca>
parents:
17120
diff
changeset
|
79 | { |
|
43d41f5ce17b
Alternative dbus_uniq implementation
Gabriel Schulhof <nix@go-nix.ca>
parents:
17120
diff
changeset
|
80 | return(DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER == dbus_request_name_reply); |
|
43d41f5ce17b
Alternative dbus_uniq implementation
Gabriel Schulhof <nix@go-nix.ca>
parents:
17120
diff
changeset
|
81 | } |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
82 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
83 | /** |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
84 | * This function initializes the pointer-id traslation system. It |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
85 | * 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
|
86 | */ |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
87 | void |
| 15884 | 88 | purple_dbus_init_ids(void) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
89 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
90 | 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
|
91 | 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
|
92 | 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
|
93 | |
| 15884 | 94 | PURPLE_DBUS_TYPE(PurpleBuddy)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode); |
| 95 | PURPLE_DBUS_TYPE(PurpleContact)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode); | |
| 96 | PURPLE_DBUS_TYPE(PurpleChat)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode); | |
| 97 | PURPLE_DBUS_TYPE(PurpleGroup)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode); | |
|
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_register_pointer(gpointer node, PurpleDBusType *type) |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
102 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
103 | static gint last_id = 0; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
104 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
105 | g_return_if_fail(map_node_id); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
106 | 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
|
107 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
108 | last_id++; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
109 | 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
|
110 | 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
|
111 | 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
|
112 | } |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
113 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
114 | void |
| 15884 | 115 | purple_dbus_unregister_pointer(gpointer node) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
116 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
117 | gpointer id = g_hash_table_lookup(map_node_id, node); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
118 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
119 | g_hash_table_remove(map_node_id, node); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
120 | g_hash_table_remove(map_id_node, GINT_TO_POINTER(id)); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
121 | 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
|
122 | } |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
123 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
124 | gint |
|
17516
4a5036965628
A patch from o_sukhodolsky to fix a couple warnings like this:
Richard Laager <rlaager@pidgin.im>
parents:
17514
diff
changeset
|
125 | purple_dbus_pointer_to_id(gconstpointer node) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
126 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
127 | 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
|
128 | if ((id == 0) && (node != NULL)) |
|
059b30a9f13f
[gaim-migrate @ 16170]
Mark Doliner <markdoliner@pidgin.im>
parents:
13221
diff
changeset
|
129 | { |
|
28574
615fe5cbebe7
Some people seem to think these messages actually mean something, but not
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27568
diff
changeset
|
130 | if (purple_debug_is_verbose()) |
|
615fe5cbebe7
Some people seem to think these messages actually mean something, but not
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27568
diff
changeset
|
131 | purple_debug_warning("dbus", |
|
615fe5cbebe7
Some people seem to think these messages actually mean something, but not
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27568
diff
changeset
|
132 | "Need to register an object with the dbus subsystem." |
|
615fe5cbebe7
Some people seem to think these messages actually mean something, but not
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27568
diff
changeset
|
133 | " (If you are not a developer, please ignore this message.)\n"); |
|
17671
39bbc1a60a1d
Don't use g_return_val_if_reached() for objects not registered with dbus.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17516
diff
changeset
|
134 | return 0; |
|
13761
059b30a9f13f
[gaim-migrate @ 16170]
Mark Doliner <markdoliner@pidgin.im>
parents:
13221
diff
changeset
|
135 | } |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
136 | return id; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
137 | } |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
138 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
139 | gpointer |
| 15884 | 140 | purple_dbus_id_to_pointer(gint id, PurpleDBusType *type) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
141 | { |
| 15884 | 142 | PurpleDBusType *objtype; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
143 | |
| 15884 | 144 | objtype = (PurpleDBusType*)g_hash_table_lookup(map_id_type, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
145 | GINT_TO_POINTER(id)); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
146 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
147 | while (objtype != type && objtype != NULL) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
148 | objtype = objtype->parent; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
149 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
150 | if (objtype == type) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
151 | 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
|
152 | else |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
153 | return NULL; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
154 | } |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
155 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
156 | gint |
|
17516
4a5036965628
A patch from o_sukhodolsky to fix a couple warnings like this:
Richard Laager <rlaager@pidgin.im>
parents:
17514
diff
changeset
|
157 | 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
|
158 | { |
| 15884 | 159 | gint id = purple_dbus_pointer_to_id(ptr); |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
160 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
161 | if (ptr != NULL && id == 0) |
|
16205
397be242f4a4
Trac Ticket #149 from JensenDied
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
162 | dbus_set_error(error, "im.pidgin.purple.ObjectNotFound", |
| 15884 | 163 | "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
|
164 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
165 | return id; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
166 | } |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
167 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
168 | gpointer |
| 15884 | 169 | purple_dbus_id_to_pointer_error(gint id, PurpleDBusType *type, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
170 | const char *typename, DBusError *error) |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
171 | { |
| 15884 | 172 | gpointer ptr = purple_dbus_id_to_pointer(id, type); |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
173 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
174 | if (ptr == NULL && id != 0) |
|
16205
397be242f4a4
Trac Ticket #149 from JensenDied
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
175 | dbus_set_error(error, "im.pidgin.purple.InvalidHandle", |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
176 | "%s object with ID = %i not found", typename, id); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
177 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
178 | return ptr; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
179 | } |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
180 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
181 | |
|
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 | /** @name Modified versions of some DBus functions */ |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
184 | /**************************************************************************/ |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
185 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
186 | dbus_bool_t |
| 15884 | 187 | purple_dbus_message_get_args(DBusMessage *message, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
188 | DBusError *error, int first_arg_type, ...) |
|
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_bool_t retval; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
191 | va_list var_args; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
192 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
193 | va_start(var_args, first_arg_type); |
| 15884 | 194 | 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
|
195 | va_end(var_args); |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
196 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
197 | return retval; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
198 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
199 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
200 | dbus_bool_t |
| 15884 | 201 | purple_dbus_message_get_args_valist(DBusMessage *message, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
202 | 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
|
203 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
204 | DBusMessageIter iter; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
205 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
206 | dbus_message_iter_init(message, &iter); |
| 15884 | 207 | 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
|
208 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
209 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
210 | dbus_bool_t |
| 15884 | 211 | purple_dbus_message_iter_get_args(DBusMessageIter *iter, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
212 | DBusError *error, int first_arg_type, ...) |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
213 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
214 | dbus_bool_t retval; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
215 | va_list var_args; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
216 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
217 | va_start(var_args, first_arg_type); |
| 15884 | 218 | 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
|
219 | va_end(var_args); |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
220 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
221 | return retval; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
222 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
223 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
224 | #define TYPE_IS_CONTAINER(typecode) \ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
225 | ((typecode) == DBUS_TYPE_STRUCT || \ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
226 | (typecode) == DBUS_TYPE_DICT_ENTRY || \ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
227 | (typecode) == DBUS_TYPE_VARIANT || \ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
228 | (typecode) == DBUS_TYPE_ARRAY) |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
229 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
230 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
231 | dbus_bool_t |
| 15884 | 232 | purple_dbus_message_iter_get_args_valist(DBusMessageIter *iter, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
233 | 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
|
234 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
235 | int spec_type, msg_type, i; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
236 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
237 | spec_type = first_arg_type; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
238 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
239 | for (i = 0; spec_type != DBUS_TYPE_INVALID; i++) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
240 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
241 | msg_type = dbus_message_iter_get_arg_type(iter); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
242 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
243 | if (msg_type != spec_type) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
244 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
245 | dbus_set_error(error, DBUS_ERROR_INVALID_ARGS, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
246 | "Argument %d is specified to be of type \"%i\", but " |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
247 | "is actually of type \"%i\"\n", i, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
248 | spec_type, msg_type); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
249 | return FALSE; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
250 | } |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
251 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
252 | if (!TYPE_IS_CONTAINER(spec_type)) |
|
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 | gpointer ptr; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
255 | ptr = va_arg (var_args, gpointer); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
256 | dbus_message_iter_get_basic(iter, ptr); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
257 | } |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
258 | else |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
259 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
260 | DBusMessageIter *sub; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
261 | sub = va_arg (var_args, DBusMessageIter*); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
262 | dbus_message_iter_recurse(iter, sub); |
| 15884 | 263 | 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
|
264 | break; /* for testing only! */ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
265 | } |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
266 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
267 | spec_type = va_arg(var_args, int); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
268 | if (!dbus_message_iter_next(iter) && spec_type != DBUS_TYPE_INVALID) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
269 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
270 | dbus_set_error (error, DBUS_ERROR_INVALID_ARGS, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
271 | "Message has only %d arguments, but more were expected", i); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
272 | return FALSE; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
273 | } |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
274 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
275 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
276 | return TRUE; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
277 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
278 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
279 | |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
280 | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
281 | /**************************************************************************/ |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
282 | /** @name Useful functions */ |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
283 | /**************************************************************************/ |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
284 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
285 | const char *empty_to_null(const char *str) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
286 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
287 | if (str == NULL || str[0] == 0) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
288 | return NULL; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
289 | else |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
290 | return str; |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
291 | } |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
292 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
293 | const char * |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
294 | null_to_empty(const char *s) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
295 | { |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
296 | if (s) |
|
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
297 | return s; |
|
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
298 | else |
|
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
299 | return ""; |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
300 | } |
|
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
301 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
302 | dbus_int32_t * |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
303 | 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
|
304 | { |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
305 | dbus_int32_t *array; |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
306 | int i; |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
307 | GList *elem; |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
308 | |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
309 | *len = g_list_length(list); |
|
18123
360ed0af66ed
Lots of DBus list handling changes. The objective here was to eliminate a
Richard Laager <rlaager@pidgin.im>
parents:
18093
diff
changeset
|
310 | array = g_new0(dbus_int32_t, *len); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
311 | for (i = 0, elem = list; elem != NULL; elem = elem->next, i++) |
| 15884 | 312 | array[i] = purple_dbus_pointer_to_id(elem->data); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
313 | |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
314 | if (free_memory) |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
315 | g_list_free(list); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
316 | |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
317 | return array; |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
318 | } |
|
11055
e564996853bf
[gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff
changeset
|
319 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
320 | dbus_int32_t * |
| 15884 | 321 | 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
|
322 | { |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
323 | dbus_int32_t *array; |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
324 | int i; |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
325 | GSList *elem; |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
326 | |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
327 | *len = g_slist_length(list); |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
328 | array = g_new0(dbus_int32_t, *len); |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
329 | for (i = 0, elem = list; elem != NULL; elem = elem->next, i++) |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
330 | array[i] = purple_dbus_pointer_to_id(elem->data); |
|
18123
360ed0af66ed
Lots of DBus list handling changes. The objective here was to eliminate a
Richard Laager <rlaager@pidgin.im>
parents:
18093
diff
changeset
|
331 | |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
332 | if (free_memory) |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
333 | g_slist_free(list); |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
334 | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
335 | return array; |
|
11067
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
336 | } |
|
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
337 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
338 | gpointer * |
| 15884 | 339 | 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
|
340 | { |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
341 | gpointer *array; |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
342 | int i; |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
343 | GList *elem; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
344 | |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
345 | *len = g_list_length(list); |
|
18123
360ed0af66ed
Lots of DBus list handling changes. The objective here was to eliminate a
Richard Laager <rlaager@pidgin.im>
parents:
18093
diff
changeset
|
346 | array = g_new0(gpointer, *len); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
347 | 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
|
348 | array[i] = elem->data; |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
349 | |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
350 | if (free_memory) |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
351 | g_list_free(list); |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
352 | |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
353 | return array; |
|
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 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
356 | gpointer * |
| 15884 | 357 | 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
|
358 | { |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
359 | gpointer *array; |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
360 | int i; |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
361 | GSList *elem; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
362 | |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
363 | *len = g_slist_length(list); |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
364 | array = g_new0(gpointer, *len); |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
365 | for (i = 0, elem = list; elem != NULL; elem = elem->next, i++) |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
366 | array[i] = elem->data; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
367 | |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
368 | if (free_memory) |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
369 | g_slist_free(list); |
|
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
18142
diff
changeset
|
370 | |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
371 | return array; |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
372 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
373 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
374 | GHashTable * |
| 15884 | 375 | purple_dbus_iter_hash_table(DBusMessageIter *iter, DBusError *error) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
376 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
377 | GHashTable *hash; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
378 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
379 | /* 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
|
380 | 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
|
381 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
382 | do { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
383 | char *key, *value; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
384 | DBusMessageIter subiter; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
385 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
386 | 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
|
387 | goto error; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
388 | /* With all due respect to Dijkstra, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
389 | * this goto is for exception |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
390 | * handling, and it is ok because it |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
391 | * avoids duplication of the code |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
392 | * responsible for destroying the hash |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
393 | * table. Exceptional instructions |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
394 | * for exceptional situations. |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
395 | */ |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
396 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
397 | dbus_message_iter_recurse(iter, &subiter); |
| 15884 | 398 | if (!purple_dbus_message_iter_get_args(&subiter, error, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
399 | DBUS_TYPE_STRING, &key, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
400 | DBUS_TYPE_STRING, &value, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
401 | DBUS_TYPE_INVALID)) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
402 | goto error; /* same here */ |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
403 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
404 | g_hash_table_insert(hash, key, value); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
405 | } while (dbus_message_iter_next(iter)); |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
406 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
407 | return hash; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
408 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
409 | error: |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
410 | g_hash_table_destroy(hash); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
411 | return NULL; |
|
11187
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
412 | } |
|
27beea38898f
[gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11175
diff
changeset
|
413 | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
414 | /**************************************************************/ |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
415 | /* DBus bindings ... */ |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
416 | /**************************************************************/ |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
417 | |
| 15884 | 418 | static DBusConnection *purple_dbus_connection; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
419 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
420 | DBusConnection * |
| 15884 | 421 | purple_dbus_get_connection(void) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
422 | { |
| 15884 | 423 | return purple_dbus_connection; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
424 | } |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
425 | |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
426 | #include "dbus-bindings.c" |
|
27568
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
427 | #include "dbus-signals.c" |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
428 | |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
429 | static gboolean |
| 15884 | 430 | purple_dbus_dispatch_cb(DBusConnection *connection, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
431 | DBusMessage *message, void *user_data) |
|
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 | const char *name; |
| 15884 | 434 | PurpleDBusBinding *bindings; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
435 | int i; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
436 | |
| 15884 | 437 | bindings = (PurpleDBusBinding*) user_data; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
438 | |
| 15884 | 439 | if (!dbus_message_has_path(message, DBUS_PATH_PURPLE)) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
440 | return FALSE; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
441 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
442 | name = dbus_message_get_member(message); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
443 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
444 | if (name == NULL) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
445 | return FALSE; |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
446 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
447 | if (dbus_message_get_type(message) != DBUS_MESSAGE_TYPE_METHOD_CALL) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
448 | return FALSE; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
449 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
450 | for (i = 0; bindings[i].name; i++) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
451 | if (!strcmp(name, bindings[i].name)) |
|
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 | DBusMessage *reply; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
454 | DBusError error; |
|
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 | dbus_error_init(&error); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
457 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
458 | reply = bindings[i].handler(message, &error); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
459 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
460 | if (reply == NULL && dbus_error_is_set(&error)) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
461 | reply = dbus_message_new_error (message, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
462 | error.name, error.message); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
463 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
464 | if (reply != NULL) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
465 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
466 | dbus_connection_send(connection, reply, NULL); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
467 | dbus_message_unref(reply); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
468 | } |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
469 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
470 | return TRUE; /* return reply! */ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
471 | } |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
472 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
473 | return FALSE; |
|
11067
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
474 | } |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
475 | |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
476 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
477 | static const char * |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
478 | dbus_gettext(const char **ptr) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
479 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
480 | const char *text = *ptr; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
481 | *ptr += strlen(text) + 1; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
482 | return text; |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
483 | } |
|
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
484 | |
|
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
485 | static void |
| 15884 | 486 | purple_dbus_introspect_cb(GList **bindings_list, void *bindings) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
487 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
488 | *bindings_list = g_list_prepend(*bindings_list, bindings); |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
489 | } |
|
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
490 | |
| 15884 | 491 | static DBusMessage *purple_dbus_introspect(DBusMessage *message) |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
492 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
493 | DBusMessage *reply; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
494 | GString *str; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
495 | GList *bindings_list, *node; |
|
27568
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
496 | const char *signals; |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
497 | const char *type; |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
498 | const char *pointer_type; |
|
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 | 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
|
501 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
502 | 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 | 503 | g_string_append_printf(str, "<node name='%s'>\n", DBUS_PATH_PURPLE); |
| 504 | 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
|
505 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
506 | bindings_list = NULL; |
| 15884 | 507 | 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
|
508 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
509 | for (node = bindings_list; node; node = node->next) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
510 | { |
| 15884 | 511 | PurpleDBusBinding *bindings; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
512 | int i; |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
513 | |
| 15884 | 514 | bindings = (PurpleDBusBinding*)node->data; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
515 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
516 | for (i = 0; bindings[i].name; i++) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
517 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
518 | const char *text; |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
519 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
520 | 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
|
521 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
522 | text = bindings[i].parameters; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
523 | while (*text) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
524 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
525 | const char *name, *direction, *type; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
526 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
527 | direction = dbus_gettext(&text); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
528 | type = dbus_gettext(&text); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
529 | name = dbus_gettext(&text); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
530 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
531 | g_string_append_printf(str, |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
532 | "<arg name='%s' type='%s' direction='%s'/>\n", |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
533 | name, type, direction); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
534 | } |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
535 | g_string_append(str, "</method>\n"); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
536 | } |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
537 | } |
|
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
538 | |
|
27568
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
539 | if (sizeof(int) == sizeof(dbus_int32_t)) |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
540 | pointer_type = "type='i'"; |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
541 | else |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
542 | pointer_type = "type='x'"; |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
543 | |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
544 | signals = dbus_signals; |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
545 | while ((type = strstr(signals, "type='p'")) != NULL) { |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
546 | g_string_append_len(str, signals, type - signals); |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
547 | g_string_append(str, pointer_type); |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
548 | signals = type + sizeof("type='p'") - 1; |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
549 | } |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
550 | g_string_append(str, signals); |
|
437768598637
Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25367
diff
changeset
|
551 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
552 | g_string_append(str, "</interface>\n</node>\n"); |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
553 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
554 | reply = dbus_message_new_method_return(message); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
555 | dbus_message_append_args(reply, DBUS_TYPE_STRING, &(str->str), |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
556 | DBUS_TYPE_INVALID); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
557 | g_string_free(str, TRUE); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
558 | g_list_free(bindings_list); |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
559 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
560 | return reply; |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
561 | } |
|
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
562 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
563 | static DBusHandlerResult |
| 15884 | 564 | purple_dbus_dispatch(DBusConnection *connection, |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
565 | DBusMessage *message, void *user_data) |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
566 | { |
| 15884 | 567 | if (purple_signal_emit_return_1(purple_dbus_get_handle(), |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
568 | "dbus-method-called", connection, message)) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
569 | return DBUS_HANDLER_RESULT_HANDLED; |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
570 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
571 | if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_METHOD_CALL && |
| 15884 | 572 | dbus_message_has_path(message, DBUS_PATH_PURPLE) && |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
573 | dbus_message_has_interface(message, DBUS_INTERFACE_INTROSPECTABLE) && |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
574 | dbus_message_has_member(message, "Introspect")) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
575 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
576 | DBusMessage *reply; |
| 15884 | 577 | reply = purple_dbus_introspect(message); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
578 | dbus_connection_send (connection, reply, NULL); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
579 | dbus_message_unref(reply); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
580 | return DBUS_HANDLER_RESULT_HANDLED; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
581 | } |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
582 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
583 | return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; |
|
11067
b6353889a9ba
[gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11055
diff
changeset
|
584 | } |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
585 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
586 | void |
| 15884 | 587 | purple_dbus_register_bindings(void *handle, PurpleDBusBinding *bindings) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
588 | { |
| 15884 | 589 | purple_signal_connect(purple_dbus_get_handle(), "dbus-method-called", |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
590 | handle, |
| 15884 | 591 | PURPLE_CALLBACK(purple_dbus_dispatch_cb), |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
592 | bindings); |
| 15884 | 593 | purple_signal_connect(purple_dbus_get_handle(), "dbus-introspect", |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
594 | handle, |
| 15884 | 595 | PURPLE_CALLBACK(purple_dbus_introspect_cb), |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
596 | bindings); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
597 | } |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
598 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
599 | static void |
| 15884 | 600 | purple_dbus_dispatch_init(void) |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
601 | { |
| 15884 | 602 | 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
|
603 | DBusError error; |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
604 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
605 | dbus_error_init(&error); |
| 15884 | 606 | 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
|
607 | |
| 15884 | 608 | if (purple_dbus_connection == NULL) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
609 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
610 | 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
|
611 | dbus_error_free(&error); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
612 | return; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
613 | } |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
614 | |
| 14960 | 615 | /* Do not allow libdbus to exit on connection failure (This may |
| 616 | work around random exit(1) on SIGPIPE errors) */ | |
| 15884 | 617 | dbus_connection_set_exit_on_disconnect (purple_dbus_connection, FALSE); |
| 14960 | 618 | |
| 15884 | 619 | if (!dbus_connection_register_object_path(purple_dbus_connection, |
| 620 | DBUS_PATH_PURPLE, &vtable, NULL)) | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
621 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
622 | 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
|
623 | dbus_error_free(&error); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
624 | return; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
625 | } |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
626 | |
|
29188
99411c63a3ba
Remove an unused variable, and don't free the dbus error until after we are
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
28995
diff
changeset
|
627 | dbus_request_name_reply = dbus_bus_request_name(purple_dbus_connection, |
| 15884 | 628 | DBUS_SERVICE_PURPLE, 0, &error); |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
629 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
630 | if (dbus_error_is_set(&error)) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
631 | { |
| 15884 | 632 | dbus_connection_unref(purple_dbus_connection); |
| 633 | purple_dbus_connection = NULL; | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
634 | init_error = g_strdup_printf(N_("Failed to get serv name: %s"), error.name); |
|
29188
99411c63a3ba
Remove an unused variable, and don't free the dbus error until after we are
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
28995
diff
changeset
|
635 | dbus_error_free(&error); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
636 | return; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
637 | } |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
638 | |
| 15884 | 639 | 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
|
640 | |
| 15884 | 641 | purple_debug_misc("dbus", "okkk\n"); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
642 | |
| 15884 | 643 | purple_signal_register(purple_dbus_get_handle(), "dbus-method-called", |
| 644 | purple_marshal_BOOLEAN__POINTER_POINTER, | |
| 645 | purple_value_new(PURPLE_TYPE_BOOLEAN), 2, | |
| 646 | purple_value_new(PURPLE_TYPE_POINTER), | |
| 647 | purple_value_new(PURPLE_TYPE_POINTER)); | |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
648 | |
| 15884 | 649 | purple_signal_register(purple_dbus_get_handle(), "dbus-introspect", |
| 650 | purple_marshal_VOID__POINTER, NULL, 1, | |
| 651 | purple_value_new_outgoing(PURPLE_TYPE_POINTER)); | |
|
11175
b59bc7cc865c
[gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11171
diff
changeset
|
652 | |
| 15884 | 653 | PURPLE_DBUS_REGISTER_BINDINGS(purple_dbus_get_handle()); |
|
11171
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
654 | } |
|
a25653d60f9c
[gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11146
diff
changeset
|
655 | |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
656 | |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
657 | |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
658 | /**************************************************************************/ |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
659 | /** @name Signals */ |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
660 | /**************************************************************************/ |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
661 | |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
662 | |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
663 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
664 | static char * |
| 15884 | 665 | purple_dbus_convert_signal_name(const char *purple_name) |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
666 | { |
| 15884 | 667 | int purple_index, g_index; |
| 668 | 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
|
669 | gboolean capitalize_next = TRUE; |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
670 | |
| 15884 | 671 | for (purple_index = g_index = 0; purple_name[purple_index]; purple_index++) |
| 672 | if (purple_name[purple_index] != '-' && purple_name[purple_index] != '_') | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
673 | { |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
674 | if (capitalize_next) |
| 15884 | 675 | 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
|
676 | else |
| 15884 | 677 | g_name[g_index++] = purple_name[purple_index]; |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
678 | capitalize_next = FALSE; |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
679 | } else |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
680 | capitalize_next = TRUE; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
681 | |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
682 | g_name[g_index] = 0; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
683 | |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
684 | return g_name; |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
685 | } |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
686 | |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
687 | #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
|
688 | |
|
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
|
689 | static gboolean |
| 15884 | 690 | purple_dbus_message_append_purple_values(DBusMessageIter *iter, |
| 691 | int number, PurpleValue **purple_values, va_list data) | |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
692 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
693 | 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
|
694 | gboolean error = FALSE; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
695 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
696 | for (i = 0; i < number; i++) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
697 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
698 | const char *str; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
699 | int id; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
700 | gint xint; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
701 | guint xuint; |
|
20249
603650f32ee4
applied changes from c6a89223516b0abb6cbb399c2066e3b6a7b69d19
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
702 | gint64 xint64; |
|
603650f32ee4
applied changes from c6a89223516b0abb6cbb399c2066e3b6a7b69d19
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
703 | guint64 xuint64; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
704 | gboolean xboolean; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
705 | 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
|
706 | gpointer val; |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
707 | |
| 15884 | 708 | if (purple_value_is_outgoing(purple_values[i])) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
709 | { |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
710 | 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
|
711 | g_return_val_if_fail(ptr, TRUE); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
712 | } |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
713 | |
| 15884 | 714 | switch (purple_values[i]->type) |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
715 | { |
| 15884 | 716 | case PURPLE_TYPE_INT: |
|
22223
3a1bd435e563
Make sure the 'connection-error' signal doesn't cause a dbus error message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22186
diff
changeset
|
717 | case PURPLE_TYPE_ENUM: |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
718 | xint = my_arg(gint); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
719 | dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &xint); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
720 | break; |
| 15884 | 721 | case PURPLE_TYPE_UINT: |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
722 | xuint = my_arg(guint); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
723 | dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &xuint); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
724 | break; |
|
20249
603650f32ee4
applied changes from c6a89223516b0abb6cbb399c2066e3b6a7b69d19
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
725 | case PURPLE_TYPE_INT64: |
|
20252
9d14e73775c1
applied changes from e2f6be4e0c0daee25fdb3250a7e16a881922f8c4
Luke Schierer <lschiere@pidgin.im>
parents:
20249
diff
changeset
|
726 | xint64 = my_arg(gint64); |
|
9d14e73775c1
applied changes from e2f6be4e0c0daee25fdb3250a7e16a881922f8c4
Luke Schierer <lschiere@pidgin.im>
parents:
20249
diff
changeset
|
727 | dbus_message_iter_append_basic(iter, DBUS_TYPE_INT64, &xint64); |
|
20249
603650f32ee4
applied changes from c6a89223516b0abb6cbb399c2066e3b6a7b69d19
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
728 | break; |
|
603650f32ee4
applied changes from c6a89223516b0abb6cbb399c2066e3b6a7b69d19
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
729 | case PURPLE_TYPE_UINT64: |
|
20252
9d14e73775c1
applied changes from e2f6be4e0c0daee25fdb3250a7e16a881922f8c4
Luke Schierer <lschiere@pidgin.im>
parents:
20249
diff
changeset
|
730 | xuint64 = my_arg(guint64); |
|
9d14e73775c1
applied changes from e2f6be4e0c0daee25fdb3250a7e16a881922f8c4
Luke Schierer <lschiere@pidgin.im>
parents:
20249
diff
changeset
|
731 | dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT64, &xuint64); |
|
20249
603650f32ee4
applied changes from c6a89223516b0abb6cbb399c2066e3b6a7b69d19
Luke Schierer <lschiere@pidgin.im>
parents:
19859
diff
changeset
|
732 | break; |
| 15884 | 733 | case PURPLE_TYPE_BOOLEAN: |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
734 | xboolean = my_arg(gboolean); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
735 | dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &xboolean); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
736 | break; |
| 15884 | 737 | case PURPLE_TYPE_STRING: |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
738 | str = null_to_empty(my_arg(char*)); |
| 15001 | 739 | if (!g_utf8_validate(str, -1, NULL)) { |
|
15142
32b4b0750b6c
[gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents:
15001
diff
changeset
|
740 | gchar *tmp; |
| 15884 | 741 | purple_debug_error("dbus", "Invalid UTF-8 string passed to signal, emitting salvaged string!\n"); |
| 742 | tmp = purple_utf8_salvage(str); | |
|
15142
32b4b0750b6c
[gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents:
15001
diff
changeset
|
743 | dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &tmp); |
|
32b4b0750b6c
[gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents:
15001
diff
changeset
|
744 | g_free(tmp); |
|
32b4b0750b6c
[gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents:
15001
diff
changeset
|
745 | } else { |
|
32b4b0750b6c
[gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents:
15001
diff
changeset
|
746 | dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &str); |
| 15001 | 747 | } |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
748 | break; |
| 15884 | 749 | case PURPLE_TYPE_SUBTYPE: /* registered pointers only! */ |
| 750 | case PURPLE_TYPE_POINTER: | |
| 751 | case PURPLE_TYPE_OBJECT: | |
| 752 | 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
|
753 | 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
|
754 | 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
|
755 | 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
|
756 | error = TRUE; /* Some error happened. */ |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
757 | dbus_message_iter_append_basic(iter, |
|
22186
c3146c500dae
A patch from Andreas Stührk (Trundle) to fix a problem with our DBus code
Andreas Stührk <andy-pidgin@hammerhartes.de>
parents:
20252
diff
changeset
|
758 | (sizeof(id) == sizeof(dbus_int32_t)) ? DBUS_TYPE_INT32 : DBUS_TYPE_INT64, &id); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
759 | break; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
760 | 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
|
761 | g_return_val_if_reached(TRUE); |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
762 | } |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
763 | } |
|
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
|
764 | return error; |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
765 | } |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
766 | |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
767 | #undef my_arg |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
768 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
769 | void |
| 15884 | 770 | purple_dbus_signal_emit_purple(const char *name, int num_values, |
| 771 | PurpleValue **values, va_list vargs) | |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
772 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
773 | DBusMessage *signal; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
774 | DBusMessageIter iter; |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
775 | char *newname; |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
776 | |
|
11903
56ae8af14a0d
[gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11291
diff
changeset
|
777 | #if 0 /* this is noisy with no dbus connection */ |
| 15884 | 778 | g_return_if_fail(purple_dbus_connection); |
|
11903
56ae8af14a0d
[gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11291
diff
changeset
|
779 | #else |
| 15884 | 780 | if (purple_dbus_connection == NULL) |
|
11903
56ae8af14a0d
[gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11291
diff
changeset
|
781 | return; |
|
56ae8af14a0d
[gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11291
diff
changeset
|
782 | #endif |
|
56ae8af14a0d
[gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11291
diff
changeset
|
783 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
784 | |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
785 | /* |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
786 | * 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
|
787 | * 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
|
788 | * 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
|
789 | * dbus-propagated or not. |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
790 | */ |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
791 | if (!strcmp(name, "dbus-method-called")) |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
792 | return; |
|
11277
ab3c0b6c5ca5
[gaim-migrate @ 13467]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11187
diff
changeset
|
793 | |
| 15884 | 794 | newname = purple_dbus_convert_signal_name(name); |
| 795 | 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
|
796 | dbus_message_iter_init_append(signal, &iter); |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
797 | |
|
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
|
798 | if (purple_dbus_message_append_purple_values(&iter, num_values, values, vargs)) |
|
28574
615fe5cbebe7
Some people seem to think these messages actually mean something, but not
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27568
diff
changeset
|
799 | if (purple_debug_is_verbose()) |
|
615fe5cbebe7
Some people seem to think these messages actually mean something, but not
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27568
diff
changeset
|
800 | purple_debug_warning("dbus", |
|
615fe5cbebe7
Some people seem to think these messages actually mean something, but not
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27568
diff
changeset
|
801 | "The signal \"%s\" caused some dbus error." |
|
615fe5cbebe7
Some people seem to think these messages actually mean something, but not
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27568
diff
changeset
|
802 | " (If you are not a developer, please ignore this message.)\n", |
|
615fe5cbebe7
Some people seem to think these messages actually mean something, but not
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27568
diff
changeset
|
803 | name); |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
804 | |
| 15884 | 805 | dbus_connection_send(purple_dbus_connection, signal, NULL); |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
806 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
807 | g_free(newname); |
|
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
808 | dbus_message_unref(signal); |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
809 | } |
|
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
810 | |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
811 | const char * |
| 15884 | 812 | purple_dbus_get_init_error(void) |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
813 | { |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
814 | return init_error; |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
815 | } |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
816 | |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
817 | void * |
| 15884 | 818 | purple_dbus_get_handle(void) |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
819 | { |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
820 | static int handle; |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
821 | |
|
14025
98bb9921edfa
[gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents:
14017
diff
changeset
|
822 | return &handle; |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
823 | } |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
824 | |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
825 | void |
| 15884 | 826 | purple_dbus_init(void) |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
827 | { |
|
25367
8b430003342c
Only initialize dbus threading if glib threading is initialized. The idea is
Daniel Atallah <datallah@pidgin.im>
parents:
25361
diff
changeset
|
828 | if (g_thread_supported()) |
|
8b430003342c
Only initialize dbus threading if glib threading is initialized. The idea is
Daniel Atallah <datallah@pidgin.im>
parents:
25361
diff
changeset
|
829 | dbus_g_thread_init(); |
|
25361
bc96fa7224fd
Kir Kolyshkin figured out that we need to initialize the dbus threading to avoid
Daniel Atallah <datallah@pidgin.im>
parents:
24569
diff
changeset
|
830 | |
| 15884 | 831 | purple_dbus_init_ids(); |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
832 | |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
833 | g_free(init_error); |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
834 | init_error = NULL; |
| 15884 | 835 | purple_dbus_dispatch_init(); |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
836 | if (init_error != NULL) |
| 15884 | 837 | purple_debug_error("dbus", "%s\n", init_error); |
|
11080
0578003800d0
[gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11068
diff
changeset
|
838 | } |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
839 | |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
840 | void |
| 15884 | 841 | purple_dbus_uninit(void) |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
842 | { |
|
18205
4c8e464e432f
Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18201
diff
changeset
|
843 | DBusError error; |
|
4c8e464e432f
Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18201
diff
changeset
|
844 | if (!purple_dbus_connection) |
|
4c8e464e432f
Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18201
diff
changeset
|
845 | return; |
|
11146
c56333373e3c
[gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
11080
diff
changeset
|
846 | |
|
18205
4c8e464e432f
Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18201
diff
changeset
|
847 | dbus_error_init(&error); |
|
4c8e464e432f
Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18201
diff
changeset
|
848 | dbus_connection_unregister_object_path(purple_dbus_connection, DBUS_PATH_PURPLE); |
|
4c8e464e432f
Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18201
diff
changeset
|
849 | dbus_bus_release_name(purple_dbus_connection, DBUS_SERVICE_PURPLE, &error); |
|
4c8e464e432f
Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18201
diff
changeset
|
850 | dbus_error_free(&error); |
|
4c8e464e432f
Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18201
diff
changeset
|
851 | dbus_connection_unref(purple_dbus_connection); |
|
4c8e464e432f
Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18201
diff
changeset
|
852 | purple_dbus_connection = NULL; |
|
4c8e464e432f
Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18201
diff
changeset
|
853 | purple_signals_disconnect_by_handle(purple_dbus_get_handle()); |
|
14017
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
854 | g_free(init_error); |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
855 | init_error = NULL; |
|
db3f1bdc95c6
[gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents:
13765
diff
changeset
|
856 | } |
|
18205
4c8e464e432f
Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18201
diff
changeset
|
857 |