diff -u -r src/mumble/main.cpp src/mumble.new/main.cpp --- src/mumble/main.cpp 2008-02-23 19:50:00.000000000 +0100 +++ src/mumble.new/main.cpp 2008-03-12 19:29:54.000000000 +0100 @@ -39,7 +39,6 @@ #include "Plugins.h" #include "Global.h" #ifndef Q_OS_MAC -#include "DBus.h" #endif #include "VersionCheck.h" #include "NetworkConfig.h" @@ -73,23 +72,6 @@ Global::g_global_struct = new Global(); -#ifndef Q_OS_MAC -#ifdef Q_OS_WIN - // By default, windbus expects the path to dbus-daemon to be in PATH, and the path - // should contain bin\\, and the path to the config is hardcoded as ..\etc - _putenv(qPrintable(QString::fromLatin1("PATH=%1\\bin;%1;%2").arg(QDir::toNativeSeparators(a.applicationDirPath())).arg(QLatin1String(getenv("PATH"))))); -#endif - - QDBusInterface qdbi(QLatin1String("net.sourceforge.mumble.mumble"), QLatin1String("/")); - QDBusMessage reply=qdbi.call(QLatin1String("focus")); - if (reply.type() == QDBusMessage::ReplyMessage) { - if (a.arguments().count() > 1) { - qdbi.call(QLatin1String("openUrl"), a.arguments().last()); - } - return 0; - } -#endif - QFile inifile(QString::fromLatin1("%1/mumble.ini").arg(a.applicationDirPath())); if (inifile.exists() && inifile.permissions().testFlag(QFile::WriteUser)) g.qs = new QSettings(inifile.fileName(), QSettings::IniFormat); @@ -166,12 +148,6 @@ g.mw=new MainWindow(NULL); g.mw->show(); -#ifndef Q_OS_MAC - new MumbleDBus(g.mw); - QDBusConnection::sessionBus().registerObject("/", g.mw); - QDBusConnection::sessionBus().registerService("net.sourceforge.mumble.mumble"); -#endif - g.l->log(Log::Information, MainWindow::tr("Welcome to Mumble.")); // Plugins diff -u -r src/mumble/mumble.pro src/mumble.new/mumble.pro --- src/mumble/mumble.pro 2008-03-12 19:30:09.000000000 +0100 +++ src/mumble.new/mumble.pro 2008-03-12 19:29:54.000000000 +0100 @@ -18,12 +18,6 @@ QMAKE_CXXFLAGS += -Wall -Wextra -!macx { - CONFIG += qdbus - HEADERS += DBus.h - SOURCES += DBus.cpp -} - win32 { RC_FILE = mumble.rc HEADERS += DXAudioInput.h DXAudioOutput.h DXConfigDialog.h GlobalShortcut_win.h diff -u -r src/mumble/mumble_pch.hpp src/mumble.new/mumble_pch.hpp --- src/mumble/mumble_pch.hpp 2008-02-23 19:50:02.000000000 +0100 +++ src/mumble.new/mumble_pch.hpp 2008-03-12 19:29:54.000000000 +0100 @@ -4,7 +4,6 @@ #define QT_ASCII_CAST_WARNINGS #define QT_NO_CAST_TO_ASCII #include -#include #include #include #include