Mercurial > pidgin

comparison libpurple/dbus-server.c @ 17922:43a55528ff26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head b5c55520ae8ff7186733fd82db23a6e4452976cc) to branch 'im.pidgin.soc.2007.finchfeat' (head 93037197c5356731d62e75b4050ca7d01b1017d6)
author Eric Polino <aluink@pidgin.im>
date Mon, 04 Jun 2007 15:12:50 +0000
parents df911a06e09e
children 492b142fd739 fbebe15c91a7
comparison
equal deleted inserted replaced
17827:223a4fca43a1 17922:43a55528ff26
106 g_hash_table_remove(map_id_node, GINT_TO_POINTER(id)); 106 g_hash_table_remove(map_id_node, GINT_TO_POINTER(id));
107 g_hash_table_remove(map_id_type, GINT_TO_POINTER(id)); 107 g_hash_table_remove(map_id_type, GINT_TO_POINTER(id));
108 } 108 }
109 109
110 gint 110 gint
111 purple_dbus_pointer_to_id(gpointer node) 111 purple_dbus_pointer_to_id(gconstpointer node)
112 { 112 {
113 gint id = GPOINTER_TO_INT(g_hash_table_lookup(map_node_id, node)); 113 gint id = GPOINTER_TO_INT(g_hash_table_lookup(map_node_id, node));
114 if ((id == 0) && (node != NULL)) 114 if ((id == 0) && (node != NULL))
115 { 115 {
116 purple_debug_warning("dbus", 116 purple_debug_warning("dbus",
136 else 136 else
137 return NULL; 137 return NULL;
138 } 138 }
139 139
140 gint 140 gint
141 purple_dbus_pointer_to_id_error(gpointer ptr, DBusError *error) 141 purple_dbus_pointer_to_id_error(gconstpointer ptr, DBusError *error)
142 { 142 {
143 gint id = purple_dbus_pointer_to_id(ptr); 143 gint id = purple_dbus_pointer_to_id(ptr);
144 144
145 if (ptr != NULL && id == 0) 145 if (ptr != NULL && id == 0)
146 dbus_set_error(error, "im.pidgin.purple.ObjectNotFound", 146 dbus_set_error(error, "im.pidgin.purple.ObjectNotFound",