Mercurial > pidgin3 / changeset

--- a/libpurple/account.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/account.c	Tue Oct 02 16:01:52 2018 -0500
@@ -23,7 +23,6 @@
 
 #include "accounts.h"
 #include "core.h"
-#include "dbus-maybe.h"
 #include "debug.h"
 #include "network.h"
 #include "notify.h"
@@ -2415,7 +2414,6 @@
 	if(old_err)
 		g_free(old_err->description);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(old_err);
 	g_free(old_err);
 }
 
@@ -2892,8 +2890,6 @@
 	priv->system_log = NULL;
 
 	priv->privacy_type = PURPLE_ACCOUNT_PRIVACY_ALLOW_ALL;
-
-	PURPLE_DBUS_REGISTER_POINTER(account, PurpleAccount);
 }
 
 /* Called when done constructing */
@@ -2989,7 +2985,6 @@
 	if(priv->system_log)
 		purple_log_free(priv->system_log);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(priv->current_error);
 	if (priv->current_error) {
 		g_free(priv->current_error->description);
 		g_free(priv->current_error);
@@ -3015,8 +3010,6 @@
 		priv->permit = g_slist_delete_link(priv->permit, priv->permit);
 	}
 
-	PURPLE_DBUS_UNREGISTER_POINTER(account);
-
 	parent_class->finalize(object);
 }
 

--- a/libpurple/accounts.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/accounts.c	Tue Oct 02 16:01:52 2018 -0500
@@ -21,7 +21,6 @@
 #include "internal.h"
 #include "accounts.h"
 #include "core.h"
-#include "dbus-maybe.h"
 #include "debug.h"
 #include "enums.h"
 #include "network.h"
@@ -411,7 +410,6 @@
 		description = g_strdup("");
 
 	current_error = g_new0(PurpleConnectionErrorInfo, 1);
-	PURPLE_DBUS_REGISTER_POINTER(current_error, PurpleConnectionErrorInfo);
 	current_error->type = type;
 	current_error->description = description;
 
@@ -868,7 +866,6 @@
 	g_return_if_fail(account != NULL);
 
 	err = g_new0(PurpleConnectionErrorInfo, 1);
-	PURPLE_DBUS_REGISTER_POINTER(err, PurpleConnectionErrorInfo);
 
 	err->type = type;
 	err->description = g_strdup(description);

--- a/libpurple/buddy.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/buddy.c	Tue Oct 02 16:01:52 2018 -0500
@@ -22,7 +22,6 @@
  */
 #include "internal.h"
 #include "glibcompat.h"
-#include "dbus-maybe.h"
 #include "util.h"
 
 #define PURPLE_BUDDY_GET_PRIVATE(obj) \
@@ -532,7 +531,6 @@
 
 static void
 purple_buddy_init(GTypeInstance *instance, gpointer klass) {
-	PURPLE_DBUS_REGISTER_POINTER(PURPLE_BUDDY(instance), PurpleBuddy);
 }
 
 static void
@@ -587,8 +585,6 @@
 	g_free(priv->local_alias);
 	g_free(priv->server_alias);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(buddy);
-
 	G_OBJECT_CLASS(parent_class)->finalize(object);
 }
 

--- a/libpurple/buddyicon.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/buddyicon.c	Tue Oct 02 16:01:52 2018 -0500
@@ -23,7 +23,6 @@
 #include "internal.h"
 #include "buddyicon.h"
 #include "conversation.h"
-#include "dbus-maybe.h"
 #include "debug.h"
 #include "image.h"
 #include "util.h"
@@ -292,7 +291,6 @@
 	/* This does not zero.  See purple_buddy_icon_new() for
 	 * information on which function allocates which member. */
 	icon = g_slice_new(PurpleBuddyIcon);
-	PURPLE_DBUS_REGISTER_POINTER(icon, PurpleBuddyIcon);
 
 	icon->account = account;
 	icon->username = g_strdup(username);
@@ -372,7 +370,6 @@
 		g_free(icon->checksum);
 		g_object_unref(icon->img);
 
-		PURPLE_DBUS_UNREGISTER_POINTER(icon);
 		g_slice_free(PurpleBuddyIcon, icon);
 	}
 }

--- a/libpurple/buddylist.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/buddylist.c	Tue Oct 02 16:01:52 2018 -0500
@@ -23,7 +23,6 @@
 #include "internal.h"
 #include "buddylist.h"
 #include "conversation.h"
-#include "dbus-maybe.h"
 #include "debug.h"
 #include "notify.h"
 #include "pounce.h"
@@ -2119,8 +2118,6 @@
 {
 	PurpleBuddyList *blist = PURPLE_BUDDY_LIST(instance);
 
-	PURPLE_DBUS_REGISTER_POINTER(blist, PurpleBuddyList);
-
 	PURPLE_BUDDY_LIST_GET_PRIVATE(blist)->buddies = g_hash_table_new_full(
 					 (GHashFunc)_purple_blist_hbuddy_hash,
 					 (GEqualFunc)_purple_blist_hbuddy_equal,
@@ -2133,8 +2130,6 @@
 {
 	g_hash_table_destroy(PURPLE_BUDDY_LIST_GET_PRIVATE(object)->buddies);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(object);
-
 	G_OBJECT_CLASS(parent_class)->finalize(object);
 }
 

--- a/libpurple/chat.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/chat.c	Tue Oct 02 16:01:52 2018 -0500
@@ -22,7 +22,6 @@
  */
 #include "internal.h"
 #include "chat.h"
-#include "dbus-maybe.h"
 #include "util.h"
 
 #define PURPLE_CHAT_GET_PRIVATE(obj) \
@@ -221,7 +220,6 @@
 static void
 purple_chat_init(GTypeInstance *instance, gpointer klass)
 {
-	PURPLE_DBUS_REGISTER_POINTER(PURPLE_CHAT(instance), PurpleChat);
 }
 
 /* Called when done constructing */
@@ -249,8 +247,6 @@
 	g_free(priv->alias);
 	g_hash_table_destroy(priv->components);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(object);
-
 	G_OBJECT_CLASS(blistnode_parent_class)->finalize(object);
 }
 

--- a/libpurple/connection.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/connection.c	Tue Oct 02 16:01:52 2018 -0500
@@ -26,7 +26,6 @@
 #include "account.h"
 #include "buddylist.h"
 #include "connection.h"
-#include "dbus-maybe.h"
 #include "debug.h"
 #include "enums.h"
 #include "http.h"
@@ -786,8 +785,6 @@
 
 	purple_connection_set_state(gc, PURPLE_CONNECTION_CONNECTING);
 	connections = g_list_append(connections, gc);
-
-	PURPLE_DBUS_REGISTER_POINTER(gc, PurpleConnection);
 }
 
 /* Called when done constructing */
@@ -876,8 +873,6 @@
 	purple_str_wipe(priv->password);
 	g_free(priv->display_name);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(gc);
-
 	G_OBJECT_CLASS(parent_class)->finalize(object);
 }
 

--- a/libpurple/contact.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/contact.c	Tue Oct 02 16:01:52 2018 -0500
@@ -22,7 +22,6 @@
  */
 
 #include "contact.h"
-#include "dbus-maybe.h"
 #include "internal.h" /* TODO: this needs to die */
 #include "util.h"
 
@@ -301,8 +300,6 @@
 
 	if (ops && ops->new_node)
 		ops->new_node(PURPLE_BLIST_NODE(contact));
-
-	PURPLE_DBUS_REGISTER_POINTER(contact, PurpleContact);
 }
 
 /* GObject finalize function */
@@ -311,8 +308,6 @@
 {
 	g_free(PURPLE_CONTACT_GET_PRIVATE(object)->alias);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(object);
-
 	G_OBJECT_CLASS(parent_class)->finalize(object);
 }
 

--- a/libpurple/conversation.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/conversation.c	Tue Oct 02 16:01:52 2018 -0500
@@ -25,7 +25,6 @@
 #include "buddylist.h"
 #include "cmds.h"
 #include "conversation.h"
-#include "dbus-maybe.h"
 #include "debug.h"
 #include "enums.h"
 #include "notify.h"

--- a/libpurple/conversationtypes.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/conversationtypes.c	Tue Oct 02 16:01:52 2018 -0500
@@ -22,7 +22,6 @@
 #include "internal.h"
 #include "glibcompat.h"
 #include "conversationtypes.h"
-#include "dbus-maybe.h"
 #include "debug.h"
 #include "enums.h"
 
@@ -416,8 +415,6 @@
 /* GObject initialization function */
 static void purple_im_conversation_init(GTypeInstance *instance, gpointer klass)
 {
-	PURPLE_DBUS_REGISTER_POINTER(PURPLE_IM_CONVERSATION(instance),
-			PurpleIMConversation);
 }
 
 /* Called when done constructing */
@@ -487,8 +484,6 @@
 	purple_im_conversation_stop_typing_timeout(im);
 	purple_im_conversation_stop_send_typed_timeout(im);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(im);
-
 	G_OBJECT_CLASS(parent_class)->finalize(object);
 }
 
@@ -1392,9 +1387,6 @@
 {
 	PurpleChatConversationPrivate *priv = PURPLE_CHAT_CONVERSATION_GET_PRIVATE(instance);
 
-	PURPLE_DBUS_REGISTER_POINTER(PURPLE_CHAT_CONVERSATION(instance),
-			PurpleChatConversation);
-
 	priv->users = g_hash_table_new_full(_purple_conversation_user_hash,
 		_purple_conversation_user_equal, g_free, g_object_unref);
 }
@@ -1479,8 +1471,6 @@
 	priv->topic = NULL;
 	priv->nick = NULL;
 
-	PURPLE_DBUS_UNREGISTER_POINTER(chat);
-
 	G_OBJECT_CLASS(parent_class)->finalize(object);
 }
 
@@ -1824,7 +1814,6 @@
 static void
 purple_chat_user_init(GTypeInstance *instance, gpointer klass)
 {
-	PURPLE_DBUS_REGISTER_POINTER(PURPLE_CHAT_USER(instance), PurpleChatUser);
 }
 
 /* Called when done constructing */
@@ -1856,8 +1845,6 @@
 	g_free(priv->alias_key);
 	g_free(priv->name);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(cb);
-
 	cb_parent_class->finalize(object);
 }
 

--- a/libpurple/group.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/group.c	Tue Oct 02 16:01:52 2018 -0500
@@ -21,7 +21,6 @@
  *
  */
 
-#include "dbus-maybe.h"
 #include "group.h"
 #include "internal.h" /* TODO: we need to kill this */
 
@@ -288,7 +287,6 @@
 /* GObject initialization function */
 static void
 purple_group_init(GTypeInstance *instance, gpointer klass) {
-	PURPLE_DBUS_REGISTER_POINTER(PURPLE_GROUP(instance), PurpleGroup);
 }
 
 /* Called when done constructing */
@@ -311,8 +309,6 @@
 purple_group_finalize(GObject *object) {
 	g_free(PURPLE_GROUP_GET_PRIVATE(object)->name);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(object);
-
 	G_OBJECT_CLASS(parent_class)->finalize(object);
 }
 

--- a/libpurple/keyring.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/keyring.c	Tue Oct 02 16:01:52 2018 -0500
@@ -27,7 +27,6 @@
 #include "core.h"
 #include "debug.h"
 #include "internal.h"
-#include "dbus-maybe.h"
 #include "plugins.h"
 
 struct _PurpleKeyring
@@ -488,7 +487,6 @@
 		purple_keyring_set_inuse(keyring, TRUE, NULL, NULL);
 	}
 
-	PURPLE_DBUS_REGISTER_POINTER(keyring, PurpleKeyring);
 	purple_signal_emit(purple_keyring_get_handle(), "keyring-register",
 		keyring_id, keyring);
 	if (purple_debug_is_verbose()) {
@@ -516,7 +514,6 @@
 
 	purple_signal_emit(purple_keyring_get_handle(), "keyring-unregister",
 		keyring_id, keyring);
-	PURPLE_DBUS_UNREGISTER_POINTER(keyring);
 
 	inuse = purple_keyring_get_inuse();
 	fallback = purple_keyring_find_keyring_by_id(PURPLE_DEFAULT_KEYRING);

--- a/libpurple/log.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/log.c	Tue Oct 02 16:01:52 2018 -0500
@@ -21,7 +21,6 @@
 
 #include "internal.h"
 #include "account.h"
-#include "dbus-maybe.h"
 #include "debug.h"
 #include "glibcompat.h"
 #include "image-store.h"
@@ -80,7 +79,6 @@
 
 	/* IMPORTANT: Make sure to initialize all the members of PurpleLog */
 	log = g_slice_new(PurpleLog);
-	PURPLE_DBUS_REGISTER_POINTER(log, PurpleLog);
 
 	log->type = type;
 	log->name = g_strdup(purple_normalize(account, name));
@@ -107,7 +105,6 @@
 	if (log->time)
 		g_date_time_unref(log->time);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(log);
 	g_slice_free(PurpleLog, log);
 }
 

--- a/libpurple/message.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/message.c	Tue Oct 02 16:01:52 2018 -0500
@@ -20,7 +20,6 @@
  */
 
 #include "internal.h"
-#include "dbus-maybe.h"
 #include "glibcompat.h"
 
 #include "debug.h"
@@ -241,7 +240,6 @@
 
 	PurpleMessage *msg = PURPLE_MESSAGE(instance);
 	PurpleMessagePrivate *priv = PURPLE_MESSAGE_GET_PRIVATE(msg);
-	PURPLE_DBUS_REGISTER_POINTER(msg, PurpleMessage);
 
 	priv->id = ++max_id;
 	g_hash_table_insert(messages, GINT_TO_POINTER(max_id), msg);

--- a/libpurple/notify.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/notify.c	Tue Oct 02 16:01:52 2018 -0500
@@ -21,7 +21,6 @@
 #define _PURPLE_NOTIFY_C_
 
 #include "internal.h"
-#include "dbus-maybe.h"
 #include "notify.h"
 
 static PurpleNotifyUiOps *notify_ui_ops = NULL;
@@ -441,7 +440,6 @@
 	PurpleNotifyUserInfoEntry *user_info_entry;
 
 	user_info_entry = g_new0(PurpleNotifyUserInfoEntry, 1);
-	PURPLE_DBUS_REGISTER_POINTER(user_info_entry, PurpleNotifyUserInfoEntry);
 	user_info_entry->label = g_strdup(label);
 	user_info_entry->value = g_strdup(value);
 	user_info_entry->type = PURPLE_NOTIFY_USER_INFO_ENTRY_PAIR;
@@ -456,7 +454,6 @@
 
 	g_free(user_info_entry->label);
 	g_free(user_info_entry->value);
-	PURPLE_DBUS_UNREGISTER_POINTER(user_info_entry);
 	g_free(user_info_entry);
 }
 
@@ -466,7 +463,6 @@
 	PurpleNotifyUserInfo *user_info;
 
 	user_info = g_new0(PurpleNotifyUserInfo, 1);
-	PURPLE_DBUS_REGISTER_POINTER(user_info, PurpleNotifyUserInfo);
 	g_queue_init(&user_info->entries);
 
 	return user_info;
@@ -484,7 +480,6 @@
 	}
 
 	g_queue_clear(&user_info->entries);
-	PURPLE_DBUS_UNREGISTER_POINTER(user_info);
 	g_free(user_info);
 }
 

--- a/libpurple/plugins.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/plugins.c	Tue Oct 02 16:01:52 2018 -0500
@@ -23,7 +23,6 @@
 
 #include "core.h"
 #include "debug.h"
-#include "dbus-maybe.h"
 #include "enums.h"
 #include "plugins.h"
 
@@ -368,7 +367,6 @@
 static void
 purple_plugin_info_init(GTypeInstance *instance, gpointer klass)
 {
-	PURPLE_DBUS_REGISTER_POINTER(PURPLE_PLUGIN_INFO(instance), PurplePluginInfo);
 }
 
 /* Set method for GObject properties */
@@ -483,8 +481,6 @@
 	g_free(priv->ui_requirement);
 	g_free(priv->error);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(object);
-
 	parent_class->finalize(object);
 }
 

--- a/libpurple/presence.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/presence.c	Tue Oct 02 16:01:52 2018 -0500
@@ -21,7 +21,6 @@
 #include "internal.h"
 #include "glibcompat.h"
 #include "debug.h"
-#include "dbus-maybe.h"
 #include "presence.h"
 
 #define PURPLE_PRESENCE_GET_PRIVATE(obj) \
@@ -418,8 +417,6 @@
 static void
 purple_presence_init(GTypeInstance *instance, gpointer klass)
 {
-	PURPLE_DBUS_REGISTER_POINTER(PURPLE_PRESENCE(instance), PurplePresence);
-
 	PURPLE_PRESENCE_GET_PRIVATE(instance)->status_table =
 				g_hash_table_new_full(g_str_hash, g_str_equal,
 				g_free, NULL);
@@ -448,8 +445,6 @@
 
 	g_hash_table_destroy(priv->status_table);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(object);
-
 	parent_class->finalize(object);
 }
 

--- a/libpurple/protocol.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/protocol.c	Tue Oct 02 16:01:52 2018 -0500
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "dbus-maybe.h"
 #include "protocol.h"
 
 static GObjectClass *parent_class;
@@ -140,7 +139,6 @@
 static void
 purple_protocol_init(GTypeInstance *instance, gpointer klass)
 {
-	PURPLE_DBUS_REGISTER_POINTER(PURPLE_PROTOCOL(instance), PurpleProtocol);
 }
 
 static void
@@ -174,8 +172,6 @@
 	account_options_free(protocol);
 	icon_spec_free(protocol);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(protocol);
-
 	parent_class->finalize(object);
 }
 

--- a/libpurple/savedstatuses.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/savedstatuses.c	Tue Oct 02 16:01:52 2018 -0500
@@ -24,7 +24,6 @@
 #include "idle.h"
 #include "notify.h"
 #include "savedstatuses.h"
-#include "dbus-maybe.h"
 #include "request.h"
 #include "status.h"
 #include "util.h"
@@ -108,7 +107,6 @@
 
 	g_free(substatus->message);
 	purple_request_close_with_handle(substatus);
-	PURPLE_DBUS_UNREGISTER_POINTER(substatus);
 	g_free(substatus);
 }
 
@@ -127,7 +125,6 @@
 		free_saved_status_sub(substatus);
 	}
 	purple_request_close_with_handle(status);
-	PURPLE_DBUS_UNREGISTER_POINTER(status);
 	g_free(status);
 }
 
@@ -417,7 +414,6 @@
 		ret->message = data;
 	}
 
-	PURPLE_DBUS_REGISTER_POINTER(ret, PurpleSavedStatusSub);
 	return ret;
 }
 
@@ -513,7 +509,6 @@
 			ret->substatuses = g_list_prepend(ret->substatuses, new);
 	}
 
-	PURPLE_DBUS_REGISTER_POINTER(ret, PurpleSavedStatus);
 	return ret;
 }
 
@@ -563,7 +558,6 @@
 		g_return_val_if_fail(purple_savedstatus_find(title) == NULL, NULL);
 
 	status = g_new0(PurpleSavedStatus, 1);
-	PURPLE_DBUS_REGISTER_POINTER(status, PurpleSavedStatus);
 	status->title = g_strdup(title);
 	status->type = type;
 	set_creation_time(status, time(NULL));
@@ -641,7 +635,6 @@
 	if (substatus == NULL)
 	{
 		substatus = g_new0(PurpleSavedStatusSub, 1);
-		PURPLE_DBUS_REGISTER_POINTER(substatus, PurpleSavedStatusSub);
 		substatus->account = (PurpleAccount *)account;
 		saved_status->substatuses = g_list_prepend(saved_status->substatuses, substatus);
 	}

--- a/libpurple/smiley-list.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/smiley-list.c	Tue Oct 02 16:01:52 2018 -0500
@@ -21,7 +21,6 @@
 
 #include "smiley-list.h"
 
-#include "dbus-maybe.h"
 #include "debug.h"
 #include "smiley-parser.h"
 #include "trie.h"
@@ -65,8 +64,6 @@
 		g_free, NULL);
 	priv->shortcut_map = g_hash_table_new_full(g_str_hash, g_str_equal,
 		g_free, NULL);
-
-	PURPLE_DBUS_REGISTER_POINTER(list, PurpleSmileyList);
 }
 
 static void
@@ -87,8 +84,6 @@
 	}
 	g_list_free(priv->smileys);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(sl);
-
 	G_OBJECT_CLASS(purple_smiley_list_parent_class)->finalize(obj);
 }
 

--- a/libpurple/smiley.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/smiley.c	Tue Oct 02 16:01:52 2018 -0500
@@ -20,7 +20,6 @@
  */
 
 #include "smiley.h"
-#include "dbus-maybe.h"
 
 #define PURPLE_SMILEY_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_SMILEY, PurpleSmileyPrivate))
@@ -59,7 +58,6 @@
 
 static void
 purple_smiley_init(PurpleSmiley *smiley) {
-	PURPLE_DBUS_REGISTER_POINTER(smiley, PurpleSmiley);
 }
 
 static void
@@ -68,8 +66,6 @@
 
 	g_free(priv->shortcut);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(smiley);
-
 	G_OBJECT_CLASS(purple_smiley_parent_class)->finalize(obj);
 }
 

--- a/libpurple/status.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/status.c	Tue Oct 02 16:01:52 2018 -0500
@@ -23,7 +23,6 @@
 
 #include "buddylist.h"
 #include "core.h"
-#include "dbus-maybe.h"
 #include "debug.h"
 #include "notify.h"
 #include "prefs.h"
@@ -209,7 +208,6 @@
 	g_return_val_if_fail(primitive != PURPLE_STATUS_UNSET, NULL);
 
 	status_type = g_new0(PurpleStatusType, 1);
-	PURPLE_DBUS_REGISTER_POINTER(status_type, PurpleStatusType);
 
 	status_type->primitive     = primitive;
 	status_type->saveable      = saveable;
@@ -315,7 +313,6 @@
 	g_list_foreach(status_type->attrs, (GFunc)purple_status_attribute_destroy, NULL);
 	g_list_free(status_type->attrs);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(status_type);
 	g_free(status_type);
 }
 
@@ -448,7 +445,6 @@
 	g_return_val_if_fail(value_type != NULL, NULL);
 
 	attr = g_new0(PurpleStatusAttribute, 1);
-	PURPLE_DBUS_REGISTER_POINTER(attr, PurpleStatusAttribute);
 
 	attr->id         = g_strdup(id);
 	attr->name       = g_strdup(name);
@@ -467,7 +463,6 @@
 
 	purple_value_free(attr->value_type);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(attr);
 	g_free(attr);
 }
 
@@ -1165,8 +1160,6 @@
 {
 	PurpleStatus *status = PURPLE_STATUS(instance);
 
-	PURPLE_DBUS_REGISTER_POINTER(status, PurpleStatus);
-
 	PURPLE_STATUS_GET_PRIVATE(status)->attr_values =
 		g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
 		(GDestroyNotify)purple_value_free);
@@ -1203,8 +1196,6 @@
 {
 	g_hash_table_destroy(PURPLE_STATUS_GET_PRIVATE(object)->attr_values);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(object);
-
 	parent_class->finalize(object);
 }
 

--- a/libpurple/xfer.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/xfer.c	Tue Oct 02 16:01:52 2018 -0500
@@ -22,7 +22,6 @@
 #include "internal.h"
 #include "glibcompat.h"
 
-#include "dbus-maybe.h"
 #include "enums.h"
 #include "image-store.h"
 #include "xfer.h"
@@ -2125,8 +2124,6 @@
 	PurpleXfer *xfer = PURPLE_XFER(instance);
 	PurpleXferPrivate *priv = PURPLE_XFER_GET_PRIVATE(xfer);
 
-	PURPLE_DBUS_REGISTER_POINTER(xfer, PurpleXfer);
-
 	priv->ui_ops = purple_xfers_get_ui_ops();
 	priv->current_buffer_size = FT_INITIAL_BUFFER_SIZE;
 	priv->fd = -1;
@@ -2190,8 +2187,6 @@
 	g_free(priv->thumbnail_data);
 	g_free(priv->thumbnail_mimetype);
 
-	PURPLE_DBUS_UNREGISTER_POINTER(xfer);
-
 	parent_class->finalize(object);
 }
 

--- a/libpurple/xmlnode.c	Tue Nov 27 17:52:15 2018 -0600
+++ b/libpurple/xmlnode.c	Tue Oct 02 16:01:52 2018 -0500
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <glib.h>
 
-#include "dbus-maybe.h"
 #include "util.h"
 #include "xmlnode.h"
 
@@ -50,8 +49,6 @@
 	node->name = g_strdup(name);
 	node->type = type;
 
-//	PURPLE_DBUS_REGISTER_POINTER(node, PurpleXmlNode);
-
 	return node;
 }
 
@@ -402,7 +399,6 @@
 	if(node->namespace_map)
 		g_hash_table_destroy(node->namespace_map);
 
-//	PURPLE_DBUS_UNREGISTER_POINTER(node);
 	g_free(node);
 }