[PC-BSD Commits] r2370 - pcbsd/trunk/NetworkManager

[svn at pcbsd.org]

Author: kris
Date: 2008-07-17 09:02:23 -0700 (Thu, 17 Jul 2008)
New Revision: 2370

Removed:
   pcbsd/trunk/NetworkManager/networkman.ui.h
   pcbsd/trunk/NetworkManager/restartpopup.ui.h
Modified:
   pcbsd/trunk/NetworkManager/networkman.cpp
Log:

Fixed up the NetworkManager to use .kde4 as well



Modified: pcbsd/trunk/NetworkManager/networkman.cpp
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.cpp	2008-07-17 15:48:33 UTC (rev 2369)
+++ pcbsd/trunk/NetworkManager/networkman.cpp	2008-07-17 16:02:23 UTC (rev 2370)
@@ -147,7 +147,7 @@
 
 	
     // Check to see if the network tray icon is enabled or not
-     QString filename = "/home/" + username + "/.kde/Autostart/tray-" + Devs[sel] + ".desktop";
+     QString filename = "/home/" + username + "/.kde4/Autostart/tray-" + Devs[sel] + ".desktop";
 
 
   // First run a check to if we need to enable or disable the checkbox
@@ -668,7 +668,7 @@
 	}
 	
 	    // Save the new file
-                 QFile fileout( "/home/" + username + "/.kde/Autostart/tray-" + Devs[sel] + ".desktop" );
+                 QFile fileout( "/home/" + username + "/.kde4/Autostart/tray-" + Devs[sel] + ".desktop" );
                  if ( fileout.open( IO_WriteOnly ) ) {
                           QTextStream streamout( &fileout );
                                 streamout << "[Desktop Entry]\nExec=/PCBSD/networkmanager/bin/NetworkTray ";
@@ -676,7 +676,7 @@
 		    streamout << "\nIcon=network\nStartupNotify=false\nType=Application\n";
                                 fileout.close();
 		    
-		    runCommand("chown " + username + ":" + username + " \"/home/" + username + "/.kde/Autostart/tray-" + Devs[sel] + ".desktop\"");
+		    runCommand("chown " + username + ":" + username + " \"/home/" + username + "/.kde4/Autostart/tray-" + Devs[sel] + ".desktop\"");
 		    //runCommand("su " + username + " -c \"/PCBSD/networkmanager/bin/NetworkTray " + Type + " " + Devs[sel] + "\"");
 		    // Run the command without SU flags
 		   runCommand("/PCBSD/networkmanager/bin/NetworkTray " + Type + " " + Devs[sel] + " &");
@@ -685,7 +685,7 @@
 	
     } else {
 	// Kill the tray applet
-	runCommand("rm -f \"/home/" + username + "/.kde/Autostart/tray-" + Devs[sel] + ".desktop\"");
+	runCommand("rm -f \"/home/" + username + "/.kde4/Autostart/tray-" + Devs[sel] + ".desktop\"");
     }
 
 }