diff libpurple/dbus-server.c @ 15822:32c366eeeb99

sed -ie 's/gaim/purple/g'

--- a/libpurple/dbus-server.c	Mon Mar 19 06:11:46 2007 +0000
+++ b/libpurple/dbus-server.c	Mon Mar 19 07:01:17 2007 +0000
@@ -1,7 +1,7 @@
 /*
- * gaim
+ * purple
  *
- * Gaim is the legal property of its developers, whose names are too numerous
+ * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
@@ -30,7 +30,7 @@
 #include "account.h"
 #include "blist.h"
 #include "conversation.h"
-#include "dbus-gaim.h"
+#include "dbus-purple.h"
 #include "dbus-server.h"
 #include "dbus-useful.h"
 #include "dbus-bindings.h"
@@ -44,12 +44,12 @@
 
 
 /**************************************************************************/
-/** @name Gaim DBUS pointer registration mechanism                        */
+/** @name Purple DBUS pointer registration mechanism                        */
 /**************************************************************************/
 
 /*
- * Here we include the list of #GAIM_DBUS_DEFINE_TYPE statements for
- * all structs defined in gaim.  This file has been generated by the
+ * Here we include the list of #PURPLE_DBUS_DEFINE_TYPE statements for
+ * all structs defined in purple.  This file has been generated by the
  * #dbus-analyze-types.py script.
  */
 
@@ -71,20 +71,20 @@
  * creates the three above hashtables and defines parents of some types.
  */
 void
-gaim_dbus_init_ids(void)
+purple_dbus_init_ids(void)
 {
 	map_id_node = g_hash_table_new(g_direct_hash, g_direct_equal);
 	map_id_type = g_hash_table_new(g_direct_hash, g_direct_equal);
 	map_node_id = g_hash_table_new(g_direct_hash, g_direct_equal);
 
-	GAIM_DBUS_TYPE(GaimBuddy)->parent   = GAIM_DBUS_TYPE(GaimBlistNode);
-	GAIM_DBUS_TYPE(GaimContact)->parent = GAIM_DBUS_TYPE(GaimBlistNode);
-	GAIM_DBUS_TYPE(GaimChat)->parent    = GAIM_DBUS_TYPE(GaimBlistNode);
-	GAIM_DBUS_TYPE(GaimGroup)->parent   = GAIM_DBUS_TYPE(GaimBlistNode);
+	PURPLE_DBUS_TYPE(PurpleBuddy)->parent   = PURPLE_DBUS_TYPE(PurpleBlistNode);
+	PURPLE_DBUS_TYPE(PurpleContact)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode);
+	PURPLE_DBUS_TYPE(PurpleChat)->parent    = PURPLE_DBUS_TYPE(PurpleBlistNode);
+	PURPLE_DBUS_TYPE(PurpleGroup)->parent   = PURPLE_DBUS_TYPE(PurpleBlistNode);
 }
 
 void
-gaim_dbus_register_pointer(gpointer node, GaimDBusType *type)
+purple_dbus_register_pointer(gpointer node, PurpleDBusType *type)
 {
 	static gint last_id = 0;
 
@@ -98,7 +98,7 @@
 }
 
 void
-gaim_dbus_unregister_pointer(gpointer node)
+purple_dbus_unregister_pointer(gpointer node)
 {
 	gpointer id = g_hash_table_lookup(map_node_id, node);
 
@@ -108,12 +108,12 @@
 }
 
 gint
-gaim_dbus_pointer_to_id(gpointer node)
+purple_dbus_pointer_to_id(gpointer node)
 {
 	gint id = GPOINTER_TO_INT(g_hash_table_lookup(map_node_id, node));
 	if ((id == 0) && (node != NULL))
 	{
-		gaim_debug_warning("dbus",
+		purple_debug_warning("dbus",
 				"Need to register an object with the dbus subsystem.\n");
 		g_return_val_if_reached(0);
 	}
@@ -121,11 +121,11 @@
 }
 
 gpointer
-gaim_dbus_id_to_pointer(gint id, GaimDBusType *type)
+purple_dbus_id_to_pointer(gint id, PurpleDBusType *type)
 {
-	GaimDBusType *objtype;
+	PurpleDBusType *objtype;
 
-	objtype = (GaimDBusType*)g_hash_table_lookup(map_id_type,
+	objtype = (PurpleDBusType*)g_hash_table_lookup(map_id_type,
 			GINT_TO_POINTER(id));
 
 	while (objtype != type && objtype != NULL)
@@ -138,25 +138,25 @@
 }
 
 gint
-gaim_dbus_pointer_to_id_error(gpointer ptr, DBusError *error)
+purple_dbus_pointer_to_id_error(gpointer ptr, DBusError *error)
 {
-	gint id = gaim_dbus_pointer_to_id(ptr);
+	gint id = purple_dbus_pointer_to_id(ptr);
 
 	if (ptr != NULL && id == 0)
-		dbus_set_error(error, "net.sf.gaim.ObjectNotFound",
-				"The return object is not mapped (this is a Gaim error)");
+		dbus_set_error(error, "net.sf.purple.ObjectNotFound",
+				"The return object is not mapped (this is a Purple error)");
 
 	return id;
 }
 
 gpointer
-gaim_dbus_id_to_pointer_error(gint id, GaimDBusType *type,
+purple_dbus_id_to_pointer_error(gint id, PurpleDBusType *type,
 		const char *typename, DBusError *error)
 {
-	gpointer ptr = gaim_dbus_id_to_pointer(id, type);
+	gpointer ptr = purple_dbus_id_to_pointer(id, type);
 
 	if (ptr == NULL && id != 0)
-		dbus_set_error(error, "net.sf.gaim.InvalidHandle",
+		dbus_set_error(error, "net.sf.purple.InvalidHandle",
 				"%s object with ID = %i not found", typename, id);
 
 	return ptr;
@@ -168,38 +168,38 @@
 /**************************************************************************/
 
 dbus_bool_t
-gaim_dbus_message_get_args(DBusMessage *message,
+purple_dbus_message_get_args(DBusMessage *message,
 		DBusError *error, int first_arg_type, ...)
 {
 	dbus_bool_t retval;
 	va_list var_args;
 
 	va_start(var_args, first_arg_type);
-	retval = gaim_dbus_message_get_args_valist(message, error, first_arg_type, var_args);
+	retval = purple_dbus_message_get_args_valist(message, error, first_arg_type, var_args);
 	va_end(var_args);
 
 	return retval;
 }
 
 dbus_bool_t
-gaim_dbus_message_get_args_valist(DBusMessage *message,
+purple_dbus_message_get_args_valist(DBusMessage *message,
 		DBusError *error, int first_arg_type, va_list var_args)
 {
 	DBusMessageIter iter;
 
 	dbus_message_iter_init(message, &iter);
-	return gaim_dbus_message_iter_get_args_valist(&iter, error, first_arg_type, var_args);
+	return purple_dbus_message_iter_get_args_valist(&iter, error, first_arg_type, var_args);
 }
 
 dbus_bool_t
-gaim_dbus_message_iter_get_args(DBusMessageIter *iter,
+purple_dbus_message_iter_get_args(DBusMessageIter *iter,
 		DBusError *error, int first_arg_type, ...)
 {
 	dbus_bool_t retval;
 	va_list var_args;
 
 	va_start(var_args, first_arg_type);
-	retval = gaim_dbus_message_iter_get_args_valist(iter, error, first_arg_type, var_args);
+	retval = purple_dbus_message_iter_get_args_valist(iter, error, first_arg_type, var_args);
 	va_end(var_args);
 
 	return retval;
@@ -213,7 +213,7 @@
 
 
 dbus_bool_t
-gaim_dbus_message_iter_get_args_valist(DBusMessageIter *iter,
+purple_dbus_message_iter_get_args_valist(DBusMessageIter *iter,
 		DBusError *error, int first_arg_type, va_list var_args)
 {
 	int spec_type, msg_type, i;
@@ -244,7 +244,7 @@
 			DBusMessageIter *sub;
 			sub = va_arg (var_args, DBusMessageIter*);
 			dbus_message_iter_recurse(iter, sub);
-			gaim_debug_info("dbus", "subiter %p:%p\n", sub, * (gpointer*) sub);
+			purple_debug_info("dbus", "subiter %p:%p\n", sub, * (gpointer*) sub);
 			break; /* for testing only! */
 		}
 
@@ -284,7 +284,7 @@
 }
 
 dbus_int32_t *
-gaim_dbusify_GList(GList *list, gboolean free_memory, dbus_int32_t *len)
+purple_dbusify_GList(GList *list, gboolean free_memory, dbus_int32_t *len)
 {
 	dbus_int32_t *array;
 	int i;
@@ -293,7 +293,7 @@
 	*len = g_list_length(list);
 	array = g_new0(dbus_int32_t, g_list_length(list));
 	for (i = 0, elem = list; elem != NULL; elem = elem->next, i++)
-		array[i] = gaim_dbus_pointer_to_id(elem->data);
+		array[i] = purple_dbus_pointer_to_id(elem->data);
 
 	if (free_memory)
 		g_list_free(list);
@@ -302,7 +302,7 @@
 }
 
 dbus_int32_t *
-gaim_dbusify_GSList(GSList *list, gboolean free_memory, dbus_int32_t *len)
+purple_dbusify_GSList(GSList *list, gboolean free_memory, dbus_int32_t *len)
 {
 	dbus_int32_t *array;
 	int i;
@@ -311,7 +311,7 @@
 	*len = g_slist_length(list);
 	array = g_new0(dbus_int32_t, g_slist_length(list));
 	for (i = 0, elem = list; elem != NULL; elem = elem->next, i++)
-		array[i] = gaim_dbus_pointer_to_id(elem->data);
+		array[i] = purple_dbus_pointer_to_id(elem->data);
 
 	if (free_memory)
 		g_slist_free(list);
@@ -320,7 +320,7 @@
 }
 
 gpointer *
-gaim_GList_to_array(GList *list, gboolean free_memory, dbus_int32_t *len)
+purple_GList_to_array(GList *list, gboolean free_memory, dbus_int32_t *len)
 {
 	gpointer *array;
 	int i;
@@ -338,7 +338,7 @@
 }
 
 gpointer *
-gaim_GSList_to_array(GSList *list, gboolean free_memory, dbus_int32_t *len)
+purple_GSList_to_array(GSList *list, gboolean free_memory, dbus_int32_t *len)
 {
 	gpointer *array;
 	int i;
@@ -356,7 +356,7 @@
 }
 
 GHashTable *
-gaim_dbus_iter_hash_table(DBusMessageIter *iter, DBusError *error)
+purple_dbus_iter_hash_table(DBusMessageIter *iter, DBusError *error)
 {
 	GHashTable *hash;
 
@@ -379,7 +379,7 @@
 			 */
 
 		dbus_message_iter_recurse(iter, &subiter);
-		if (!gaim_dbus_message_iter_get_args(&subiter, error,
+		if (!purple_dbus_message_iter_get_args(&subiter, error,
 				DBUS_TYPE_STRING, &key,
 				DBUS_TYPE_STRING, &value,
 				DBUS_TYPE_INVALID))
@@ -399,27 +399,27 @@
 /* DBus bindings ...                                          */
 /**************************************************************/
 
-static DBusConnection *gaim_dbus_connection;
+static DBusConnection *purple_dbus_connection;
 
 DBusConnection *
-gaim_dbus_get_connection(void)
+purple_dbus_get_connection(void)
 {
-	return gaim_dbus_connection;
+	return purple_dbus_connection;
 }
 
 #include "dbus-bindings.c"
 
 static gboolean
-gaim_dbus_dispatch_cb(DBusConnection *connection,
+purple_dbus_dispatch_cb(DBusConnection *connection,
 		DBusMessage *message, void *user_data)
 {
 	const char *name;
-	GaimDBusBinding *bindings;
+	PurpleDBusBinding *bindings;
 	int i;
 
-	bindings = (GaimDBusBinding*) user_data;
+	bindings = (PurpleDBusBinding*) user_data;
 
-	if (!dbus_message_has_path(message, DBUS_PATH_GAIM))
+	if (!dbus_message_has_path(message, DBUS_PATH_PURPLE))
 		return FALSE;
 
 	name = dbus_message_get_member(message);
@@ -466,12 +466,12 @@
 }
 
 static void
-gaim_dbus_introspect_cb(GList **bindings_list, void *bindings)
+purple_dbus_introspect_cb(GList **bindings_list, void *bindings)
 {
 	*bindings_list = g_list_prepend(*bindings_list, bindings);
 }
 
-static DBusMessage *gaim_dbus_introspect(DBusMessage *message)
+static DBusMessage *purple_dbus_introspect(DBusMessage *message)
 {
 	DBusMessage *reply;
 	GString *str;
@@ -480,18 +480,18 @@
 	str = g_string_sized_new(0x1000); /* TODO: why this size? */
 
 	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");
-	g_string_append_printf(str, "<node name='%s'>\n", DBUS_PATH_GAIM);
-	g_string_append_printf(str, "<interface name='%s'>\n", DBUS_INTERFACE_GAIM);
+	g_string_append_printf(str, "<node name='%s'>\n", DBUS_PATH_PURPLE);
+	g_string_append_printf(str, "<interface name='%s'>\n", DBUS_INTERFACE_PURPLE);
 
 	bindings_list = NULL;
-	gaim_signal_emit(gaim_dbus_get_handle(), "dbus-introspect", &bindings_list);
+	purple_signal_emit(purple_dbus_get_handle(), "dbus-introspect", &bindings_list);
 
 	for (node = bindings_list; node; node = node->next)
 	{
-		GaimDBusBinding *bindings;
+		PurpleDBusBinding *bindings;
 		int i;
 
-		bindings = (GaimDBusBinding*)node->data;
+		bindings = (PurpleDBusBinding*)node->data;
 
 		for (i = 0; bindings[i].name; i++)
 		{
@@ -528,20 +528,20 @@
 }
 
 static DBusHandlerResult
-gaim_dbus_dispatch(DBusConnection *connection,
+purple_dbus_dispatch(DBusConnection *connection,
 		DBusMessage *message, void *user_data)
 {
-	if (gaim_signal_emit_return_1(gaim_dbus_get_handle(),
+	if (purple_signal_emit_return_1(purple_dbus_get_handle(),
 			"dbus-method-called", connection, message))
 		return DBUS_HANDLER_RESULT_HANDLED;
 
 	if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_METHOD_CALL &&
-			dbus_message_has_path(message, DBUS_PATH_GAIM) &&
+			dbus_message_has_path(message, DBUS_PATH_PURPLE) &&
 			dbus_message_has_interface(message, DBUS_INTERFACE_INTROSPECTABLE) &&
 			dbus_message_has_member(message, "Introspect"))
 	{
 		DBusMessage *reply;
-		reply = gaim_dbus_introspect(message);
+		reply = purple_dbus_introspect(message);
 		dbus_connection_send (connection, reply, NULL);
 		dbus_message_unref(reply);
 		return DBUS_HANDLER_RESULT_HANDLED;
@@ -551,29 +551,29 @@
 }
 
 void
-gaim_dbus_register_bindings(void *handle, GaimDBusBinding *bindings)
+purple_dbus_register_bindings(void *handle, PurpleDBusBinding *bindings)
 {
-	gaim_signal_connect(gaim_dbus_get_handle(), "dbus-method-called",
+	purple_signal_connect(purple_dbus_get_handle(), "dbus-method-called",
 			handle,
-			GAIM_CALLBACK(gaim_dbus_dispatch_cb),
+			PURPLE_CALLBACK(purple_dbus_dispatch_cb),
 			bindings);
-	gaim_signal_connect(gaim_dbus_get_handle(), "dbus-introspect",
+	purple_signal_connect(purple_dbus_get_handle(), "dbus-introspect",
 			handle,
-			GAIM_CALLBACK(gaim_dbus_introspect_cb),
+			PURPLE_CALLBACK(purple_dbus_introspect_cb),
 			bindings);
 }
 
 static void
-gaim_dbus_dispatch_init(void)
+purple_dbus_dispatch_init(void)
 {
-	static DBusObjectPathVTable vtable = {NULL, &gaim_dbus_dispatch, NULL, NULL, NULL, NULL};
+	static DBusObjectPathVTable vtable = {NULL, &purple_dbus_dispatch, NULL, NULL, NULL, NULL};
 	DBusError error;
 	int result;
 
 	dbus_error_init(&error);
-	gaim_dbus_connection = dbus_bus_get(DBUS_BUS_STARTER, &error);
+	purple_dbus_connection = dbus_bus_get(DBUS_BUS_STARTER, &error);
 
-	if (gaim_dbus_connection == NULL)
+	if (purple_dbus_connection == NULL)
 	{
 		init_error = g_strdup_printf(N_("Failed to get connection: %s"), error.message);
 		dbus_error_free(&error);
@@ -582,43 +582,43 @@
 
 	/* Do not allow libdbus to exit on connection failure (This may
 	   work around random exit(1) on SIGPIPE errors) */
-	dbus_connection_set_exit_on_disconnect (gaim_dbus_connection, FALSE);
+	dbus_connection_set_exit_on_disconnect (purple_dbus_connection, FALSE);
 
-	if (!dbus_connection_register_object_path(gaim_dbus_connection,
-			DBUS_PATH_GAIM, &vtable, NULL))
+	if (!dbus_connection_register_object_path(purple_dbus_connection,
+			DBUS_PATH_PURPLE, &vtable, NULL))
 	{
 		init_error = g_strdup_printf(N_("Failed to get name: %s"), error.name);
 		dbus_error_free(&error);
 		return;
 	}
 
-	result = dbus_bus_request_name(gaim_dbus_connection,
-			DBUS_SERVICE_GAIM, 0, &error);
+	result = dbus_bus_request_name(purple_dbus_connection,
+			DBUS_SERVICE_PURPLE, 0, &error);
 
 	if (dbus_error_is_set(&error))
 	{
-		dbus_connection_unref(gaim_dbus_connection);
+		dbus_connection_unref(purple_dbus_connection);
 		dbus_error_free(&error);
-		gaim_dbus_connection = NULL;
+		purple_dbus_connection = NULL;
 		init_error = g_strdup_printf(N_("Failed to get serv name: %s"), error.name);
 		return;
 	}
 
-	dbus_connection_setup_with_g_main(gaim_dbus_connection, NULL);
+	dbus_connection_setup_with_g_main(purple_dbus_connection, NULL);
 
-	gaim_debug_misc("dbus", "okkk\n");
+	purple_debug_misc("dbus", "okkk\n");
 
-	gaim_signal_register(gaim_dbus_get_handle(), "dbus-method-called",
-			 gaim_marshal_BOOLEAN__POINTER_POINTER,
-			 gaim_value_new(GAIM_TYPE_BOOLEAN), 2,
-			 gaim_value_new(GAIM_TYPE_POINTER),
-			 gaim_value_new(GAIM_TYPE_POINTER));
+	purple_signal_register(purple_dbus_get_handle(), "dbus-method-called",
+			 purple_marshal_BOOLEAN__POINTER_POINTER,
+			 purple_value_new(PURPLE_TYPE_BOOLEAN), 2,
+			 purple_value_new(PURPLE_TYPE_POINTER),
+			 purple_value_new(PURPLE_TYPE_POINTER));
 
-	gaim_signal_register(gaim_dbus_get_handle(), "dbus-introspect",
-			 gaim_marshal_VOID__POINTER, NULL, 1,
-			 gaim_value_new_outgoing(GAIM_TYPE_POINTER));
+	purple_signal_register(purple_dbus_get_handle(), "dbus-introspect",
+			 purple_marshal_VOID__POINTER, NULL, 1,
+			 purple_value_new_outgoing(PURPLE_TYPE_POINTER));
 
-	GAIM_DBUS_REGISTER_BINDINGS(gaim_dbus_get_handle());
+	PURPLE_DBUS_REGISTER_BINDINGS(purple_dbus_get_handle());
 }
 
 
@@ -630,19 +630,19 @@
 
 
 static char *
-gaim_dbus_convert_signal_name(const char *gaim_name)
+purple_dbus_convert_signal_name(const char *purple_name)
 {
-	int gaim_index, g_index;
-	char *g_name = g_new(char, strlen(gaim_name) + 1);
+	int purple_index, g_index;
+	char *g_name = g_new(char, strlen(purple_name) + 1);
 	gboolean capitalize_next = TRUE;
 
-	for (gaim_index = g_index = 0; gaim_name[gaim_index]; gaim_index++)
-		if (gaim_name[gaim_index] != '-' && gaim_name[gaim_index] != '_')
+	for (purple_index = g_index = 0; purple_name[purple_index]; purple_index++)
+		if (purple_name[purple_index] != '-' && purple_name[purple_index] != '_')
 		{
 			if (capitalize_next)
-				g_name[g_index++] = g_ascii_toupper(gaim_name[gaim_index]);
+				g_name[g_index++] = g_ascii_toupper(purple_name[purple_index]);
 			else
-				g_name[g_index++] = gaim_name[gaim_index];
+				g_name[g_index++] = purple_name[purple_index];
 			capitalize_next = FALSE;
 		} else
 			capitalize_next = TRUE;
@@ -655,8 +655,8 @@
 #define my_arg(type) (ptr != NULL ? * ((type *)ptr) : va_arg(data, type))
 
 static void
-gaim_dbus_message_append_gaim_values(DBusMessageIter *iter,
-		int number, GaimValue **gaim_values, va_list data)
+purple_dbus_message_append_purple_values(DBusMessageIter *iter,
+		int number, PurpleValue **purple_values, va_list data)
 {
 	int i;
 
@@ -669,43 +669,43 @@
 		gboolean xboolean;
 		gpointer ptr = NULL;
 
-		if (gaim_value_is_outgoing(gaim_values[i]))
+		if (purple_value_is_outgoing(purple_values[i]))
 		{
 			ptr = my_arg(gpointer);
 			g_return_if_fail(ptr);
 		}
 
-		switch (gaim_values[i]->type)
+		switch (purple_values[i]->type)
 		{
-		case GAIM_TYPE_INT:
+		case PURPLE_TYPE_INT:
 			xint = my_arg(gint);
 			dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &xint);
 			break;
-		case GAIM_TYPE_UINT:
+		case PURPLE_TYPE_UINT:
 			xuint = my_arg(guint);
 			dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &xuint);
 			break;
-		case GAIM_TYPE_BOOLEAN:
+		case PURPLE_TYPE_BOOLEAN:
 			xboolean = my_arg(gboolean);
 			dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &xboolean);
 			break;
-		case GAIM_TYPE_STRING:
+		case PURPLE_TYPE_STRING:
 			str = null_to_empty(my_arg(char*));
 			if (!g_utf8_validate(str, -1, NULL)) {
 				gchar *tmp;
-				gaim_debug_error("dbus", "Invalid UTF-8 string passed to signal, emitting salvaged string!\n");
-				tmp = gaim_utf8_salvage(str);
+				purple_debug_error("dbus", "Invalid UTF-8 string passed to signal, emitting salvaged string!\n");
+				tmp = purple_utf8_salvage(str);
 				dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &tmp);
 				g_free(tmp);
 			} else {
 				dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &str);
 			}
 			break;
-		case GAIM_TYPE_SUBTYPE: /* registered pointers only! */
-		case GAIM_TYPE_POINTER:
-		case GAIM_TYPE_OBJECT:
-		case GAIM_TYPE_BOXED:
-			id = gaim_dbus_pointer_to_id(my_arg(gpointer));
+		case PURPLE_TYPE_SUBTYPE: /* registered pointers only! */
+		case PURPLE_TYPE_POINTER:
+		case PURPLE_TYPE_OBJECT:
+		case PURPLE_TYPE_BOXED:
+			id = purple_dbus_pointer_to_id(my_arg(gpointer));
 			dbus_message_iter_append_basic(iter,
 					(sizeof(void *) == 4) ? DBUS_TYPE_UINT32 : DBUS_TYPE_UINT64, &id);
 			break;
@@ -718,17 +718,17 @@
 #undef my_arg
 
 void
-gaim_dbus_signal_emit_gaim(const char *name, int num_values,
-		GaimValue **values, va_list vargs)
+purple_dbus_signal_emit_purple(const char *name, int num_values,
+		PurpleValue **values, va_list vargs)
 {
 	DBusMessage *signal;
 	DBusMessageIter iter;
 	char *newname;
 
 #if 0 /* this is noisy with no dbus connection */
-	g_return_if_fail(gaim_dbus_connection);
+	g_return_if_fail(purple_dbus_connection);
 #else
-	if (gaim_dbus_connection == NULL)
+	if (purple_dbus_connection == NULL)
 		return;
 #endif
 
@@ -742,26 +742,26 @@
 	if (!strcmp(name, "dbus-method-called"))
 		return;
 
-	newname = gaim_dbus_convert_signal_name(name);
-	signal = dbus_message_new_signal(DBUS_PATH_GAIM, DBUS_INTERFACE_GAIM, newname);
+	newname = purple_dbus_convert_signal_name(name);
+	signal = dbus_message_new_signal(DBUS_PATH_PURPLE, DBUS_INTERFACE_PURPLE, newname);
 	dbus_message_iter_init_append(signal, &iter);
 
-	gaim_dbus_message_append_gaim_values(&iter, num_values, values, vargs);
+	purple_dbus_message_append_purple_values(&iter, num_values, values, vargs);
 
-	dbus_connection_send(gaim_dbus_connection, signal, NULL);
+	dbus_connection_send(purple_dbus_connection, signal, NULL);
 
 	g_free(newname);
 	dbus_message_unref(signal);
 }
 
 const char *
-gaim_dbus_get_init_error(void)
+purple_dbus_get_init_error(void)
 {
 	return init_error;
 }
 
 void *
-gaim_dbus_get_handle(void)
+purple_dbus_get_handle(void)
 {
 	static int handle;
 
@@ -769,19 +769,19 @@
 }
 
 void
-gaim_dbus_init(void)
+purple_dbus_init(void)
 {
-	gaim_dbus_init_ids();
+	purple_dbus_init_ids();
 
 	g_free(init_error);
 	init_error = NULL;
-	gaim_dbus_dispatch_init();
+	purple_dbus_dispatch_init();
 	if (init_error != NULL)
-		gaim_debug_error("dbus", "%s\n", init_error);
+		purple_debug_error("dbus", "%s\n", init_error);
 }
 
 void
-gaim_dbus_uninit(void)
+purple_dbus_uninit(void)
 {
 	/* Surely we must do SOME kind of uninitialization? */