libpurple: Remove DBus init/uninit from Purple core

Tue, 02 Oct 2018 16:08:50 -0500

author
Mike Ruprecht <cmaiku@gmail.com>
date
Tue, 02 Oct 2018 16:08:50 -0500
changeset 39353
d034ecc2b2b0
parent 39352
62bca2fe2e91
child 39354
db17ba548304

libpurple: Remove DBus init/uninit from Purple core

libpurple/core.c file | annotate | diff | comparison | revisions
--- a/libpurple/core.c	Tue Oct 02 16:01:52 2018 -0500
+++ b/libpurple/core.c	Tue Oct 02 16:08:50 2018 -0500
@@ -50,16 +50,6 @@
 #include "theme-manager.h"
 #include "util.h"
 
-#ifdef HAVE_DBUS
-#  ifndef DBUS_API_SUBJECT_TO_CHANGE
-#    define DBUS_API_SUBJECT_TO_CHANGE
-#  endif
-#  include <dbus/dbus.h>
-#  include "dbus-purple.h"
-#  include "dbus-server.h"
-#  include "dbus-bindings.h"
-#endif
-
 struct PurpleCore
 {
 	char *ui;
@@ -152,10 +142,6 @@
 			ops->debug_ui_init();
 	}
 
-#ifdef HAVE_DBUS
-	purple_dbus_init();
-#endif
-
 	purple_cmds_init();
 	purple_protocols_init();
 
@@ -266,10 +252,6 @@
 	static_proto_unload();
 	purple_protocols_uninit();
 
-#ifdef HAVE_DBUS
-	purple_dbus_uninit();
-#endif
-
 	purple_cmds_uninit();
 	purple_log_uninit();
 	_purple_message_uninit();

mercurial