Uses mint-common to launch browsers in user-mode

Author: Clement Lefebvre

debian/changelog

@@ -1,3 +1,9 @@
+mintinstall (6.4.5) helena; urgency=low
+
+  * Uses mint-common to launch browsers in user-mode 
+
+ -- Clement Lefebvre <root@linuxmint.com>  Fri,  30 Oct 2009 17:41:00 +0000
+
 mintinstall (6.4.4) helena; urgency=low
 
   * Not dependent on mintMenu anymore

usr/lib/linuxmint/mintInstall/frontend.py

@@ -417,25 +417,11 @@ def show_more_info(widget, model):
 
 def visit_web(widget, model, username):
 	if model.selected_application != None:
-		if os.path.exists("/usr/bin/gconftool-2"):
-			browser = commands.getoutput("gconftool-2 --get /desktop/gnome/url-handlers/http/command")		
-		        browser = browser.replace("\"%s\"", model.selected_application.link)
-			browser = browser.replace("%s", model.selected_application.link) 
-		else:
-			browser = "firefox " + model.selected_application.link	
-		launcher = commands.getoutput("/usr/lib/linuxmint/common/mint-which-launcher.py")		
-		os.system(launcher + " -u " + username + " \"" + browser + "\" &")
+		os.system("sudo -u " + username + " /usr/lib/linuxmint/common/launch_browser_as.py \"" + model.selected_application.link + "\"")	
 
 def visit_website(widget, model, username):
 	if model.selected_application != None:
-		if os.path.exists("/usr/bin/gconftool-2"):
-			browser = commands.getoutput("gconftool-2 --get /desktop/gnome/url-handlers/http/command")		
-		        browser = browser.replace("\"%s\"", model.selected_application.website)
-			browser = browser.replace("%s", model.selected_application.website) 
-		else:
-			browser = "firefox " + model.selected_application.website	
-		launcher = commands.getoutput("/usr/lib/linuxmint/common/mint-which-launcher.py")	
-		os.system(launcher + " -u " + username + " \"" + browser + "\" &")		
+		os.system("sudo -u " + username + " /usr/lib/linuxmint/common/launch_browser_as.py \"" + model.selected_application.website + "\"")		
 
 def install(widget, model, wTree, username):	
 	if model.selected_application != None:

usr/lib/linuxmint/mintInstall/mintInstall.py

@@ -380,15 +380,7 @@ def show_portal_mint_apt(widget, username):
 	show_website(username, "http://packages.linuxmint.com/")
 
 def show_website(username, link):
-	if os.path.exists("/usr/bin/gconftool-2"):
-		browser = commands.getoutput("gconftool-2 --get /desktop/gnome/url-handlers/http/command")		
-	        browser = browser.replace("\"%s\"", link)
-		browser = browser.replace("%s", link) 
-	else:
-		browser = "firefox " + link	
-	launcher = commands.getoutput("/usr/lib/linuxmint/common/mint-which-launcher.py")
-	os.system("sudo -u " + username + " xhost +root")
-	os.system(launcher + " -u " + username + " \"" + browser + "\" &")
+	os.system("sudo -u " + username + " /usr/lib/linuxmint/common/launch_browser_as.py \"" + link + "\"")
 
 def search_apt(widget, textfield):
 	os.system("/usr/bin/mint-search-apt " + textfield.get_text() + " &")