libpurple/dbus-server.c

Mon, 10 Feb 2014 00:56:22 +0530

author
Ankit Vani <a@nevitus.org>
date
Mon, 10 Feb 2014 00:56:22 +0530
branch
gtkdoc-conversion
changeset 35499
c4c5e0a670b1
parent 35472
474e26199560
child 35702
06a934baa610
permissions
-rw-r--r--

Fix namespaces issues in libpurple.
Renamed:
'empty_to_null' to 'purple_emptystr_to_null'
'null_to_empty' to 'purple_null_to_emptystr'
'DBUS_SERVICE_PURPLE' to 'PURPLE_DBUS_SERVICE'
'DBUS_PATH_PURPLE' to 'PURPLE_DBUS_PATH'
'DBUS_INTERFACE_PURPLE' to 'PURPLE_DBUS_INTERFACE'
'serv_*' to 'purple_serv_*'
'StunCallback' to 'PurpleStunCallback'
'PTFunc' to 'PurpleThemeFunc'
'UPnPMappingAddRemove' to 'PurpleUPnPMappingAddRemove'

11055
e564996853bf [gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
1 /*
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2 * purple
11055
e564996853bf [gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
3 *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
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"
34706
02cb08146888 Renamed blist.[ch] to buddylist.[ch]
Ankit Vani <a@nevitus.org>
parents: 34699
diff changeset
39 #include "buddylist.h"
11067
b6353889a9ba [gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11055
diff changeset
40 #include "conversation.h"
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
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
7996da15af1a [gaim-migrate @ 17711]
Ethan Blanton <elb@pidgin.im>
parents: 14960
diff changeset
49 #include "util.h"
14414
31ca779c0f9f [gaim-migrate @ 17058]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14323
diff changeset
50 #include "xmlnode.h"
11055
e564996853bf [gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
51
11080
0578003800d0 [gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11068
diff changeset
52
11067
b6353889a9ba [gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11055
diff changeset
53 /**************************************************************************/
35472
474e26199560 Removed @name
Ankit Vani <a@nevitus.org>
parents: 35460
diff changeset
54 /* Purple DBUS pointer registration mechanism */
11080
0578003800d0 [gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11068
diff changeset
55 /**************************************************************************/
11055
e564996853bf [gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
56
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
57 /*
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
58 * Here we include the list of #PURPLE_DBUS_DEFINE_TYPE statements for
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
59 * 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
60 * #dbus-analyze-types.py script.
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
61 */
11055
e564996853bf [gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
62
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
63 #include "dbus-types.c"
11055
e564996853bf [gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
64
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
65 /*
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
66 * The following three hashtables map are used to translate between
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
67 * pointers (nodes) and the corresponding handles (ids).
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
68 */
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
69
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
70 static GHashTable *map_node_id;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
71 static GHashTable *map_id_node;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
72 static GHashTable *map_id_type;
11080
0578003800d0 [gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11068
diff changeset
73
14017
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
74 static gchar *init_error;
17121
43d41f5ce17b Alternative dbus_uniq implementation
Gabriel Schulhof <nix@go-nix.ca>
parents: 17120
diff changeset
75 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
76
43d41f5ce17b Alternative dbus_uniq implementation
Gabriel Schulhof <nix@go-nix.ca>
parents: 17120
diff changeset
77 gboolean purple_dbus_is_owner(void)
43d41f5ce17b Alternative dbus_uniq implementation
Gabriel Schulhof <nix@go-nix.ca>
parents: 17120
diff changeset
78 {
43d41f5ce17b Alternative dbus_uniq implementation
Gabriel Schulhof <nix@go-nix.ca>
parents: 17120
diff changeset
79 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
80 }
14017
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
81
35460
96946e21fce5 Fix some more gtk-doc warnings till dnssrv
Ankit Vani <a@nevitus.org>
parents: 35009
diff changeset
82 /*
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
83 * This function initializes the pointer-id traslation system. It
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
84 * 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
85 */
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
86 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
87 purple_dbus_init_ids(void)
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
88 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
89 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
90 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
91 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
92
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
93 PURPLE_DBUS_TYPE(PurpleBuddy)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
94 PURPLE_DBUS_TYPE(PurpleContact)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
95 PURPLE_DBUS_TYPE(PurpleChat)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
96 PURPLE_DBUS_TYPE(PurpleGroup)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode);
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
97 }
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
98
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
99 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
100 purple_dbus_register_pointer(gpointer node, PurpleDBusType *type)
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
101 {
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
102 static gint last_id = 0;
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
103
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
104 g_return_if_fail(map_node_id);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
105 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
106
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
107 last_id++;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
108 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
109 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
110 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
111 }
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
112
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
113 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
114 purple_dbus_unregister_pointer(gpointer node)
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
115 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
116 gpointer id = g_hash_table_lookup(map_node_id, node);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
117
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
118 g_hash_table_remove(map_node_id, node);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
119 g_hash_table_remove(map_id_node, GINT_TO_POINTER(id));
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
120 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
121 }
11055
e564996853bf [gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
122
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
123 gint
17516
4a5036965628 A patch from o_sukhodolsky to fix a couple warnings like this:
Richard Laager <rlaager@pidgin.im>
parents: 17514
diff changeset
124 purple_dbus_pointer_to_id(gconstpointer node)
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
125 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
126 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
127 if ((id == 0) && (node != NULL))
059b30a9f13f [gaim-migrate @ 16170]
Mark Doliner <markdoliner@pidgin.im>
parents: 13221
diff changeset
128 {
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
129 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
130 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
131 "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
132 " (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
133 return 0;
13761
059b30a9f13f [gaim-migrate @ 16170]
Mark Doliner <markdoliner@pidgin.im>
parents: 13221
diff changeset
134 }
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
135 return id;
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
136 }
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
137
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
138 gpointer
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
139 purple_dbus_id_to_pointer(gint id, PurpleDBusType *type)
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
140 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
141 PurpleDBusType *objtype;
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
142
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
143 objtype = (PurpleDBusType*)g_hash_table_lookup(map_id_type,
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
144 GINT_TO_POINTER(id));
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
145
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
146 while (objtype != type && objtype != NULL)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
147 objtype = objtype->parent;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
148
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
149 if (objtype == type)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
150 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
151 else
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
152 return NULL;
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
153 }
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
154
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
155 gint
17516
4a5036965628 A patch from o_sukhodolsky to fix a couple warnings like this:
Richard Laager <rlaager@pidgin.im>
parents: 17514
diff changeset
156 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
157 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
158 gint id = purple_dbus_pointer_to_id(ptr);
11055
e564996853bf [gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
159
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
160 if (ptr != NULL && id == 0)
16205
397be242f4a4 Trac Ticket #149 from JensenDied
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
161 dbus_set_error(error, "im.pidgin.purple.ObjectNotFound",
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
162 "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
163
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
164 return id;
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
165 }
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
166
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
167 gpointer
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
168 purple_dbus_id_to_pointer_error(gint id, PurpleDBusType *type,
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
169 const char *typename, DBusError *error)
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
170 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
171 gpointer ptr = purple_dbus_id_to_pointer(id, type);
11055
e564996853bf [gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
172
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
173 if (ptr == NULL && id != 0)
16205
397be242f4a4 Trac Ticket #149 from JensenDied
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
174 dbus_set_error(error, "im.pidgin.purple.InvalidHandle",
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
175 "%s object with ID = %i not found", typename, id);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
176
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
177 return ptr;
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
178 }
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
179
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 /**************************************************************************/
35472
474e26199560 Removed @name
Ankit Vani <a@nevitus.org>
parents: 35460
diff changeset
182 /* Modified versions of some DBus functions */
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
183 /**************************************************************************/
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
184
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
185 dbus_bool_t
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
186 purple_dbus_message_get_args(DBusMessage *message,
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
187 DBusError *error, int first_arg_type, ...)
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
188 {
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
189 dbus_bool_t retval;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
190 va_list var_args;
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
191
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
192 va_start(var_args, first_arg_type);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
193 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
194 va_end(var_args);
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
195
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
196 return retval;
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
197 }
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 dbus_bool_t
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
200 purple_dbus_message_get_args_valist(DBusMessage *message,
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
201 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
202 {
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
203 DBusMessageIter iter;
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
204
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
205 dbus_message_iter_init(message, &iter);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
206 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
207 }
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 dbus_bool_t
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
210 purple_dbus_message_iter_get_args(DBusMessageIter *iter,
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
211 DBusError *error, int first_arg_type, ...)
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
212 {
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
213 dbus_bool_t retval;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
214 va_list var_args;
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
215
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
216 va_start(var_args, first_arg_type);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
217 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
218 va_end(var_args);
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
219
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
220 return retval;
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
221 }
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
222
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
223 #define TYPE_IS_CONTAINER(typecode) \
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
224 ((typecode) == DBUS_TYPE_STRUCT || \
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
225 (typecode) == DBUS_TYPE_DICT_ENTRY || \
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
226 (typecode) == DBUS_TYPE_VARIANT || \
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
227 (typecode) == DBUS_TYPE_ARRAY)
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
228
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 dbus_bool_t
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
231 purple_dbus_message_iter_get_args_valist(DBusMessageIter *iter,
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
232 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
233 {
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
234 int spec_type, msg_type, i;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
235
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
236 spec_type = first_arg_type;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
237
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
238 for (i = 0; spec_type != DBUS_TYPE_INVALID; i++)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
239 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
240 msg_type = dbus_message_iter_get_arg_type(iter);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
241
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
242 if (msg_type != spec_type)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
243 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
244 dbus_set_error(error, DBUS_ERROR_INVALID_ARGS,
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
245 "Argument %d is specified to be of type \"%i\", but "
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
246 "is actually of type \"%i\"\n", i,
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
247 spec_type, msg_type);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
248 return FALSE;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
249 }
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
250
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
251 if (!TYPE_IS_CONTAINER(spec_type))
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
252 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
253 gpointer ptr;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
254 ptr = va_arg (var_args, gpointer);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
255 dbus_message_iter_get_basic(iter, ptr);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
256 }
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
257 else
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
258 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
259 DBusMessageIter *sub;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
260 sub = va_arg (var_args, DBusMessageIter*);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
261 dbus_message_iter_recurse(iter, sub);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
262 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
263 break; /* for testing only! */
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
264 }
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
265
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
266 spec_type = va_arg(var_args, int);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
267 if (!dbus_message_iter_next(iter) && spec_type != DBUS_TYPE_INVALID)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
268 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
269 dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
270 "Message has only %d arguments, but more were expected", i);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
271 return FALSE;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
272 }
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
273 }
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
274
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
275 return TRUE;
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
276 }
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
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
280 /**************************************************************************/
35472
474e26199560 Removed @name
Ankit Vani <a@nevitus.org>
parents: 35460
diff changeset
281 /* Useful functions */
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
282 /**************************************************************************/
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
283
35499
c4c5e0a670b1 Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents: 35472
diff changeset
284 const char *purple_emptystr_to_null(const char *str)
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
285 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
286 if (str == NULL || str[0] == 0)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
287 return NULL;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
288 else
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
289 return str;
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
290 }
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
291
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
292 const char *
35499
c4c5e0a670b1 Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents: 35472
diff changeset
293 purple_null_to_emptystr(const char *s)
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
294 {
11080
0578003800d0 [gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11068
diff changeset
295 if (s)
0578003800d0 [gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11068
diff changeset
296 return s;
0578003800d0 [gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11068
diff changeset
297 else
0578003800d0 [gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11068
diff changeset
298 return "";
11055
e564996853bf [gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
299 }
e564996853bf [gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
300
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
301 dbus_int32_t *
32662
f6cf0e904b45 Remove free_memory argument from D-Bus list functions. It's already
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32236
diff changeset
302 purple_dbusify_GList(GList *list, dbus_int32_t *len)
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
303 {
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
304 dbus_int32_t *array;
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
305 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
306 GList *elem;
11055
e564996853bf [gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
307
18190
bcf28ef7e8ff Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents: 18142
diff changeset
308 *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
309 array = g_new0(dbus_int32_t, *len);
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
310 for (i = 0, elem = list; elem != NULL; elem = elem->next, i++)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
311 array[i] = purple_dbus_pointer_to_id(elem->data);
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
312
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
313 return array;
11080
0578003800d0 [gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11068
diff changeset
314 }
11055
e564996853bf [gaim-migrate @ 12996]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents:
diff changeset
315
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
316 dbus_int32_t *
32662
f6cf0e904b45 Remove free_memory argument from D-Bus list functions. It's already
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32236
diff changeset
317 purple_dbusify_GSList(GSList *list, dbus_int32_t *len)
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
318 {
18190
bcf28ef7e8ff Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents: 18142
diff changeset
319 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
320 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
321 GSList *elem;
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
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 *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
324 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
325 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
326 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
327
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
328 return array;
11067
b6353889a9ba [gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11055
diff changeset
329 }
b6353889a9ba [gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11055
diff changeset
330
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
331 gpointer *
32662
f6cf0e904b45 Remove free_memory argument from D-Bus list functions. It's already
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32236
diff changeset
332 purple_GList_to_array(GList *list, dbus_int32_t *len)
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
333 {
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
334 gpointer *array;
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
335 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
336 GList *elem;
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
337
18190
bcf28ef7e8ff Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents: 18142
diff changeset
338 *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
339 array = g_new0(gpointer, *len);
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
340 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
341 array[i] = elem->data;
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
342
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
343 return array;
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
344 }
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
345
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
346 gpointer *
32662
f6cf0e904b45 Remove free_memory argument from D-Bus list functions. It's already
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32236
diff changeset
347 purple_GSList_to_array(GSList *list, dbus_int32_t *len)
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
348 {
18190
bcf28ef7e8ff Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents: 18142
diff changeset
349 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
350 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
351 GSList *elem;
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
352
18190
bcf28ef7e8ff Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents: 18142
diff changeset
353 *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
354 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
355 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
356 array[i] = elem->data;
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
357
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
358 return array;
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
359 }
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
360
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
361 GHashTable *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
362 purple_dbus_iter_hash_table(DBusMessageIter *iter, DBusError *error)
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
363 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
364 GHashTable *hash;
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
365
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
366 /* 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
367 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
368
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
369 do {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
370 char *key, *value;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
371 DBusMessageIter subiter;
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
372
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
373 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
374 goto error;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
375 /* With all due respect to Dijkstra,
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
376 * this goto is for exception
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
377 * handling, and it is ok because it
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
378 * avoids duplication of the code
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
379 * responsible for destroying the hash
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
380 * table. Exceptional instructions
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
381 * for exceptional situations.
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
382 */
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
383
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
384 dbus_message_iter_recurse(iter, &subiter);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
385 if (!purple_dbus_message_iter_get_args(&subiter, error,
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
386 DBUS_TYPE_STRING, &key,
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
387 DBUS_TYPE_STRING, &value,
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
388 DBUS_TYPE_INVALID))
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
389 goto error; /* same here */
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
390
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
391 g_hash_table_insert(hash, key, value);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
392 } while (dbus_message_iter_next(iter));
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
393
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
394 return hash;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
395
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
396 error:
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
397 g_hash_table_destroy(hash);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
398 return NULL;
11187
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
399 }
27beea38898f [gaim-migrate @ 13303]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11175
diff changeset
400
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
401 /**************************************************************/
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
402 /* DBus bindings ... */
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
403 /**************************************************************/
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
404
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
405 static DBusConnection *purple_dbus_connection;
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
406
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
407 DBusConnection *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
408 purple_dbus_get_connection(void)
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
409 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
410 return purple_dbus_connection;
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
411 }
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
412
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
413 #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
414 #include "dbus-signals.c"
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
415
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
416 static gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
417 purple_dbus_dispatch_cb(DBusConnection *connection,
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
418 DBusMessage *message, void *user_data)
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 const char *name;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
421 PurpleDBusBinding *bindings;
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
422 int i;
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
423
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
424 bindings = (PurpleDBusBinding*) user_data;
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
425
35499
c4c5e0a670b1 Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents: 35472
diff changeset
426 if (!dbus_message_has_path(message, PURPLE_DBUS_PATH))
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
427 return FALSE;
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
428
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
429 name = dbus_message_get_member(message);
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
430
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
431 if (name == NULL)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
432 return FALSE;
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
433
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
434 if (dbus_message_get_type(message) != DBUS_MESSAGE_TYPE_METHOD_CALL)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
435 return FALSE;
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
436
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
437 for (i = 0; bindings[i].name; i++)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
438 if (!strcmp(name, bindings[i].name))
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
439 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
440 DBusMessage *reply;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
441 DBusError error;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
442
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
443 dbus_error_init(&error);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
444
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
445 reply = bindings[i].handler(message, &error);
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
446
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
447 if (reply == NULL && dbus_error_is_set(&error))
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
448 reply = dbus_message_new_error (message,
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
449 error.name, error.message);
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
450
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
451 if (reply != NULL)
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 dbus_connection_send(connection, reply, NULL);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
454 dbus_message_unref(reply);
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
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
457 return TRUE; /* return reply! */
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
458 }
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
459
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
460 return FALSE;
11067
b6353889a9ba [gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11055
diff changeset
461 }
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
462
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
463
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
464 static const char *
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
465 dbus_gettext(const char **ptr)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
466 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
467 const char *text = *ptr;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
468 *ptr += strlen(text) + 1;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
469 return text;
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
470 }
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
471
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
472 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
473 purple_dbus_introspect_cb(GList **bindings_list, void *bindings)
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
474 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
475 *bindings_list = g_list_prepend(*bindings_list, bindings);
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
476 }
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
477
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
478 static DBusMessage *purple_dbus_introspect(DBusMessage *message)
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
479 {
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
480 DBusMessage *reply;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
481 GString *str;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
482 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
483 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
484 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
485 const char *pointer_type;
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
486
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
487 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
488
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
489 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");
35499
c4c5e0a670b1 Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents: 35472
diff changeset
490 g_string_append_printf(str, "<node name='%s'>\n", PURPLE_DBUS_PATH);
31328
b2939f1d30af Fix dbus introspection. Fixes #13073.
Tom Samstag <pidgin@modtwo.com>
parents: 29188
diff changeset
491 g_string_append(str, " <interface name='org.freedesktop.DBus.Introspectable'>\n <method name='Introspect'>\n <arg name='data' direction='out' type='s'/>\n </method>\n </interface>\n\n");
b2939f1d30af Fix dbus introspection. Fixes #13073.
Tom Samstag <pidgin@modtwo.com>
parents: 29188
diff changeset
492
35499
c4c5e0a670b1 Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents: 35472
diff changeset
493 g_string_append_printf(str, " <interface name='%s'>\n", PURPLE_DBUS_INTERFACE);
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
494
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
495 bindings_list = NULL;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
496 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
497
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
498 for (node = bindings_list; node; node = node->next)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
499 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
500 PurpleDBusBinding *bindings;
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
501 int i;
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
502
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
503 bindings = (PurpleDBusBinding*)node->data;
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
504
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
505 for (i = 0; bindings[i].name; i++)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
506 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
507 const char *text;
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
508
31328
b2939f1d30af Fix dbus introspection. Fixes #13073.
Tom Samstag <pidgin@modtwo.com>
parents: 29188
diff changeset
509 g_string_append_printf(str, " <method name='%s'>\n", bindings[i].name);
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
510
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
511 text = bindings[i].parameters;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
512 while (*text)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
513 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
514 const char *name, *direction, *type;
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 direction = dbus_gettext(&text);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
517 type = dbus_gettext(&text);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
518 name = dbus_gettext(&text);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
519
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
520 g_string_append_printf(str,
31328
b2939f1d30af Fix dbus introspection. Fixes #13073.
Tom Samstag <pidgin@modtwo.com>
parents: 29188
diff changeset
521 " <arg name='%s' type='%s' direction='%s'/>\n",
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
522 name, type, direction);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
523 }
31328
b2939f1d30af Fix dbus introspection. Fixes #13073.
Tom Samstag <pidgin@modtwo.com>
parents: 29188
diff changeset
524 g_string_append(str, " </method>\n");
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
525 }
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
526 }
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
527
27568
437768598637 Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25367
diff changeset
528 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
529 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
530 else
437768598637 Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25367
diff changeset
531 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
532
437768598637 Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25367
diff changeset
533 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
534 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
535 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
536 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
537 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
538 }
437768598637 Add auto-generated D-Bus signals introspection, though parameter names
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25367
diff changeset
539 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
540
31328
b2939f1d30af Fix dbus introspection. Fixes #13073.
Tom Samstag <pidgin@modtwo.com>
parents: 29188
diff changeset
541 g_string_append(str, " </interface>\n</node>\n");
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
542
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
543 reply = dbus_message_new_method_return(message);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
544 dbus_message_append_args(reply, DBUS_TYPE_STRING, &(str->str),
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
545 DBUS_TYPE_INVALID);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
546 g_string_free(str, TRUE);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
547 g_list_free(bindings_list);
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
548
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
549 return reply;
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
550 }
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
551
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
552 static DBusHandlerResult
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
553 purple_dbus_dispatch(DBusConnection *connection,
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
554 DBusMessage *message, void *user_data)
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
555 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
556 if (purple_signal_emit_return_1(purple_dbus_get_handle(),
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
557 "dbus-method-called", connection, message))
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
558 return DBUS_HANDLER_RESULT_HANDLED;
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
559
31328
b2939f1d30af Fix dbus introspection. Fixes #13073.
Tom Samstag <pidgin@modtwo.com>
parents: 29188
diff changeset
560 if (dbus_message_is_method_call(message, DBUS_INTERFACE_INTROSPECTABLE, "Introspect") &&
35499
c4c5e0a670b1 Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents: 35472
diff changeset
561 dbus_message_has_path(message, PURPLE_DBUS_PATH))
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
562 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
563 DBusMessage *reply;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
564 reply = purple_dbus_introspect(message);
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
565 dbus_connection_send (connection, reply, NULL);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
566 dbus_message_unref(reply);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
567 return DBUS_HANDLER_RESULT_HANDLED;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
568 }
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
569
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
570 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
11067
b6353889a9ba [gaim-migrate @ 13048]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11055
diff changeset
571 }
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
572
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
573 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
574 purple_dbus_register_bindings(void *handle, PurpleDBusBinding *bindings)
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
575 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
576 purple_signal_connect(purple_dbus_get_handle(), "dbus-method-called",
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
577 handle,
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
578 PURPLE_CALLBACK(purple_dbus_dispatch_cb),
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
579 bindings);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
580 purple_signal_connect(purple_dbus_get_handle(), "dbus-introspect",
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
581 handle,
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
582 PURPLE_CALLBACK(purple_dbus_introspect_cb),
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
583 bindings);
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
584 }
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
585
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
586 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
587 purple_dbus_dispatch_init(void)
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
588 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
589 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
590 DBusError error;
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
591
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
592 dbus_error_init(&error);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
593 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
594
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
595 if (purple_dbus_connection == NULL)
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
596 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
597 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
598 dbus_error_free(&error);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
599 return;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
600 }
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
601
14960
1ae8abb01e70 [gaim-migrate @ 17670]
Jan Kratochvil
parents: 14414
diff changeset
602 /* Do not allow libdbus to exit on connection failure (This may
1ae8abb01e70 [gaim-migrate @ 17670]
Jan Kratochvil
parents: 14414
diff changeset
603 work around random exit(1) on SIGPIPE errors) */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
604 dbus_connection_set_exit_on_disconnect (purple_dbus_connection, FALSE);
14960
1ae8abb01e70 [gaim-migrate @ 17670]
Jan Kratochvil
parents: 14414
diff changeset
605
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
606 if (!dbus_connection_register_object_path(purple_dbus_connection,
35499
c4c5e0a670b1 Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents: 35472
diff changeset
607 PURPLE_DBUS_PATH, &vtable, NULL))
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
608 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
609 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
610 dbus_error_free(&error);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
611 return;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
612 }
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
613
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
614 dbus_request_name_reply = dbus_bus_request_name(purple_dbus_connection,
35499
c4c5e0a670b1 Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents: 35472
diff changeset
615 PURPLE_DBUS_SERVICE, 0, &error);
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
616
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
617 if (dbus_error_is_set(&error))
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
618 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
619 dbus_connection_unref(purple_dbus_connection);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
620 purple_dbus_connection = NULL;
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
621 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
622 dbus_error_free(&error);
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
623 return;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
624 }
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
625
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
626 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
627
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
628 purple_signal_register(purple_dbus_get_handle(), "dbus-method-called",
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
629 purple_marshal_BOOLEAN__POINTER_POINTER,
34824
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
630 G_TYPE_BOOLEAN, 2, G_TYPE_POINTER, G_TYPE_POINTER);
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
631
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
632 purple_signal_register(purple_dbus_get_handle(), "dbus-introspect",
34824
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
633 purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
634 G_TYPE_POINTER); /* pointer to a pointer */
11175
b59bc7cc865c [gaim-migrate @ 13280]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11171
diff changeset
635
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
636 PURPLE_DBUS_REGISTER_BINDINGS(purple_dbus_get_handle());
34297
0f1f0b8c84f8 Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 32662
diff changeset
637
0f1f0b8c84f8 Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 32662
diff changeset
638 if (purple_debug_is_verbose())
0f1f0b8c84f8 Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 32662
diff changeset
639 purple_debug_misc("dbus", "initialized");
11171
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
640 }
a25653d60f9c [gaim-migrate @ 13272]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11146
diff changeset
641
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
642
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
643
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
644 /**************************************************************************/
35472
474e26199560 Removed @name
Ankit Vani <a@nevitus.org>
parents: 35460
diff changeset
645 /* Signals */
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
646 /**************************************************************************/
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
647
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
648
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
649
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
650 static char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
651 purple_dbus_convert_signal_name(const char *purple_name)
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
652 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
653 int purple_index, g_index;
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
654 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
655 gboolean capitalize_next = TRUE;
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
656
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
657 for (purple_index = g_index = 0; purple_name[purple_index]; purple_index++)
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
658 if (purple_name[purple_index] != '-' && purple_name[purple_index] != '_')
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
659 {
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
660 if (capitalize_next)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
661 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
662 else
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
663 g_name[g_index++] = purple_name[purple_index];
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
664 capitalize_next = FALSE;
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
665 } else
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
666 capitalize_next = TRUE;
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
667
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
668 g_name[g_index] = 0;
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
669
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
670 return g_name;
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
671 }
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
672
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
673 #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
674
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
675 static gboolean
35009
757d08e70103 Renamed purple_dbus_message_append_purple_values to purple_dbus_message_append_values
Ankit Vani <a@nevitus.org>
parents: 34883
diff changeset
676 purple_dbus_message_append_values(DBusMessageIter *iter,
34824
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
677 int number, GType *types, va_list data)
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
678 {
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
679 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
680 gboolean error = FALSE;
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
681
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
682 for (i = 0; i < number; i++)
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
683 {
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
684 const char *str;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
685 int id;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
686 gint xint;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
687 guint xuint;
20249
603650f32ee4 applied changes from c6a89223516b0abb6cbb399c2066e3b6a7b69d19
Luke Schierer <lschiere@pidgin.im>
parents: 19859
diff changeset
688 gint64 xint64;
603650f32ee4 applied changes from c6a89223516b0abb6cbb399c2066e3b6a7b69d19
Luke Schierer <lschiere@pidgin.im>
parents: 19859
diff changeset
689 guint64 xuint64;
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
690 gboolean xboolean;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
691 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
692 gpointer val;
34824
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
693 #if 0
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
694 if (purple_value_is_outgoing(purple_values[i]))
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 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
697 g_return_val_if_fail(ptr, TRUE);
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
698 }
34824
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
699 #endif
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
700 switch (types[i])
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
701 {
34824
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
702 case G_TYPE_INT:
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
703 xint = my_arg(gint);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
704 dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &xint);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
705 break;
34824
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
706 case G_TYPE_UINT:
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
707 xuint = my_arg(guint);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
708 dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &xuint);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
709 break;
34824
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
710 case G_TYPE_INT64:
20252
9d14e73775c1 applied changes from e2f6be4e0c0daee25fdb3250a7e16a881922f8c4
Luke Schierer <lschiere@pidgin.im>
parents: 20249
diff changeset
711 xint64 = my_arg(gint64);
9d14e73775c1 applied changes from e2f6be4e0c0daee25fdb3250a7e16a881922f8c4
Luke Schierer <lschiere@pidgin.im>
parents: 20249
diff changeset
712 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
713 break;
34824
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
714 case G_TYPE_UINT64:
20252
9d14e73775c1 applied changes from e2f6be4e0c0daee25fdb3250a7e16a881922f8c4
Luke Schierer <lschiere@pidgin.im>
parents: 20249
diff changeset
715 xuint64 = my_arg(guint64);
9d14e73775c1 applied changes from e2f6be4e0c0daee25fdb3250a7e16a881922f8c4
Luke Schierer <lschiere@pidgin.im>
parents: 20249
diff changeset
716 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
717 break;
34824
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
718 case G_TYPE_BOOLEAN:
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
719 xboolean = my_arg(gboolean);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
720 dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &xboolean);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
721 break;
34824
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
722 case G_TYPE_STRING:
35499
c4c5e0a670b1 Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents: 35472
diff changeset
723 str = purple_null_to_emptystr(my_arg(char*));
15001
7996da15af1a [gaim-migrate @ 17711]
Ethan Blanton <elb@pidgin.im>
parents: 14960
diff changeset
724 if (!g_utf8_validate(str, -1, NULL)) {
15142
32b4b0750b6c [gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents: 15001
diff changeset
725 gchar *tmp;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
726 purple_debug_error("dbus", "Invalid UTF-8 string passed to signal, emitting salvaged string!\n");
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
727 tmp = purple_utf8_salvage(str);
15142
32b4b0750b6c [gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents: 15001
diff changeset
728 dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &tmp);
32b4b0750b6c [gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents: 15001
diff changeset
729 g_free(tmp);
32b4b0750b6c [gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents: 15001
diff changeset
730 } else {
32b4b0750b6c [gaim-migrate @ 17866]
Mark Doliner <markdoliner@pidgin.im>
parents: 15001
diff changeset
731 dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &str);
15001
7996da15af1a [gaim-migrate @ 17711]
Ethan Blanton <elb@pidgin.im>
parents: 14960
diff changeset
732 }
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
733 break;
34824
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
734 default:
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
735 if (G_TYPE_IS_OBJECT(types[i]) ||
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
736 G_TYPE_IS_BOXED(types[i]) ||
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
737 types[i] == G_TYPE_POINTER )
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
738 {
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
739 val = my_arg(gpointer);
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
740 id = purple_dbus_pointer_to_id(val);
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
741 if (id == 0 && val != NULL)
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
742 error = TRUE; /* Some error happened. */
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
743 dbus_message_iter_append_basic(iter,
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
744 (sizeof(id) == sizeof(dbus_int32_t)) ? DBUS_TYPE_INT32 : DBUS_TYPE_INT64, &id);
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
745 }
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
746 else if (G_TYPE_IS_ENUM(types[i]))
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
747 {
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
748 xint = my_arg(gint);
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
749 dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &xint);
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
750 }
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
751 else /* no conversion implemented */
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
752 {
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
753 g_return_val_if_reached(TRUE);
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
754 }
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
755 }
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
756 }
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
757 return error;
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
758 }
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
759
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
760 #undef my_arg
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
761
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
762 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
763 purple_dbus_signal_emit_purple(const char *name, int num_values,
34824
6868ad1739a3 Refactored dbus-server, signals, sound, status to use GType and GValue instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents: 34800
diff changeset
764 GType *types, va_list vargs)
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
765 {
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
766 DBusMessage *signal;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
767 DBusMessageIter iter;
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
768 char *newname;
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
769
11903
56ae8af14a0d [gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11291
diff changeset
770 #if 0 /* this is noisy with no dbus connection */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
771 g_return_if_fail(purple_dbus_connection);
11903
56ae8af14a0d [gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11291
diff changeset
772 #else
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
773 if (purple_dbus_connection == NULL)
11903
56ae8af14a0d [gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11291
diff changeset
774 return;
56ae8af14a0d [gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11291
diff changeset
775 #endif
56ae8af14a0d [gaim-migrate @ 14194]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11291
diff changeset
776
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
777
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
778 /*
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
779 * 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
780 * 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
781 * 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
782 * dbus-propagated or not.
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
783 */
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
784 if (!strcmp(name, "dbus-method-called"))
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
785 return;
11277
ab3c0b6c5ca5 [gaim-migrate @ 13467]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11187
diff changeset
786
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
787 newname = purple_dbus_convert_signal_name(name);
35499
c4c5e0a670b1 Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents: 35472
diff changeset
788 signal = dbus_message_new_signal(PURPLE_DBUS_PATH, PURPLE_DBUS_INTERFACE, newname);
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
789 dbus_message_iter_init_append(signal, &iter);
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
790
35009
757d08e70103 Renamed purple_dbus_message_append_purple_values to purple_dbus_message_append_values
Ankit Vani <a@nevitus.org>
parents: 34883
diff changeset
791 if (purple_dbus_message_append_values(&iter, num_values, types, 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
792 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
793 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
794 "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
795 " (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
796 name);
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
797
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
798 dbus_connection_send(purple_dbus_connection, signal, NULL);
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
799
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
800 g_free(newname);
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
801 dbus_message_unref(signal);
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
802 }
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
803
14017
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
804 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
805 purple_dbus_get_init_error(void)
14017
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
806 {
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
807 return init_error;
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
808 }
11080
0578003800d0 [gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11068
diff changeset
809
14017
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
810 void *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
811 purple_dbus_get_handle(void)
14017
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
812 {
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
813 static int handle;
11080
0578003800d0 [gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11068
diff changeset
814
14025
98bb9921edfa [gaim-migrate @ 16517]
Mark Doliner <markdoliner@pidgin.im>
parents: 14017
diff changeset
815 return &handle;
14017
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
816 }
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
817
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
818 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
819 purple_dbus_init(void)
11080
0578003800d0 [gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11068
diff changeset
820 {
25367
8b430003342c Only initialize dbus threading if glib threading is initialized. The idea is
Daniel Atallah <datallah@pidgin.im>
parents: 25361
diff changeset
821 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
822 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
823
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
824 purple_dbus_init_ids();
14017
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
825
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
826 g_free(init_error);
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
827 init_error = NULL;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
828 purple_dbus_dispatch_init();
14017
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
829 if (init_error != NULL)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
830 purple_debug_error("dbus", "%s\n", init_error);
11080
0578003800d0 [gaim-migrate @ 13092]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11068
diff changeset
831 }
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
832
14017
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
833 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
834 purple_dbus_uninit(void)
14017
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
835 {
18205
4c8e464e432f Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 18201
diff changeset
836 DBusError error;
4c8e464e432f Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 18201
diff changeset
837 if (!purple_dbus_connection)
4c8e464e432f Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 18201
diff changeset
838 return;
11146
c56333373e3c [gaim-migrate @ 13217]
Piotr Zielinski <zielaj@users.sourceforge.net>
parents: 11080
diff changeset
839
18205
4c8e464e432f Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 18201
diff changeset
840 dbus_error_init(&error);
35499
c4c5e0a670b1 Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents: 35472
diff changeset
841 dbus_connection_unregister_object_path(purple_dbus_connection, PURPLE_DBUS_PATH);
c4c5e0a670b1 Fix namespaces issues in libpurple.
Ankit Vani <a@nevitus.org>
parents: 35472
diff changeset
842 dbus_bus_release_name(purple_dbus_connection, PURPLE_DBUS_SERVICE, &error);
18205
4c8e464e432f Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 18201
diff changeset
843 dbus_error_free(&error);
4c8e464e432f Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 18201
diff changeset
844 dbus_connection_unref(purple_dbus_connection);
4c8e464e432f Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 18201
diff changeset
845 purple_dbus_connection = NULL;
4c8e464e432f Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 18201
diff changeset
846 purple_signals_disconnect_by_handle(purple_dbus_get_handle());
14017
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
847 g_free(init_error);
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
848 init_error = NULL;
db3f1bdc95c6 [gaim-migrate @ 16503]
Mark Doliner <markdoliner@pidgin.im>
parents: 13765
diff changeset
849 }
18205
4c8e464e432f Uninit dbus properly.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 18201
diff changeset
850

mercurial