Remove unused code that was causing a dependency on dbus-tqt

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit a8aa919300)
r14.1.x
Michele Calgaro 4 days ago
parent ffd1a2b23b
commit 5931ac6f6c
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -84,7 +84,6 @@ endif( WITH_XTEST )
if ( BUILD_KNPPLAYER ) if ( BUILD_KNPPLAYER )
pkg_search_module( DBUS dbus-1 ) pkg_search_module( DBUS dbus-1 )
pkg_search_module( DBUS-TQT dbus-tqt )
pkg_search_module( NSPR nspr ) pkg_search_module( NSPR nspr )
pkg_search_module( GTK2 gtk+-2.0 ) pkg_search_module( GTK2 gtk+-2.0 )
pkg_search_module( GLIB2 glib-2.0 ) pkg_search_module( GLIB2 glib-2.0 )
@ -93,7 +92,7 @@ if ( BUILD_KNPPLAYER )
pkg_search_module( GMODULE2 gmodule-2.0 ) pkg_search_module( GMODULE2 gmodule-2.0 )
pkg_search_module( DBUS-GLIB dbus-glib-1 ) pkg_search_module( DBUS-GLIB dbus-glib-1 )
if( DBUS_FOUND AND DBUS-TQT_FOUND ) if( DBUS_FOUND )
set( HAVE_DBUS 1 ) set( HAVE_DBUS 1 )
else() else()
tde_message_fatal( "Dbus is required but dbus was not found on your system." ) tde_message_fatal( "Dbus is required but dbus was not found on your system." )

@ -48,8 +48,8 @@
#include <tdeio/job.h> #include <tdeio/job.h>
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
# include "dbus/dbus.h"
# include <kstaticdeleter.h> # include <kstaticdeleter.h>
# include <dbus/connection.h>
#endif #endif
#include "kmplayerview.h" #include "kmplayerview.h"
@ -1897,19 +1897,16 @@ TDE_NO_EXPORT void FFMpeg::processStopped (TDEProcess *) {
struct KMPLAYER_NO_EXPORT DBusStatic { struct KMPLAYER_NO_EXPORT DBusStatic {
DBusStatic (); DBusStatic ();
~DBusStatic (); ~DBusStatic ();
DBusQt::Connection *connection; // FIXME find a way to detect if already connected
DBusConnection *dbus_connnection; DBusConnection *dbus_connnection;
}; };
static DBusStatic * dbus_static = 0L; static DBusStatic * dbus_static = 0L;
DBusStatic::DBusStatic () DBusStatic::DBusStatic ()
: connection (new DBusQt::Connection (DBUS_BUS_SESSION, 0L)), : dbus_connnection (0L) {}
dbus_connnection (0L) {}
DBusStatic::~DBusStatic () { DBusStatic::~DBusStatic () {
dbus_connection_unref (dbus_connnection); dbus_connection_unref (dbus_connnection);
delete connection;
dbus_static = 0L; dbus_static = 0L;
} }

Loading…
Cancel
Save