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 | |||
@@ -114,29 +114,37 @@ Wellenreiter::Wellenreiter( QWidget* parent ) | |||
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." ); |