Merge lp:~rohangarg/ubiquity/ubiquity into lp:ubiquity

[Rohan Garg]

[lp:~rohangarg/ubiquity/ubiquity]

6172. By Jonathan Riddell on 2014-04-15

call the appropriate
drop_privileges and regain_privileges functions

=== modified file 'ubiquity/plugins/ubi-language.py'
--- ubiquity/plugins/ubi-language.py	2014-02-27 15:41:18 +0000
+++ ubiquity/plugins/ubi-language.py	2014-04-15 10:40:26 +0000
@@ -497,12 +497,13 @@
     def openURL(self, url):
         from PyQt4.QtGui import QDesktopServices
         from PyQt4.QtCore import QUrl
-        from ubiquity.misc import drop_privileges_save, regain_privileges_save
 
         # this nonsense is needed because kde doesn't want to be root
-        drop_privileges_save()
+        misc.drop_privileges()
+        misc.drop_privileges_save()
         QDesktopServices.openUrl(QUrl(url))
-        regain_privileges_save()
+        misc.regain_privileges()
+        misc.regain_privileges_save()
 
     def set_language_choices(self, choices, choice_map):
         PageBase.set_language_choices(self, choices, choice_map)