Some more changes for NS2

updated toplevel Makefile

added new target  packages-mt and packages

these replaces, render obsolete and dramatically improve : ipks ipks-mt
see separate mail

8 files changed, 352 insertions, 129 deletions

diff --git a/Makefile b/Makefile
index a1fc32c..89c3470 100644
--- a/Makefile
+++ b/Makefile
@@ -105,32 +105,46 @@ qtmessages:
 	sed -e "s,#define,," xml/qxml.cpp > qxml_clean.cpp ;\
 	find . -name "*.cpp" | grep -v moc_ > list ;\
 	for file in qfiledialog qcolordialog qprintdialog \
 		qurloperator qftp qhttp qlocal qerrormessage; do \
 		grep -v $$file list > list.new && mv list.new list ;\
 	done ;\
 	xgettext -C -ktr -kQT_TRANSLATE_NOOP -n `cat list` -o $(OPIEDIR)/qt-messages.pot 
 
 ifndef CONFIG_TARGET_OE
 $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \
 	$(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \
 	$(TOPDIR)/library/custom.h
 else
 $(subdir-y) : $(if $(CONFIG_LIBQPE),$(OPIEDIR)/stamp-headers) $(TOPDIR)/library/custom.h
 endif
 
 clean : $(TOPDIR)/.config
 	make -C bin clean
 	make -C lib clean
 	make -C plugins clean
 
 apidox : 
 	doc/generate_apidox 
 
 mrproper : clean-configs
 	find . -name ".moc"|xargs rm -rf
 	find . -name ".obj"|xargs rm -rf
 	find lib -name "lib*.*"|xargs rm -f
 	find plugins -name "lib*.*"|xargs rm -f
 	find . -name "*.pro"|xargs touch
 
 include $(TOPDIR)/Rules.make
+
+# to speed up (avoid include/generation of packaging rules)
+ifneq ($(filter package%,$(MAKECMDGOALS)),)
+
+# packaging requested
+
+$(TOPDIR)/Package.make :
+	@echo "Generating packaging rules"
+	@$(TOPDIR)/scripts/GeneratePackageMake > $(TOPDIR)/Package.make
+
+# load rules to make packages
+-include $(TOPDIR)/Package.make
+
+endif
diff --git a/development/performance/opie-performance.control b/development/performance/opie-performance.control
index 194b378..21c3433 100644
--- a/development/performance/opie-performance.control
+++ b/development/performance/opie-performance.control
@@ -1,10 +1,11 @@
+Package: opie-performance
 Files: plugins/applications/libperformance.so* bin/performance apps/Applications/performance.desktop
 Priority: optional
 Section: opie/other
 Maintainer: Trolltech (www.trolltech.com)
 Architecture: $CPU_ARCH
 Arch: $DEVICE_ARCH
 Version: $QPE_VERSION$EXTRAVERSION
 Depends: opie-taskbar
 Description: Graphics performance tester
  Graphics performance tester for Qtopia.
diff --git a/noncore/multimedia/powerchord/opie-powerchord.control b/noncore/multimedia/powerchord/opie-powerchord.control
index 4b5bc88..490e8a2 100644
--- a/noncore/multimedia/powerchord/opie-powerchord.control
+++ b/noncore/multimedia/powerchord/opie-powerchord.control
@@ -1,10 +1,11 @@
+Package: opie-powercord
 Files: plugins/applications/libpowerchord.so* bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord
 Priority: optional
 Section: opie/multimedia
 Maintainer: Camilo Mesias <camilo@mesias.co.uk>, ljp <lpotter@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal
 Description: Guitar Chord generator application
  Allows naming of chords using base note and key. Fretboard diagrams are
  produced illustrating ways to play the chord.
diff --git a/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui b/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui
index d9038ae..5bce0e1 100644
--- a/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui
+++ b/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui
@@ -1,89 +1,68 @@
 <!DOCTYPE UI><UI>
 <class>OTMainGUI</class>
 <widget>
     <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
         <cstring>OTMainGUI</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>257</width>
-            <height>296</height>
+            <width>225</width>
+            <height>334</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Bluetooth Manager</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>3</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>0</number>
         </property>
-        <spacer>
-            <property>
-                <name>name</name>
-                <cstring>Spacer20</cstring>
-            </property>
-            <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
-            </property>
-            <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
-            </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
         <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Layout7</cstring>
             </property>
             <hbox>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
                 </property>
                 <property stdset="1">
                     <name>spacing</name>
                     <number>6</number>
                 </property>
                 <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>ManageLocalHW_But</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
                         <string>Local Bluetooth hardware</string>
                     </property>
                 </widget>
                 <spacer>
                     <property>
                         <name>name</name>
                         <cstring>Spacer9_2</cstring>
                     </property>
                     <property stdset="1">
@@ -147,65 +126,65 @@
                     </property>
                     <property stdset="1">
                         <name>orientation</name>
                         <enum>Horizontal</enum>
                     </property>
                     <property stdset="1">
                         <name>sizeType</name>
                         <enum>Fixed</enum>
                     </property>
                     <property>
                         <name>sizeHint</name>
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
                 <widget>
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>TextLabel1</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <sizepolicy>
                             <hsizetype>7</hsizetype>
                             <vsizetype>1</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Select to manage your local Bluetooth hardware</string>
+                        <string>Manage your local Bluetooth hardware</string>
                     </property>
                     <property stdset="1">
                         <name>alignment</name>
                         <set>WordBreak|AlignVCenter|AlignLeft</set>
                     </property>
                     <property>
                         <name>wordwrap</name>
                     </property>
                 </widget>
             </hbox>
         </widget>
         <spacer>
             <property>
                 <name>name</name>
                 <cstring>Spacer20_2</cstring>
             </property>
             <property stdset="1">
                 <name>orientation</name>
                 <enum>Vertical</enum>
             </property>
             <property stdset="1">
                 <name>sizeType</name>
                 <enum>Expanding</enum>
             </property>
             <property>
                 <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
@@ -254,190 +233,211 @@
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
             </hbox>
         </widget>
         <spacer>
             <property>
                 <name>name</name>
                 <cstring>Spacer20_4</cstring>
             </property>
             <property stdset="1">
                 <name>orientation</name>
                 <enum>Vertical</enum>
             </property>
             <property stdset="1">
                 <name>sizeType</name>
                 <enum>Expanding</enum>
             </property>
             <property>
                 <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
         <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout10</cstring>
+                <cstring>Layout13</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer7_2_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Fixed</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel5</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>1</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Use device :</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QComboBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>DeviceList_CB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                </widget>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer16</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Expanding</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout15</cstring>
             </property>
             <hbox>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
                 </property>
                 <property stdset="1">
                     <name>spacing</name>
                     <number>6</number>
                 </property>
                 <spacer>
                     <property>
                         <name>name</name>
                         <cstring>Spacer7_2</cstring>
                     </property>
                     <property stdset="1">
                         <name>orientation</name>
                         <enum>Horizontal</enum>
                     </property>
                     <property stdset="1">
                         <name>sizeType</name>
                         <enum>Fixed</enum>
                     </property>
                     <property>
                         <name>sizeHint</name>
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
                 <widget>
-                    <class>QLayoutWidget</class>
+                    <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout9</cstring>
-                    </property>
-                    <grid>
-                        <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
-                        </property>
-                        <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
-                        </property>
-                        <widget row="0"  column="1" >
-                            <class>QComboBox</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>DeviceList_CB</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>sizePolicy</name>
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <spacer row="0"  column="2" >
-                            <property>
-                                <name>name</name>
-                                <cstring>Spacer16</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>orientation</name>
-                                <enum>Horizontal</enum>
-                            </property>
-                            <property stdset="1">
-                                <name>sizeType</name>
-                                <enum>Expanding</enum>
-                            </property>
-                            <property>
-                                <name>sizeHint</name>
-                                <size>
-                                    <width>20</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget row="1"  column="0"  rowspan="1"  colspan="3" >
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>TextLabel1_2</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>sizePolicy</name>
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>1</vsizetype>
-                                </sizepolicy>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>Select to scan the bluetooth network for reachable devices using the selected local device</string>
-                            </property>
-                            <property stdset="1">
-                                <name>alignment</name>
-                                <set>WordBreak|AlignVCenter|AlignLeft</set>
-                            </property>
-                            <property>
-                                <name>wordwrap</name>
-                            </property>
-                        </widget>
-                        <widget row="0"  column="0" >
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>TextLabel5</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>sizePolicy</name>
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>1</vsizetype>
-                                </sizepolicy>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>Use device :</string>
-                            </property>
-                        </widget>
-                    </grid>
+                        <cstring>TextLabel1_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>5</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>San the bluetooth network neighbourhood using the selected local device</string>
+                    </property>
+                    <property stdset="1">
+                        <name>alignment</name>
+                        <set>WordBreak|AlignVCenter|AlignLeft</set>
+                    </property>
+                    <property>
+                        <name>wordwrap</name>
+                    </property>
                 </widget>
             </hbox>
         </widget>
         <spacer>
             <property>
                 <name>name</name>
                 <cstring>Spacer20_2_2</cstring>
             </property>
             <property stdset="1">
                 <name>orientation</name>
                 <enum>Vertical</enum>
             </property>
             <property stdset="1">
                 <name>sizeType</name>
                 <enum>Expanding</enum>
             </property>
             <property>
                 <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
         <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Layout9</cstring>
             </property>
             <hbox>
                 <property stdset="1">
@@ -525,144 +525,287 @@
                     </property>
                     <property stdset="1">
                         <name>orientation</name>
                         <enum>Horizontal</enum>
                     </property>
                     <property stdset="1">
                         <name>sizeType</name>
                         <enum>Fixed</enum>
                     </property>
                     <property>
                         <name>sizeHint</name>
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
                 <widget>
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>TextLabel1_2_2</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <sizepolicy>
                             <hsizetype>7</hsizetype>
                             <vsizetype>1</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Select to manage all pairings known on the local device to any remote device regardless if it is currently reachable or not</string>
+                        <string>Manage device pairings to or from the local device</string>
                     </property>
                     <property stdset="1">
                         <name>alignment</name>
                         <set>WordBreak|AlignVCenter|AlignLeft</set>
                     </property>
                     <property>
                         <name>wordwrap</name>
                     </property>
                 </widget>
             </hbox>
         </widget>
         <spacer>
             <property>
                 <name>name</name>
                 <cstring>Spacer20_2_2_2</cstring>
             </property>
             <property stdset="1">
                 <name>orientation</name>
                 <enum>Vertical</enum>
             </property>
             <property stdset="1">
                 <name>sizeType</name>
                 <enum>Expanding</enum>
             </property>
             <property>
                 <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
         <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout2</cstring>
+                <cstring>Layout9_2</cstring>
             </property>
             <hbox>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
                 </property>
                 <property stdset="1">
                     <name>spacing</name>
                     <number>6</number>
                 </property>
                 <widget>
-                    <class>QCheckBox</class>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>BTSniffing_But</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Sniffing</string>
+                    </property>
+                </widget>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer9_3_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Expanding</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout6_2</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer7_3_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Fixed</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget>
+                    <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>EnableTracing_CB</cstring>
+                        <cstring>TextLabel1_2_2_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>1</vsizetype>
+                        </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Trace Bluetooth</string>
+                        <string>Sniff the bluetooth network</string>
+                    </property>
+                    <property stdset="1">
+                        <name>alignment</name>
+                        <set>WordBreak|AlignVCenter|AlignLeft</set>
+                    </property>
+                    <property>
+                        <name>wordwrap</name>
                     </property>
                 </widget>
+            </hbox>
+        </widget>
+        <spacer>
+            <property>
+                <name>name</name>
+                <cstring>Spacer20_2_2_2_3</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Vertical</enum>
+            </property>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout11</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer21</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Expanding</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
                 <widget>
                     <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>MustBeEnabled_CB</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
                         <string>Bluetooth Enabled</string>
                     </property>
                 </widget>
             </hbox>
         </widget>
     </vbox>
 </widget>
 <connections>
     <connection>
         <sender>ManageLocalHW_But</sender>
         <signal>clicked()</signal>
         <receiver>OTMainGUI</receiver>
         <slot>SLOT_Manage()</slot>
     </connection>
     <connection>
         <sender>Scan_But</sender>
         <signal>clicked()</signal>
         <receiver>OTMainGUI</receiver>
         <slot>SLOT_Scan()</slot>
     </connection>
     <connection>
         <sender>MustBeEnabled_CB</sender>
         <signal>toggled(bool)</signal>
         <receiver>OTMainGUI</receiver>
         <slot>SLOT_EnableBluetooth(bool)</slot>
     </connection>
     <connection>
         <sender>Pairing_But</sender>
         <signal>clicked()</signal>
         <receiver>OTMainGUI</receiver>
         <slot>SLOT_Pairing()</slot>
     </connection>
     <connection>
-        <sender>EnableTracing_CB</sender>
-        <signal>toggled(bool)</signal>
+        <sender>BTSniffing_But</sender>
+        <signal>clicked()</signal>
         <receiver>OTMainGUI</receiver>
-        <slot>SLOT_EnableTracing( bool )</slot>
+        <slot>SLOT_Sniffing()</slot>
     </connection>
     <slot access="public">SLOT_EnableBluetooth(bool)</slot>
+    <slot access="public">SLOT_Sniffing()</slot>
     <slot access="public">SLOT_Manage()</slot>
     <slot access="public">SLOT_Pairing()</slot>
     <slot access="public">SLOT_Scan()</slot>
-    <slot access="public">SLOT_EnableTracing( bool )</slot>
 </connections>
 </UI>
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
index 8ea3a48..2d4885c 100644
--- a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
+++ b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
@@ -81,64 +81,85 @@ public :
         { return Driver; }
 
 private :
 
       OTDriver * Driver;
 };
 
 class LinkKeyLVI : public QListViewItem {
 
 public :
 
       LinkKeyLVI( int Ch, QListView * it ) : QListViewItem (it) {
         LinkKey = Ch;
       }
       ~LinkKeyLVI( void ) {
       }
 
       inline int index( void )
         { return LinkKey; }
 
 private :
 
       int LinkKey;
 };
 };
 
 //
 //
 //
 //
 //
 
+OTSniffing::OTSniffing( QWidget * parent ) : OTSniffGUI( parent ) {
+
+      OT = OTGateway::getOTGateway();
+
+}
+
+OTSniffing::~OTSniffing() {
+}
+
+void OTSniffing::SLOT_Trace( void ) {
+}
+
+void OTSniffing::SLOT_ClearLog( void ) {
+}
+
+//
+//
+//
+//
+//
+
 OTPairing::OTPairing( QWidget * parent, OTIcons * _IC ) :
                 OTPairingGUI( parent ) {
 
       OT = OTGateway::getOTGateway();
       Icons = (_IC ) ? _IC : new OTIcons();
       MyIcons = (_IC == 0 );
 
       // unpairing can only be done if bluetooth is disabled
       Unpair_But->setEnabled( ! OT->isEnabled() );
       if( ! OT->isEnabled() ) {
         Unpair_LBL->hide();
       } else {
         Unpair_LBL->show();
       }
 
       // open linkkey file and load pairs
       LinkKeyArray Keys = OT->getLinkKeys();
       LinkKeyLVI * it;
       OTPeer * P;
       OTDriver * D;
 
       for( unsigned int i = 0 ;
            i < Keys.count();
            i ++ ) {
 
         it = new LinkKeyLVI( i, Pairs_LV );
 
         P = 0;
         D = OT->findDriver( Keys[i].from() );
 
         if( D ) {
           it->setText( 0, D->devname() );
@@ -844,64 +865,65 @@ void OTManage::SLOT_DriverListChanged( ) {
         D->getClass( Service, Device );
 
         Sub = new QListViewItem( It );
         Sub->setText( 0, tr( "Service classes" ) );
         Sub->setText( 1, Service ); 
         Sub = new QListViewItem( It );
         Sub->setText( 0, tr( "Device class" ) );
         Sub->setText( 1, Device ); 
       }
 
       if( DL.count() ) {
         AllDrivers_LV->setCurrentItem( First );
         DriverIsUp_CB->setEnabled( TRUE );
       } else {
         DriverIsUp_CB->setChecked( FALSE );
         DriverIsUp_CB->setEnabled( FALSE );
       }
 }
 
 void OTManage::SLOT_SetRefreshTimer( int v ) {
       OT->setRefreshTimer( v * 1000 );
 }
 
 //
 //
 //
 //
 //
 
 OTMain::OTMain( QWidget * parent ) : OTMainGUI( parent ) {
 
       Icons = new OTIcons();
+      SnifWindow = 0;
       OT = OTGateway::getOTGateway();
 
       connect( OT,
                SIGNAL( deviceEnabled( bool ) ),
                this,
                SLOT( SLOT_DeviceIsEnabled( bool ) )
              );
       connect( OT, 
                SIGNAL( driverListChanged() ),
                this,
                SLOT( SLOT_DriverListChanged() ) 
              );
       connect( OT,
                SIGNAL( stateChange( OTDriver *, bool ) ),
                this,
                SLOT( SLOT_StateChange( OTDriver *, bool ) )
              );
 
       if( ! OT->needsEnabling() ) {
         MustBeEnabled_CB->hide();
       } else {
         // detect current state
         MustBeEnabled_CB->setChecked(
             OT->isEnabled() );
       }
 
       SLOT_DriverListChanged();
 }
 
 OTMain::~OTMain() {
       OTGateway::releaseOTGateway();
       delete Icons;
@@ -974,32 +996,42 @@ void OTMain::SLOT_Scan( void ) {
           return;
         }
       }
 
 }
 
 void OTMain::SLOT_StateChange( OTDriver * D, bool Up ) {
       for( int i = 0;
            i < DeviceList_CB->count();
            i ++ ) {
         if( DeviceList_CB->text(i) == D->devname() ) {
           DeviceList_CB->changeItem(
              Icons->loadPixmap( (Up) ? "bluezon" : "bluezoff" ),
              D->devname(),
              i );
           return;
         }
       }
 }
 
 void OTMain::SLOT_Pairing( void ) {
       QDialog * Dlg = new QDialog( this, 0, TRUE );
       QVBoxLayout * V = new QVBoxLayout( Dlg );
       OTPairing * Pair = new OTPairing( Dlg, Icons );
 
       V->addWidget( Pair );
       Dlg->showMaximized();
       Dlg->setCaption( tr("Manage pairing" ) );
       Dlg->exec();
 
       delete Dlg;
 }
+
+void OTMain::SLOT_Sniffing( void ) {
+
+      if( SnifWindow == 0 ) {
+        SnifWindow = new OTSniffing( this );
+      }
+
+      SnifWindow->showMaximized();
+      SnifWindow->show();
+}
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.h b/noncore/settings/networksettings2/opietooth2/Opietooth.h
index 16a22d6..211ae65 100644
--- a/noncore/settings/networksettings2/opietooth2/Opietooth.h
+++ b/noncore/settings/networksettings2/opietooth2/Opietooth.h
@@ -1,48 +1,75 @@
 #ifndef OPIETOOTH_H
 #define OPIETOOTH_H
 
 #include <OTIcons.h>
 
-#include <OTPairingGUI.h>
 namespace Opie { namespace Ui { class OLedBox; }; };
 
+#include <OTSniffGUI.h>
 namespace Opietooth2 {
 
 class OTGateway;
 class OTDriver;
 class OTInquiry;
 class OTPeer;
 class PeerLVI;
 
+class OTSniffing : public OTSniffGUI {
+
+      Q_OBJECT
+
+public :
+
+      OTSniffing( QWidget * parent );
+      ~OTSniffing();
+
+private slots :
+
+      void SLOT_Trace( void );
+      void SLOT_ClearLog( void );
+
+signals :
+
+protected :
+
+private :
+
+      OTGateway *       OT;
+};
+};
+
+#include <OTPairingGUI.h>
+
+namespace Opietooth2 {
 class OTPairing : public OTPairingGUI {
 
       Q_OBJECT
 
 public :
 
       OTPairing( QWidget * parent, 
                  OTIcons * _Ic = 0 );
       ~OTPairing();
 
 private slots :
 
       void SLOT_Unpair( void );
 
 signals :
 
 protected :
 
 private :
 
       bool              MyIcons;
       OTIcons *         Icons;
       OTGateway *       OT;
 };
 };
 
 #include <OTScanGUI.h>
 
 namespace Opietooth2 {
 
 class OTGateway;
 class OTDriver;
@@ -145,50 +172,52 @@ signals :
 
 protected :
 
 private :
 
       // load scanned devices
 
       bool              MyIcons;
       OTIcons *         Icons;
       OTGateway *       OT;
       OTInquiry *       Scanning;
 };
 };
 
 #include <OTMainGUI.h>
 
 namespace Opietooth2 {
 class OTMain : public OTMainGUI {
 
       Q_OBJECT
 
 public :
 
       OTMain( QWidget * parent );
       ~OTMain();
 
 public slots :
 
 private slots :
 
       void SLOT_Pairing( void );
       void SLOT_Manage( void );
+      void SLOT_Sniffing( void );
       void SLOT_Scan( void );
       void SLOT_EnableBluetooth( bool );
       void SLOT_DriverListChanged();
       void SLOT_DeviceIsEnabled( bool );
       void SLOT_StateChange( OTDriver * , bool );
 
 signals :
 
 protected :
 
 private :
 
       // load scanned devices
       OTIcons *         Icons;
       OTGateway *       OT;
+      OTSniffing *      SnifWindow;
 };
 };
 #endif
diff --git a/noncore/settings/networksettings2/opietooth2/opietooth2.pro b/noncore/settings/networksettings2/opietooth2/opietooth2.pro
index 590b656..cfb527d 100644
--- a/noncore/settings/networksettings2/opietooth2/opietooth2.pro
+++ b/noncore/settings/networksettings2/opietooth2/opietooth2.pro
@@ -1,37 +1,37 @@
 TEMPLATE        = lib
 CONFIG          += qt warn_on release
 #CONFIG		+= qt warn_on debug
 DESTDIR		= $(OPIEDIR)/lib$(PROJMAK)
 HEADERS		= OTDevice.h  \
                   OTDriver.h  \
                   OTGateway.h \
                   OTHCISocket.h \
                   OTInquiry.h \
                   OTDeviceAddress.h \
                   OTIcons.h \
                   OTUUID.h \
                   OTSDPAttribute.h \
                   OTSDPService.h \
                   OTPeer.h \
                   Opietooth.h 
 SOURCES		= OTDevice.cpp \
                   OTDriver.cpp \
                   OTDriverList.cpp \
                   OTHCISocket.cpp \
                   OTInquiry.cpp \
                   OTDeviceAddress.cpp \
                   OTUUID.cpp \
                   OTSDPAttribute.cpp \
                   OTSDPService.cpp \
                   OTIcons.cpp \
                   OTPeer.cpp \
                   OTGateway.cpp \
                   Opietooth.cpp
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lbluetooth
-INTERFACES	= OTMainGUI.ui OTScanGUI.ui OTManageGUI.ui OTPairingGUI.ui
+INTERFACES	= OTMainGUI.ui OTSniffGUI.ui OTScanGUI.ui OTManageGUI.ui OTPairingGUI.ui
 TARGET		= opietooth2
 VERSION		= 1.0.0
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/packagemanager/opackagemanager.cpp b/noncore/settings/packagemanager/opackagemanager.cpp
index c9fdec1..ac16954 100644
--- a/noncore/settings/packagemanager/opackagemanager.cpp
+++ b/noncore/settings/packagemanager/opackagemanager.cpp
@@ -54,138 +54,141 @@ void OPackageManager::loadAvailablePackages()
 
     if ( serverList )
     {
         // Initialize status messaging
         emit initStatus( serverList->count() );
         int serverCount = 0;
 
         bool categoryAdded = false;
 
         for ( OConfItemListIterator serverIt( *serverList ); serverIt.current(); ++serverIt )
         {
             OConfItem *server = serverIt.current();
 
             // Process server only if it is active
             if ( server->active() )
             {
                 // Update status
                 QString status = tr( "Reading available packages:\n\t" );
                 status.append( server->name() );
                 emit statusText( status );
                 ++serverCount;
                 emit statusBar( serverCount );
                 qApp->processEvents();
 
                 OPackageList *packageList = m_ipkg.availablePackages( server->name() );
                 if ( packageList )
                 {
                     for ( OPackageListIterator packageIt( *packageList ); packageIt.current(); ++packageIt )
                     {
                         OPackage *package = packageIt.current();
 
                         // Load package info
-                        if ( !m_packages.find( package->name() ) )
+                        if ( !m_packages.find( package->name() ) ) {
+                          printf( "ADD AVAILABLE '%s'\n", package->name().latin1());
                             m_packages.insert( package->name(), package );
-                        else
+                        } else
                         {
                             // If new package is newer version, replace existing package
                             OPackage *currPackage = m_packages[package->name()];
                             if ( compareVersions( package->version(), currPackage->version() ) == 1 )
                                 m_packages.replace( package->name(), package );
                         }
 
                         // Add category to list if it doesn't already exist
                         if ( m_categories.grep( package->category() ).isEmpty() )
                         {
                             m_categories << package->category();
                             categoryAdded = true;
                         }
                     }
                 }
             }
         }
         delete serverList;
 
         // Sort category list if categories were added
         if ( categoryAdded )
             m_categories.sort();
     }
 }
 
 void OPackageManager::loadInstalledPackages()
 {
     OConfItemList *destList = m_ipkg.destinations();
 
     if ( destList )
     {
         // Initialize status messaging
         emit initStatus( destList->count() );
         int destCount = 0;
 
         bool categoryAdded = false;
 
         for ( OConfItemListIterator destIt( *destList ); destIt.current(); ++destIt )
         {
             OConfItem *destination = destIt.current();
 
             // Process destination only if it is active
             if ( destination->active() )
             {
                 // Update status
                 QString status = tr( "Reading installed packages:\n\t" );
                 status.append( destination->name() );
                 emit statusText( status );
                 ++destCount;
                 emit statusBar( destCount );
                 qApp->processEvents();
 
+                        printf( "DESGTINATION %s\n", destination->name().latin1());
                 OPackageList *packageList = m_ipkg.installedPackages( destination->name(),
                                                                       destination->value() );
                 if ( packageList )
                 {
                     for ( OPackageListIterator packageIt( *packageList ); packageIt.current(); ++packageIt )
                     {
                         OPackage *package = packageIt.current();
                         OPackage *currPackage = m_packages[package->name()];
                         if ( currPackage )
                         {
                             // Package is in a current feed, update installed version, destination
                             currPackage->setVersionInstalled( package->versionInstalled() );
                             currPackage->setDestination( package->destination() );
 
                             delete package;
                         }
                         else
                         {
                             // Package isn't in a current feed, add to list
+                            printf( "ADD INSTALLED '%s'\n", package->name().latin1());
                             m_packages.insert( package->name(), package );
 
                             // Add category to list if it doesn't already exist
                             if ( m_categories.grep( package->category() ).isEmpty() )
                             {
                                 m_categories << package->category();
                                 categoryAdded = true;
                             }
                         }
                     }
                 }
             }
         }
         delete destList;
 
         // Sort category list if categories were added
         if ( categoryAdded )
             m_categories.sort();
     }
 }
 
 OPackageList *OPackageManager::packages()
 {
     // TODO - look to see if list is loaded, if not, load available & installed
 
     OPackageList *pl = new OPackageList;
 
     for ( QDictIterator<OPackage> packageIt( m_packages ); packageIt.current(); ++packageIt )
         pl->append( packageIt.current() );
 
     return pl;
 }