Output of print() is stdout

hluk · Dec 26, 2012 · 371be1e · 371be1e
1 parent 2efa79e
commit 371be1e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/src/clipboardclient.cpp b/src/clipboardclient.cpp
@@ -74,7 +74,7 @@ void ClipboardClient::readyRead()
             }
         }
 
-        if (exitCode != CommandPrint && exitCode != CommandActivateWindow)
+        if (exitCode != CommandActivateWindow)
             exit(exitCode);
     }
 }

diff --git a/src/include/client_server.h b/src/include/client_server.h
@@ -45,8 +45,6 @@ typedef enum {
     CommandError,
     /** Bad command syntax. */
     CommandBadSyntax,
-    /** Print */
-    CommandPrint,
     /** Activate window */
     CommandActivateWindow
 } CommandStatus;

diff --git a/src/scriptable.cpp b/src/scriptable.cpp
@@ -862,7 +862,7 @@ void Scriptable::print(const QScriptValue &value)
         bytes = value.toString().toLocal8Bit();
         message = &bytes;
     }
-    sendMessage(*message, CommandPrint);
+    sendMessage(*message, CommandSuccess);
 }
 
 void Scriptable::abort()

diff --git a/tests/test.sh b/tests/test.sh
@@ -312,7 +312,7 @@ run importtab "$tmp" &&
     ok || fail
 
 log "checking imported tab content"
-    assert "run eval 'for (i = 0; i < 1000; ++i) {tab(\"test2\");a=read(i);tab(\"test3\");b=read(i);if(str(a)!=str(b))break;};i'" 1000 &&
+    assert "run eval 'for (i = 0; i < 1000; ++i) {tab(\"test2\");a=read(i);tab(\"test3\");b=read(i);if(str(a)!=str(b))break;}; print(i)'" 1000 &&
         ok || fail
 
 TAB=test2