diff options
| -rw-r--r-- | ConfigureChecks.cmake | 3 | ||||
| -rw-r--r-- | src/kmplayerprocess.cpp | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 00b1c77..1a82077 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -84,7 +84,6 @@ endif( WITH_XTEST ) if ( BUILD_KNPPLAYER ) pkg_search_module( DBUS dbus-1 ) - pkg_search_module( DBUS-TQT dbus-tqt ) pkg_search_module( NSPR nspr ) pkg_search_module( GTK2 gtk+-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( DBUS-GLIB dbus-glib-1 ) - if( DBUS_FOUND AND DBUS-TQT_FOUND ) + if( DBUS_FOUND ) set( HAVE_DBUS 1 ) else() tde_message_fatal( "Dbus is required but dbus was not found on your system." ) diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp index 8e7f894..fcd5994 100644 --- a/src/kmplayerprocess.cpp +++ b/src/kmplayerprocess.cpp @@ -48,8 +48,8 @@ #include <tdeio/job.h> #ifdef HAVE_DBUS +# include "dbus/dbus.h" # include <kstaticdeleter.h> -# include <dbus/connection.h> #endif #include "kmplayerview.h" @@ -1897,19 +1897,16 @@ TDE_NO_EXPORT void FFMpeg::processStopped (TDEProcess *) { struct KMPLAYER_NO_EXPORT DBusStatic { DBusStatic (); ~DBusStatic (); - DBusQt::Connection *connection; // FIXME find a way to detect if already connected DBusConnection *dbus_connnection; }; static DBusStatic * dbus_static = 0L; DBusStatic::DBusStatic () - : connection (new DBusQt::Connection (DBUS_BUS_SESSION, 0L)), - dbus_connnection (0L) {} + : dbus_connnection (0L) {} DBusStatic::~DBusStatic () { dbus_connection_unref (dbus_connnection); - delete connection; dbus_static = 0L; } |