Francois Andriot
12 years ago
parent
1d22e6dd61
commit
28ef328815
@ -0,0 +1,18 @@
|
||||
commit f752bcbf6585c61f414963ad83e1300a1da08504
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1333232616 -0500
|
||||
|
||||
Fix "Malformed URL $( kxdglauncher --getpath xdgname DOCUMENTS )" error dialog.
|
||||
|
||||
diff --git a/kioslave/system/entries/documents.desktop b/kioslave/system/entries/documents.desktop
|
||||
index e5fc3d1..d65cc3d 100644
|
||||
--- a/kioslave/system/entries/documents.desktop
|
||||
+++ b/kioslave/system/entries/documents.desktop
|
||||
@@ -1,6 +1,6 @@
|
||||
[Desktop Entry]
|
||||
Type=Link
|
||||
-Path=$( kxdglauncher --getpath --xdgname DOCUMENTS )
|
||||
+URL=$( kxdglauncher --getpath --xdgname DOCUMENTS )
|
||||
Icon=folder_man
|
||||
Name=Documents Folder
|
||||
Name[af]=Dokument Gids
|
||||
@ -0,0 +1,57 @@
|
||||
commit e72f4926c094b2bd94501518fbcd2a3e66a74f6a
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1335166907 -0500
|
||||
|
||||
Fix sftp failure on newer systems
|
||||
This closes Bug 897
|
||||
|
||||
diff --git a/kioslave/sftp/ksshprocess.cpp b/kioslave/sftp/ksshprocess.cpp
|
||||
index 2ccab59..3393f89 100644
|
||||
--- a/kioslave/sftp/ksshprocess.cpp
|
||||
+++ b/kioslave/sftp/ksshprocess.cpp
|
||||
@@ -569,7 +569,9 @@ TQString KSshProcess::getLine() {
|
||||
// If we still don't have anything in our buffer so there must
|
||||
// not be anything on the pty or stderr. Setup a select()
|
||||
// to wait for some data from SSH.
|
||||
- if( buffer.empty() ) {
|
||||
+ // Hack around select() failure on newer systems
|
||||
+ unsigned long milliseconds = 0;
|
||||
+ while ((buffer.size() == 0) && (milliseconds < (60*1000))) {
|
||||
//kdDebug(KSSHPROC) << "KSshProcess::getLine(): " <<
|
||||
// "Line buffer empty, calling select() to wait for data." << endl;
|
||||
int errfd = ssh.stderrFd();
|
||||
@@ -616,14 +618,18 @@ TQString KSshProcess::getLine() {
|
||||
// had data on it first.
|
||||
if( FD_ISSET(ptyfd, &rfds) ) {
|
||||
ptyLine = ssh.readLineFromPty(false);
|
||||
- buffer.prepend(TQString(ptyLine));
|
||||
+ if (ptyLine.size() > 0) {
|
||||
+ buffer.prepend(TQString(ptyLine));
|
||||
+ }
|
||||
//kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
|
||||
// "line from pty -" << ptyLine << endl;
|
||||
}
|
||||
-
|
||||
+
|
||||
if( FD_ISSET(errfd, &rfds) ) {
|
||||
errLine = ssh.readLineFromStderr(false);
|
||||
- buffer.prepend(TQString(errLine));
|
||||
+ if (errLine.size() > 0) {
|
||||
+ buffer.prepend(TQString(errLine));
|
||||
+ }
|
||||
//kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
|
||||
// "line from err -" << errLine << endl;
|
||||
}
|
||||
@@ -637,7 +643,11 @@ TQString KSshProcess::getLine() {
|
||||
kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
|
||||
"Exception on std err file descriptor." << endl;
|
||||
}
|
||||
-
|
||||
+
|
||||
+ if (buffer.size() == 0) {
|
||||
+ milliseconds++;
|
||||
+ usleep(1000);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
commit bd9c1479d7a965959147398d71f18be62b2aa8b6
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1333232418 -0500
|
||||
|
||||
Ensure pagersettings.kcfg is installed.
|
||||
|
||||
diff --git a/kicker/applets/minipager/CMakeLists.txt b/kicker/applets/minipager/CMakeLists.txt
|
||||
index b9ca9c7..a90269c 100644
|
||||
--- a/kicker/applets/minipager/CMakeLists.txt
|
||||
+++ b/kicker/applets/minipager/CMakeLists.txt
|
||||
@@ -27,7 +27,7 @@ link_directories(
|
||||
##### other data ################################
|
||||
|
||||
install( FILES minipagerapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
|
||||
-
|
||||
+install( FILES pagersettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
|
||||
|
||||
##### minipager_panelapplet (module) ############
|
||||
|
||||
Loading…
Reference in new issue