[PC-BSD Commits] r777 - in pcbsd/branches/1.4: PBIsource PBItext

[svn at pcbsd.org]

Author: tim
Date: 2007-10-02 08:12:02 -0700 (Tue, 02 Oct 2007)
New Revision: 777

Modified:
   pcbsd/branches/1.4/PBIsource/pbi.ui.h
   pcbsd/branches/1.4/PBItext/main.cpp
Log:
Apply yesterday's PBI fixes to the 1.4 branch

Modified: pcbsd/branches/1.4/PBIsource/pbi.ui.h
===================================================================
--- pcbsd/branches/1.4/PBIsource/pbi.ui.h	2007-10-01 19:54:04 UTC (rev 776)
+++ pcbsd/branches/1.4/PBIsource/pbi.ui.h	2007-10-02 15:12:02 UTC (rev 777)
@@ -1822,12 +1822,17 @@
 	stream << "PBIUpdate: " << ProgUpdateURL << "\n";
 	
 	// Save the package directory
-	stream << "PackageDir: " << "/home/" + RealUserName + "/" + ProgDirName << "\n";
-              stream << "LibDir: " << LibDir << "\n" ;
+	stream << "PackageDir: " << "/usr/home/" + RealUserName + "/" + ProgDirName << "\n";
+        if ( LibDir != "NONE" && LibDir != "Auto" ) 
+        {
+          stream << "LibDir: /usr/home/" + RealUserName + "/" + ProgDirName << LibDir << "\n" ;
+        } else {
+          stream << "LibDir: " << LibDir << "\n" ;
+        }
 
 	 
 	 // Save the default icon, if needed
-	 stream << "DefaultIcon: " << "/home/" + RealUserName + "/" + ProgDirName + "/" + DefaultIcon << "\n";
+	 stream << "DefaultIcon: " << "/usr/home/" + RealUserName + "/" + ProgDirName + "/" + DefaultIcon << "\n";
 	 
 	 // Start saving exe info
                   int i = 0;
@@ -1835,11 +1840,11 @@
                   while (! ExePath[i].isEmpty() )
                  {
 
-	     stream << "ExePath: " << "/home/" + RealUserName + "/" + ProgDirName + "/" + ExePath[i] << "\n" ;
+	     stream << "ExePath: " << "/usr/home/" + RealUserName + "/" + ProgDirName + "/" + ExePath[i] << "\n" ;
 	     if ( ExeIcon[i].isEmpty() ) {
 		stream << "ExeIcon: \n";
 	     } else {
-		stream << "ExeIcon: " <<  "/home/" + RealUserName + "/" + ProgDirName + "/" + ExeIcon[i]  << "\n" ; 
+		stream << "ExeIcon: " <<  "/usr/home/" + RealUserName + "/" + ProgDirName + "/" + ExeIcon[i]  << "\n" ; 
 	     }
 	     
 	     stream << "ExeDescr: " << ExeDescr[i]  << "\n" ;
@@ -1863,7 +1868,7 @@
 	     if ( MimeIcon[i].isEmpty() ) {
 	        stream << "MimeIcon: \n";
 	     } else {
-	        stream << "MimeIcon: " << "/home/" + RealUserName + "/" + ProgDirName + "/" + MimeIcon[i] << "\n";
+	        stream << "MimeIcon: " << "/usr/home/" + RealUserName + "/" + ProgDirName + "/" + MimeIcon[i] << "\n";
 	     }
 	     stream << "MimeProg: " << MimeProg[i] << "\n";
 	     i++;

Modified: pcbsd/branches/1.4/PBItext/main.cpp
===================================================================
--- pcbsd/branches/1.4/PBItext/main.cpp	2007-10-01 19:54:04 UTC (rev 776)
+++ pcbsd/branches/1.4/PBItext/main.cpp	2007-10-02 15:12:02 UTC (rev 777)
@@ -691,7 +691,7 @@
 		 }
 		 if ( ExeKdeCat[exenum] == "Internet")
 		 {
-		       stream << "Categories=Qt;KDE;Internet;\n";
+		       stream << "Categories=Qt;KDE;Network;\n";
 		 }
 		 if ( ExeKdeCat[exenum] == "Multimedia")
 		 {
@@ -784,7 +784,7 @@
 		 }
 		 if ( ExeKdeCat[exenum] == "Internet")
 		 {
-		       stream << "Categories=Qt;KDE;Internet;\n";
+		       stream << "Categories=Qt;KDE;Network;\n";
 		 }
 		 if ( ExeKdeCat[exenum] == "Multimedia")
 		 {