missing commits

3 files changed, 7 insertions, 4 deletions

diff --git a/noncore/apps/opie-console/filetransfer.h b/noncore/apps/opie-console/filetransfer.h
index 0829f16..9cc1e8d 100644
--- a/noncore/apps/opie-console/filetransfer.h
+++ b/noncore/apps/opie-console/filetransfer.h
@@ -33,2 +33,3 @@ private slots:
     void slotProgress( const QStringList& );
+    void slotExec();
 private:
@@ -40,3 +41,3 @@ private:
      */
-    static pid_t m_pid;
+    pid_t m_pid;
     int m_fd;
@@ -45,2 +46,3 @@ private:
     int m_comm[2];
+    int m_term[2];
     QString m_file;
@@ -48,4 +50,3 @@ private:
     QSocketNotifier *m_not;
-    static void signal_handler(int);
-    static bool terminate;
+    QSocketNotifier* m_proc;
 };
diff --git a/noncore/apps/opie-console/procctl.cpp b/noncore/apps/opie-console/procctl.cpp
index ff6bea8..b0b6846 100644
--- a/noncore/apps/opie-console/procctl.cpp
+++ b/noncore/apps/opie-console/procctl.cpp
@@ -73,2 +73,3 @@ int ProcCtl::status(pid_t pid )const{
 void ProcCtl::signal_handler(int) {
+    qWarning("signal handler");
     int status;
diff --git a/noncore/apps/opie-console/procctl.h b/noncore/apps/opie-console/procctl.h
index 5e96423..1da7c6d 100644
--- a/noncore/apps/opie-console/procctl.h
+++ b/noncore/apps/opie-console/procctl.h
@@ -24,3 +24,3 @@ public:
 
-    ProcCtl* self();
+    static ProcCtl* self();
     int status(pid_t)const;
@@ -33,2 +33,3 @@ private:
     static ProcCtl* m_self;
+
 };