4 files changed, 23 insertions, 1 deletions

diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index 3aee7bd..d84fb4b 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -481,17 +481,23 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
     	return item;
     }
     else
     {
         InstallData item;
         item.option = "D";
-        item.packageName = name;
+        item.packageName = p->getInstalledPackageName();
         if ( p->getInstalledTo() )
+        {
             item.destination = p->getInstalledTo();
+            cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl;
+            cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl;
+        }
         else
+        {
             item.destination = p->getLocalPackage()->getInstalledTo();
+        }
 
         // Sticky option not implemented yet, but will eventually allow
         // the user to say something like 'remove all'
         if ( stickyOption == "" )
         {
             QString msgtext;
diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp
index 48b6934..fd75450 100644
--- a/noncore/settings/aqpkg/package.cpp
+++ b/noncore/settings/aqpkg/package.cpp
@@ -22,18 +22,25 @@ Package::Package( QString &name )
 {
     packageName = name;
     localPackage = 0;
     installed = false;
 	packageStoredLocally = false;
     installedToRoot = false;
+    installed = false;
+    installedTo = 0;
 }
 
 Package::Package( char *name )
 {
     packageName = name;
     localPackage = 0;
+    installed = false;
+    packageStoredLocally = false;
+    installedToRoot = false;
+    installed = false;
+    installedTo = 0;
 }
 
 Package::~Package()
 {
 }
 
@@ -100,10 +107,18 @@ QString Package :: getInstalledVersion()
     if ( localPackage )
         return localPackage->getVersion();
     else
         return getVersion();
 }
 
+QString Package :: getInstalledPackageName()
+{
+    if ( localPackage )
+        return localPackage->getPackageName();
+    else
+        return getPackageName();
+}
+
 bool Package :: isInstalled()
 {
     return installed || ( localPackage && localPackage->isInstalled() );
 }
diff --git a/noncore/settings/aqpkg/package.h b/noncore/settings/aqpkg/package.h
index 8ba5a6a..2f2a165 100644
--- a/noncore/settings/aqpkg/package.h
+++ b/noncore/settings/aqpkg/package.h
@@ -52,12 +52,13 @@ public:
     QString getFilename()			{ return filename; }
 
     bool isInstalled();
 	bool isPackageStoredLocally()	{ return packageStoredLocally; }
     bool isInstalledToRoot()     { return installedToRoot; }
     QString getInstalledVersion();
+    QString getInstalledPackageName();
     Destination *getInstalledTo()   { return installedTo; }
 
     QString toString();
 
 
 private:
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index 7d103a2..8bca892 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp