Merge from BRANCH_1_0

1 files changed, 11 insertions, 0 deletions

diff --git a/noncore/settings/networksettings/ppp/modem.h b/noncore/settings/networksettings/ppp/modem.h
index 103cbeb..8ecc354 100644
--- a/noncore/settings/networksettings/ppp/modem.h
+++ b/noncore/settings/networksettings/ppp/modem.h
@@ -51,2 +51,4 @@ public:
 
+  void save();
+
   bool opentty();
@@ -76,2 +78,7 @@ public:
   
+  QString pppDevice()const;
+    void setPPPDevice( const QString& );
+    pid_t pppPID()const;
+    void setPPPDPid( pid_t );
+
 public:
@@ -88,2 +95,3 @@ private slots:
   void readtty(int);  
+  void slotModemDebug(int);
 
@@ -109,2 +117,3 @@ private:
   QSocketNotifier *sn;
+    QSocketNotifier *m_modemDebug;
   bool data_mode;
@@ -115,2 +124,4 @@ private:
   PPPData *_pppdata;
+    int m_pppdLOG[2];
+    QString m_pppdDev;
 };