|
|
|
@ -104,9 +104,6 @@
|
|
|
|
|
// #define myDebug(x) cout << __LINE__ << ": " x
|
|
|
|
|
#define infoMessage(x) printf("INFO: %s\n\r", x);
|
|
|
|
|
|
|
|
|
|
static char *rsyncPath = NULL;
|
|
|
|
|
static char *suPath = NULL;
|
|
|
|
|
|
|
|
|
|
static int open_pty_pair(int fd[2])
|
|
|
|
|
{
|
|
|
|
|
#if defined(HAVE_TERMIOS_H) && defined(HAVE_GRANTPT) && !defined(HAVE_OPENPTY)
|
|
|
|
@ -339,9 +336,7 @@ bool RsyncPlugin::syncBidirectional(QString synccommand, QString syncflags, int
|
|
|
|
|
if (childPid == 0) {
|
|
|
|
|
// Create the rsync command to run
|
|
|
|
|
QString execstring;
|
|
|
|
|
// FIXME
|
|
|
|
|
execstring = synccommand + syncflags + localfolder + QString(" ") + remotepath;
|
|
|
|
|
printf("Will execute %s\n\r", execstring.ascii());
|
|
|
|
|
|
|
|
|
|
// taken from konsole, see TEPty.C for details
|
|
|
|
|
// note: if we're running on socket pairs,
|
|
|
|
@ -849,43 +844,22 @@ RsyncPlugin::RsyncPlugin (QObject* parent, const char* name,
|
|
|
|
|
actionCollection(), "syncnow");
|
|
|
|
|
m_pSyncSetup = new KAction (i18n("Setup Syn&chronization"), "setupsync",
|
|
|
|
|
actionCollection(), "setupsync");
|
|
|
|
|
//m_pSyncMenu = new KActionMenu (i18n("Remote Folder S&ynchronization"), "syncmenu",
|
|
|
|
|
// actionCollection(), "rsync");
|
|
|
|
|
m_pSyncNow->setIcon("remotesync");
|
|
|
|
|
m_pSyncSetup->setIcon("remotesyncconfig");
|
|
|
|
|
m_pSyncNow->setEnabled (false);
|
|
|
|
|
//m_pSyncMenu->setDelayed (false);
|
|
|
|
|
//m_pSyncMenu->setWhatsThis(i18n("Synchronizes this folder with a remote server."));
|
|
|
|
|
|
|
|
|
|
//connect (m_pSyncMenu->popupMenu(), SIGNAL (aboutToShow()),
|
|
|
|
|
// SLOT (slotShowPopup()));
|
|
|
|
|
|
|
|
|
|
connect (m_part, SIGNAL(aboutToOpenURL()), SLOT(slotOpenURL()));
|
|
|
|
|
|
|
|
|
|
// // add a menu option for konqis icons/list views
|
|
|
|
|
// KAction *syncnow = new KAction(i18n("Synchronize folder contents with server"),
|
|
|
|
|
// QApplication::reverseLayout() ? "remotesync" : "remotesync",
|
|
|
|
|
// 0, 0, 0, actionCollection(), "syncnow");
|
|
|
|
|
//
|
|
|
|
|
// syncnow->setWhatsThis(i18n("Synchronize Folder<p>Synchronizes folder contents with remote server."));
|
|
|
|
|
//
|
|
|
|
|
connect(m_pSyncNow, SIGNAL(activated()), this, SLOT(slotSync()));
|
|
|
|
|
connect(m_pSyncSetup, SIGNAL(activated()), this, SLOT(slotSetup()));
|
|
|
|
|
|
|
|
|
|
loadSettings();
|
|
|
|
|
|
|
|
|
|
// Initialize the rsync backend variables
|
|
|
|
|
if (rsyncPath == NULL) {
|
|
|
|
|
rsyncPath = strdup(QFile::encodeName(KStandardDirs::findExe("rsync")));
|
|
|
|
|
}
|
|
|
|
|
if (suPath == NULL) {
|
|
|
|
|
suPath = strdup(QFile::encodeName(KStandardDirs::findExe("su")));
|
|
|
|
|
}
|
|
|
|
|
childPid = 0;
|
|
|
|
|
isLoggedIn = false;
|
|
|
|
|
firstLogin = true;
|
|
|
|
|
connectionAuth.keepPassword = true;
|
|
|
|
|
//connectionAuth.url.setProtocol("fish");
|
|
|
|
|
outBufPos = -1;
|
|
|
|
|
outBuf = NULL;
|
|
|
|
|
outBufLen = 0;
|
|
|
|
|