This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 83b8a9c14c6fd92f924a12ab2316f242ff76cd13 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Mar 14 03:04:40 2018 +0100 src/{configdialog.cpp,onmainwindow{.cpp,{,_privat}.h}}: remove plugin references. --- debian/changelog | 2 + src/configdialog.cpp | 8 - src/onmainwindow.cpp | 411 +--------------------------------------------- src/onmainwindow.h | 77 --------- src/onmainwindow_privat.h | 7 - 5 files changed, 4 insertions(+), 501 deletions(-) diff --git a/debian/changelog b/debian/changelog index b7ec4e5..53fde6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,8 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium - {{build,config}_win_plugin.bat,config_linux_{,static_}plugin.sh}: remove. - config_win.bat: remove plugin references. + - src/{configdialog.cpp,onmainwindow{.cpp,{,_privat}.h}}: remove plugin + references. * x2goclient.spec: - Remove plugin references. * debian/rules: diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 565333a..7651920 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -62,9 +62,6 @@ ConfigDialog::ConfigDialog ( QWidget * parent, Qt::WindowFlags f ) X2goSettings st ( "settings" ); - -#ifndef CFGPLUGIN - gbTrayIcon=new QGroupBox(tr("Display icon in system tray"),fr); frLay->addWidget(gbTrayIcon); gbTrayIcon->setCheckable(true); @@ -86,7 +83,6 @@ ConfigDialog::ConfigDialog ( QWidget * parent, Qt::WindowFlags f ) cbMaxmizeTray->setChecked ( st.setting()->value ( "trayicon/maxdiscon", false ).toBool() ); cbNoClose->setChecked ( st.setting()->value ( "trayicon/noclose", false ).toBool() ); cbMinToTray->setChecked ( st.setting()->value ( "trayicon/mintotray", false ).toBool() ); -#endif #ifdef USELDAP if ( !embedMode ) @@ -373,13 +369,11 @@ ConfigDialog::~ConfigDialog() void ConfigDialog::slot_accepted() { X2goSettings st ( "settings" ); -#ifndef CFGPLUGIN st.setting()->setValue ( "trayicon/enabled", gbTrayIcon->isChecked() ); st.setting()->setValue ( "trayicon/mintotray", cbMinToTray->isChecked() ); st.setting()->setValue ( "trayicon/noclose", cbNoClose->isChecked() ); st.setting()->setValue ( "trayicon/mincon", cbMinimizeTray->isChecked() ); st.setting()->setValue ( "trayicon/maxdiscon", cbMaxmizeTray->isChecked() ); -#endif #if defined (Q_OS_WIN) || defined (Q_OS_DARWIN) if(!systemDisablePARecord) st.setting()->setValue ( "pulse/norecord", cbNoRecord->isChecked() ); @@ -684,13 +678,11 @@ void ConfigDialog::slotDefaults() cbNoRecord->setChecked (false); cbDisablePA->setChecked (false); #endif /* defined (Q_OS_DARWIN) */ -#ifndef CFGPLUGIN gbTrayIcon->setChecked (false); cbMinimizeTray->setChecked (false); cbMaxmizeTray->setChecked ( false); cbNoClose->setChecked (false); cbMinToTray->setChecked (false); -#endif } break; #if defined (Q_OS_WIN) && defined (CFGCLIENT) diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index f3341c9..61641ff 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -166,16 +166,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) appDir=QApplication::applicationDirPath(); -#if defined Q_OS_WIN && defined CFGPLUGIN - wchar_t pluginpath[1024]; - HMODULE module; - module=GetModuleHandleW ( L"npx2goplugin.dll" ); - GetModuleFileNameW ( module,pluginpath, 1024 ); - QString ppstr=QString::fromUtf16 ( ( const ushort* ) pluginpath ); - ppstr.replace ( "\\npx2goplugin.dll","" ); - appDir=wapiShortFileName ( ppstr ); - QDir::setCurrent ( appDir ); -#endif homeDir=QDir::homePath(); #ifdef Q_OS_WIN @@ -261,11 +251,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) } #endif -#ifdef CFGPLUGIN - embedMode=true; -#endif - - //set homedir as portable,etc @@ -476,12 +461,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) connect(interDlg, SIGNAL(closeInterractionDialog()), this, SLOT(slotCloseInteractionDialog())); username->addWidget ( interDlg ); -#if defined(CFGPLUGIN) && defined(Q_OS_LINUX) - - x2goDebug<<"Creating embedded container."; - embedContainer=new QX11EmbedContainer ( fr ); - -#endif if ( !embedMode ) { initWidgetsNormal(); @@ -740,141 +719,6 @@ void ONMainWindow::installTranslator () { void ONMainWindow::initWidgetsEmbed() { -#ifdef CFGPLUGIN - doPluginInit(); - stb=new QToolBar ( this ); - addToolBar ( stb ); - stb->toggleViewAction()->setEnabled ( false ); - stb->toggleViewAction()->setVisible ( false ); - stb->setFloatable ( false ); - stb->setMovable ( false ); - statusBar()->setSizeGripEnabled ( false ); -#ifndef Q_OS_WIN - statusBar()->hide(); -#endif - - - act_shareFolder=new QAction ( QIcon ( ":/img/icons/32x32/file-open.png" ), - tr ( "Share folder..." ),this ); - - act_showApps=new QAction ( QIcon ( ":/img/icons/32x32/apps.png" ), - tr ( "Applications..." ),this ); - - act_suspend=new QAction ( QIcon ( ":/img/icons/32x32/suspend.png" ), - tr ( "Suspend" ),this ); - - act_terminate=new QAction ( QIcon ( ":/img/icons/32x32/stop.png" ), - tr ( "Terminate" ),this ); - act_reconnect=new QAction ( QIcon ( ":/img/icons/32x32/reconnect.png" ), - tr ( "Reconnect" ),this ); - act_reconnect->setEnabled ( false ); - - act_embedContol=new QAction ( QIcon ( ":/img/icons/32x32/detach.png" ), - tr ( "Detach X2Go window" ),this ); - - act_embedToolBar=new QAction ( QIcon ( ":/img/icons/32x32/tbhide.png" ), - tr ( "Minimize toolbar" ),this ); - - - setEmbedSessionActionsEnabled ( false ); - - connect ( act_shareFolder,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotExportDirectory() ) ); - - connect ( act_showApps,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotAppDialog() ) ); - - connect ( act_suspend,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotSuspendSessFromSt() ) ); - - connect ( act_terminate,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotTermSessFromSt() ) ); - - connect ( act_reconnect,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotReconnectSession() ) ); - - connect ( act_embedContol,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotEmbedControlAction() ) ); - - connect ( act_embedToolBar,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotEmbedToolBar() ) ); - - - - processSessionConfig(); - -////embed container//////// -#ifndef Q_OS_DARWIN - - oldParentSize=QSize ( 0,0 ); - -#ifdef Q_OS_WIN - oldParentPos=QPoint ( 0,0 ); -#endif - childId=0l; -#ifdef Q_OS_LINUX - - connect ( embedContainer, SIGNAL ( clientClosed() ), this, - SLOT ( slotDetachProxyWindow() ) ); - - - embedContainer->connect ( embedContainer, SIGNAL ( clientClosed() ), - embedContainer, SLOT ( hide() ) ); -#endif -#ifdef Q_OS_WIN - embedContainer=new QWidget ( mainWidget() ); - - updateTimer = new QTimer ( this ); - connect ( updateTimer, SIGNAL ( timeout() ), this, - SLOT ( slotUpdateEmbedWindow() ) ); -#endif - embedContainer->hide(); - mainLayout()->addWidget ( embedContainer ); -#endif -//end of embed container - - X2goSettings st ( "sessions" ); - - embedTbVisible=!st.setting()->value ( - "embedded/tbvisible", true ).toBool(); - - slotEmbedToolBar(); - - - showTbTooltip=false; - if ( !embedTbVisible ) - { - showTbTooltip=true; - QTimer::singleShot ( 500, this, - SLOT ( slotEmbedToolBarToolTip() ) ); - QTimer::singleShot ( 3000, this, - SLOT ( slotHideEmbedToolBarToolTip() ) ); - } - if ( !config.showtoolbar ) - { - stb->hide(); - } - if ( config.confFS&& ( !config.useFs ) ) - { - x2goDebug<<"hide share"; - - act_shareFolder->setVisible ( false ); - } - - act_showApps->setVisible(false); - - - if ( !managedMode ) - { - -#ifdef Q_OS_LINUX - QTimer::singleShot ( 500, this, - SLOT ( slotActivateWindow() ) ); -#endif - - } -#endif//CFGPLUGIN - } void ONMainWindow::initWidgetsNormal() @@ -1215,8 +1059,6 @@ void ONMainWindow::slotGetBrokerAuth() void ONMainWindow::trayIconInit() { - -#ifndef CFGPLUGIN X2goSettings st ( "settings" ); trayEnabled=st.setting()->value ( "trayicon/enabled", false ).toBool(); trayMinCon=st.setting()->value ( "trayicon/mincon", false ).toBool(); @@ -1317,7 +1159,6 @@ void ONMainWindow::trayIconInit() plugAppsInTray(); } } -#endif } QMenu* ONMainWindow::initTrayAppMenu(QString text, QPixmap icon) @@ -6258,12 +6099,6 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) if ( embedMode ) { - if ( proxyWinEmbedded ) - { -#ifdef CFGPLUGIN - detachClient(); -#endif - } proxyWinTimer->stop(); setEmbedSessionActionsEnabled ( false ); } @@ -6301,7 +6136,6 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) disconnect ( nxproxy,SIGNAL ( readyReadStandardOutput() ),this, SLOT ( slotProxyStdout() ) ); proxyRunning=false; -#ifndef CFGPLUGIN if (trayEnabled) { trayIconActiveConnectionMenu->setTitle(tr("Not connected")); @@ -6310,7 +6144,6 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) showNormal(); } trayAutoHidden=false; -#endif bool emergencyExit=false; if(proxyErrString.indexOf("No data received from remote proxy")!=-1) @@ -6319,7 +6152,6 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) x2goWarningf(4)<< tr( "Emergency exit." ); } -#if ! (defined (CFGPLUGIN)) if ( nxproxy ) { if ( nxproxy->state() ==QProcess::Running ) @@ -6338,7 +6170,6 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) nxproxy=0; #endif } -#endif x2goDebug<<"Waiting for proxy to exit."; spoolTimer=0l; @@ -6473,7 +6304,6 @@ void ONMainWindow::slotProxyStderr() "Established X server connection" ) !=-1 ) { setStatStatus ( tr ( "running" ) ); -#ifndef CFGPLUGIN if (trayEnabled) { if (!useLdap) @@ -6487,7 +6317,6 @@ void ONMainWindow::slotProxyStderr() hide(); } } -#endif if ( embedMode ) setEmbedSessionActionsEnabled ( true ); disconnect ( sbSusp,SIGNAL ( clicked() ),this, @@ -6539,17 +6368,6 @@ void ONMainWindow::slotProxyStderr() if ( stInfo->toPlainText().indexOf ( tr ( "Connection timeout, aborting" ) ) !=-1 ) setStatStatus ( tr ( "aborting" ) ); -#if defined( Q_OS_WIN ) && defined (CFGPLUGIN) - if ( reserr.indexOf ( "Session terminated at" ) !=-1 ) - { - - x2goDebug<<"Proxy finished."; - - slotProxyFinished ( 0, QProcess::NormalExit ); - } -#endif - - } @@ -6783,9 +6601,7 @@ void ONMainWindow::setStatStatus ( QString status ) if ( !embedMode || !proxyWinEmbedded ) { statusBar()->showMessage ( ""); -#if ! (defined Q_OS_WIN && defined CFGPLUGIN) statusBar()->hide(); -#endif QString srv; if ( brokerMode ) { @@ -6831,13 +6647,11 @@ void ONMainWindow::setStatStatus ( QString status ) tr ( "Display" ) +": "+ resumingSession.display+", "+ tr ( "Creation time" ) +": "+tstr; -#if ! (defined Q_OS_WIN && defined CFGPLUGIN) if ( statusLabel ) { statusLabel->setText ( " "+message ); } else -#endif { if ( config.showstatusbar ) { @@ -8890,10 +8704,6 @@ void ONMainWindow::slotAbout() { QString aboutStr=tr ("<br>(C) 2005-2017 by <b>obviously nice</b>: " "Oleksandr Shneyder, Heinz-Markus Graesing<br>" ); - if ( embedMode ) - aboutStr+=tr ( "<br>X2Go Plugin mode was sponsored by " - "<a href=\"http://www.foss-group.de/\">" - "FOSS-Group GmbH (Freiburg)</a><br>" ); aboutStr+= tr ( "<br>This is a client to access the X2Go network-based " @@ -11433,9 +11243,6 @@ void ONMainWindow::slotAttachProxyWindow() void ONMainWindow::slotEmbedWindow() { #ifndef Q_OS_DARWIN -#ifdef CFGPLUGIN - embedWindow ( proxyWinId ); -#endif QTimer::singleShot ( 1000, this, SLOT ( slotActivateWindow() ) ); @@ -11457,14 +11264,10 @@ void ONMainWindow::slotEmbedControlAction() { #ifndef Q_OS_DARWIN embedControlChanged=true; - if ( proxyWinEmbedded ) + if ( !proxyWinEmbedded ) { -#ifdef CFGPLUGIN - detachClient(); -#endif - } - else slotAttachProxyWindow(); + } #endif } @@ -12905,213 +12708,3 @@ void ONMainWindow::slotInitLibssh () { trayQuit (); } } - -//////////////////////////plugin stuff////////////// - -#ifdef CFGPLUGIN -void ONMainWindow::setX2goconfig ( const QString& text ) -{ - m_x2goconfig=text; - - x2goDebug<<"Having a session config."; - - initWidgetsEmbed(); -} - -void ONMainWindow::doPluginInit() -{ -#ifdef Q_OS_LINUX - Dl_info info; - dladdr ( ( void* ) & ( ONMainWindow::getPortable ),&info ); - QString fname=info.dli_fname; - - x2goDebug<<"Application name:" <<fname; - - QString clientDir; - QString pluginDir; - int pos=fname.lastIndexOf ( "/" ); - pluginDir=fname.left ( pos ); - - x2goDebug<<"Plugin directory: " <<pluginDir; - - QDir dr ( pluginDir ); - if ( dr.exists ( "x2goclient/x2goclient" ) ) - { - clientDir=pluginDir+"/x2goclient"; - } - else if ( dr.exists ( "x2goclient" ) ) - { - clientDir=pluginDir; - } - else - { - dr.cdUp(); - if ( dr.exists ( "x2goclient/x2goclient" ) ) - { - clientDir=dr.absolutePath() +"/x2goclient"; - } - else if ( dr.exists ( "x2goclient" ) ) - { - clientDir=dr.absolutePath(); - } - else - { - clientDir=pluginDir; - } - } - - x2goDebug<<"Client directory: "<<clientDir; - - QString path=getenv ( "PATH" ); - path=clientDir+":"+pluginDir+":"+path; - setenv ( "PATH",path.toLatin1 (),1 ); - - path=getenv ( "LD_LIBRARY_PATH" ); - path=clientDir+":"+pluginDir+":"+path; - setenv ( "LD_LIBRARY_PATH",path.toLatin1 () ,1 ); - - setenv ( "X2GO_LIB",clientDir.toLatin1 () ,1 ); - - QFile::setPermissions ( - clientDir+"/x2goclient", - QFile::ReadOwner|QFile::WriteOwner|QFile::ExeOwner| - QFile::ReadGroup|QFile::WriteGroup|QFile::ExeGroup| - QFile::ReadOther|QFile::WriteOther|QFile::ExeOther ); - QFile::setPermissions ( - clientDir+"/nxproxy", - QFile::ReadOwner|QFile::WriteOwner|QFile::ExeOwner| - QFile::ReadGroup|QFile::WriteGroup|QFile::ExeGroup| - QFile::ReadOther|QFile::WriteOther|QFile::ExeOther ); - QFile::setPermissions ( - clientDir+"/sshd", - QFile::ReadOwner|QFile::WriteOwner|QFile::ExeOwner| - QFile::ReadGroup|QFile::WriteGroup|QFile::ExeGroup| - QFile::ReadOther|QFile::WriteOther|QFile::ExeOther ); - QFile::setPermissions ( - clientDir+"/sftp-server", - QFile::ReadOwner|QFile::WriteOwner|QFile::ExeOwner| - QFile::ReadGroup|QFile::WriteGroup|QFile::ExeGroup| - QFile::ReadOther|QFile::WriteOther|QFile::ExeOther ); - -#endif -} - - -#ifndef Q_OS_DARWIN - - -QSize ONMainWindow::getWindowSize ( long winId ) -{ - -#ifdef Q_OS_LINUX - XWindowAttributes atr; - if ( XGetWindowAttributes ( QX11Info::display(),winId,&atr ) ) - return QSize ( atr.width,atr.height ); - return QSize ( 0,0 ); -#endif -#ifdef Q_OS_WIN - QRect rec; - if ( wapiClientRect ( ( HWND ) winId,rec ) ) - return rec.size(); - else - return QSize ( 0,0 ); -#endif -} - -#ifdef Q_OS_WIN -void ONMainWindow::slotUpdateEmbedWindow() -{ - if ( oldContainerSize!=embedContainer->size() || - oldChildPos!= mapToGlobal ( - QPoint ( 0,0 ) ) ) - { - QRect geom=embedContainer->geometry(); - if ( gcor==1 ) - gcor=0; - else - gcor=1; - geom.setWidth ( geom.width()-gcor ); - wapiSetFSWindow ( ( HWND ) childId, - geom ); - wapiUpdateWindow ( ( HWND ) childId ); - oldContainerSize=embedContainer->size(); - oldChildPos= mapToGlobal ( - QPoint ( 0,0 ) ); - - x2goDebug<<"Updating embedded window."; - - } -} - -#endif - - - -void ONMainWindow::embedWindow ( long wndId ) -{ - childId=wndId; - embedContainer->show(); -#ifdef Q_OS_LINUX - - x2goDebug<<"Embedding window with ID "<<wndId<<" in container."; - - embedContainer->embedClient ( wndId ); -#endif -#ifdef Q_OS_WIN - wapiSetParent ( ( HWND ) childId, - ( HWND ) ( embedContainer->winId() ) ); - oldContainerSize=embedContainer->size(); - oldChildPos= ( mapToGlobal ( QPoint ( 0,0 ) )); - winFlags=wapiSetFSWindow ( ( HWND ) childId, - embedContainer->geometry() ); - updateTimer->start ( 500 ); - -#endif -} - - -void ONMainWindow::detachClient() -{ - if ( !childId ) - return; -#ifdef Q_OS_LINUX - if ( embedContainer ) - { - embedContainer->discardClient(); - } -#endif -#ifdef Q_OS_WIN - wapiSetParent ( ( HWND ) childId, ( HWND ) 0 ); - slotDetachProxyWindow(); - updateTimer->stop(); - if ( childId ) - { - wapiRestoreWindow ( ( HWND ) childId, winFlags, - embedContainer->geometry() ); - wapiMoveWindow ( ( HWND ) childId,0,0, - oldContainerSize.width(), - oldContainerSize.height(),true ); - - } -#endif - childId=0; -} - -#endif //(Q_OS_DARWIN) - - - - - -QTNPFACTORY_BEGIN ( "X2Go Client Plug-in "VERSION, - "Allows you to start X2Go sessions in a web browser." ) -QTNPCLASS ( ONMainWindow ) -QTNPFACTORY_END() - -#ifdef QAXSERVER -#include <ActiveQt/QAxFactory> -QAXFACTORY_BEGIN ( "{aa3216bf-7e20-482c-84c6-06167bacb616}", "{08538ca5-eb7a-4f24-a3c4-a120c6e04dc4}" ) -QAXCLASS ( ONMainWindow ) -QAXFACTORY_END() -#endif -#endif diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 816dbd8..7272e66 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -18,18 +18,6 @@ #ifndef ONMAINWINDOW_H #define ONMAINWINDOW_H -#ifdef CFGPLUGIN -#include <QMetaClassInfo> -#include <qtbrowserplugin.h> - -#ifdef QAXSERVER -#include <ActiveQt/QAxBindable> -#include <ActiveQt/QAxFactory> -#include <qt_windows.h> -#endif - -#endif - #include "x2goclientconfig.h" //#include "CallbackInterface.h" #include <QMainWindow> @@ -65,9 +53,6 @@ @author Oleksandr Shneyder */ -#if defined(CFGPLUGIN) && defined(Q_OS_LINUX) -class QX11EmbedContainer; -#endif class QToolButton; class QTemporaryFile; class QLineEdit; @@ -266,27 +251,9 @@ Q_SIGNALS: class ClickLineEdit; class ONMainWindow : public QMainWindow -#ifdef CFGPLUGIN - , public QtNPBindable - -#ifdef QAXSERVER - , public QAxBindable -#endif -#endif { friend class HttpBrokerClient; friend class SessionButton; -#ifdef CFGPLUGIN - Q_PROPERTY ( QString x2goconfig READ x2goconfig WRITE setX2goconfig ) - Q_CLASSINFO ( "ClassID", "{5a20006d-118f-4185-9653-9f98958a0008}" ) - Q_CLASSINFO ( "InterfaceID", "{2df000ba-da4f-4fb7-8f35-b8dfbf80009a}" ) - Q_CLASSINFO ( "EventsID", "{44900013-f8bd-4d2e-a2cf-eab407c03005}" ) - Q_CLASSINFO ( "MIME", - "application/x2go:x2go:Configuration File " - "for X2Go Sessions" ) - Q_CLASSINFO ( "ToSuperClass", "ONMainWindow" ) - Q_CLASSINFO ( "DefaultProperty","x2goconfig" ) -#endif Q_OBJECT public: enum @@ -1228,50 +1195,6 @@ private: std::size_t default_size_for_key_type (key_types key_type); QString generateKey (key_types key_type, bool host_key = false); QString createKeyBundle (key_types key_type = RSA_KEY_TYPE); - -////////////////plugin stuff//////////////////// -#ifdef CFGPLUGIN -public slots: - void setX2goconfig ( const QString& text ); -public: - QString x2goconfig() const - { - return m_x2goconfig; - } - -#ifndef Q_OS_DARWIN -public: - void embedWindow ( long wndId ); - void detachClient(); -private: - long parentId; - long childId; - QSize oldParentSize; - -#ifdef Q_OS_LINUX - QX11EmbedContainer* embedContainer; -#endif -#ifdef Q_OS_WIN - QWidget* embedContainer; - QPoint oldParentPos; - QPoint oldChildPos; - QSize oldContainerSize; - QTimer *updateTimer; - int gcor; - long winFlags; -#endif -private: - QSize getWindowSize ( long winId ); - void doPluginInit(); - -#ifdef Q_OS_WIN -private slots: - void slotUpdateEmbedWindow(); -#endif - -#endif //(Q_OS_DARWIN) -#endif -////////////////end of plugin stuff//////////////////// }; #ifdef Q_OS_WIN diff --git a/src/onmainwindow_privat.h b/src/onmainwindow_privat.h index d272f71..0575c00 100644 --- a/src/onmainwindow_privat.h +++ b/src/onmainwindow_privat.h @@ -160,12 +160,5 @@ #include <X11/Xutil.h> #endif -#ifdef CFGPLUGIN -#ifdef Q_OS_LINUX -#include <dlfcn.h> -#include <QX11EmbedContainer> -#endif -#endif - #endif //ONMAINWINDOWPRIVAT_H -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git