author | mickeyl <mickeyl> | 2003-03-02 16:38:17 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-03-02 16:38:17 (UTC) |
commit | d0e64d0c7961de1c3ecb886ae76c6701f268d767 (patch) (unidiff) | |
tree | 2ea00b7cd496bb0720b9730bbf993f2013a87d3e /noncore/net/wellenreiter/gui/wellenreiter.cpp | |
parent | a0ae7d2b8cfef3f643c4aa536bdf25d7da510142 (diff) | |
download | opie-d0e64d0c7961de1c3ecb886ae76c6701f268d767.zip opie-d0e64d0c7961de1c3ecb886ae76c6701f268d767.tar.gz opie-d0e64d0c7961de1c3ecb886ae76c6701f268d767.tar.bz2 |
first attempt to add session persistence
Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 1ccf971..dd8a365 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -102,53 +102,61 @@ Wellenreiter::Wellenreiter( QWidget* parent ) | |||
102 | logwindow->log( "(E) Couldn't get file descriptor for commsocket." ); | 102 | logwindow->log( "(E) Couldn't get file descriptor for commsocket." ); |
103 | } | 103 | } |
104 | else | 104 | else |
105 | { | 105 | { |
106 | int flags; | 106 | int flags; |
107 | flags = fcntl( daemon_fd, F_GETFL, 0 ); | 107 | flags = fcntl( daemon_fd, F_GETFL, 0 ); |
108 | fcntl( daemon_fd, F_SETFL, flags | O_NONBLOCK ); | 108 | fcntl( daemon_fd, F_SETFL, flags | O_NONBLOCK ); |
109 | QSocketNotifier *sn = new QSocketNotifier( daemon_fd, QSocketNotifier::Read, parent ); | 109 | QSocketNotifier *sn = new QSocketNotifier( daemon_fd, QSocketNotifier::Read, parent ); |
110 | connect( sn, SIGNAL( activated( int ) ), this, SLOT( dataReceived() ) ); | 110 | connect( sn, SIGNAL( activated( int ) ), this, SLOT( dataReceived() ) ); |
111 | } | 111 | } |
112 | 112 | ||
113 | // setup GUI | 113 | // setup GUI |
114 | netview->setColumnWidthMode( 1, QListView::Manual ); | 114 | netview->setColumnWidthMode( 1, QListView::Manual ); |
115 | 115 | ||
116 | if ( manufacturerdb ) | 116 | if ( manufacturerdb ) |
117 | netview->setManufacturerDB( manufacturerdb ); | 117 | netview->setManufacturerDB( manufacturerdb ); |
118 | 118 | ||
119 | } | 119 | } |
120 | 120 | ||
121 | Wellenreiter::~Wellenreiter() | 121 | Wellenreiter::~Wellenreiter() |
122 | { | 122 | { |
123 | // no need to delete child widgets, Qt does it all for us | 123 | // no need to delete child widgets, Qt does it all for us |
124 | 124 | ||
125 | delete manufacturerdb; | 125 | delete manufacturerdb; |
126 | |||
127 | // X11-only - Hmm... Closing the socket here segfaults on exit, | ||
128 | // Maybe because the notifier still has a handle to it!? Seems not to | ||
129 | // occur on Qt/Embedded | ||
130 | |||
131 | #ifdef QWS | ||
126 | if ( daemon_fd != -1 ) | 132 | if ( daemon_fd != -1 ) |
127 | { | 133 | { |
128 | qDebug( "closing comm socket" ); | 134 | qDebug( "closing comm socket" ); |
129 | close( daemon_fd ); | 135 | close( daemon_fd ); |
130 | } | 136 | } |
137 | #endif | ||
138 | |||
131 | } | 139 | } |
132 | 140 | ||
133 | void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw ) | 141 | void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw ) |
134 | { | 142 | { |
135 | configwindow = cw; | 143 | configwindow = cw; |
136 | } | 144 | } |
137 | 145 | ||
138 | void Wellenreiter::handleMessage() | 146 | void Wellenreiter::handleMessage() |
139 | { | 147 | { |
140 | // FIXME: receive message and handle it | 148 | // FIXME: receive message and handle it |
141 | 149 | ||
142 | qDebug( "received message from daemon." ); | 150 | qDebug( "received message from daemon." ); |
143 | 151 | ||
144 | /*char buffer[10000]; | 152 | /*char buffer[10000]; |
145 | memset( &buffer, 0, sizeof( buffer ) );*/ | 153 | memset( &buffer, 0, sizeof( buffer ) );*/ |
146 | 154 | ||
147 | char buffer[WL_SOCKBUF]; | 155 | char buffer[WL_SOCKBUF]; |
148 | 156 | ||
149 | // int result = #wl_recv( &daemon_fd, (char*) &buffer, sizeof(buffer) ); | 157 | // int result = #wl_recv( &daemon_fd, (char*) &buffer, sizeof(buffer) ); |
150 | 158 | ||
151 | /* | 159 | /* |
152 | 160 | ||
153 | struct sockaddr from; | 161 | struct sockaddr from; |
154 | socklen_t len; | 162 | socklen_t len; |