Software Updater

Merge lp:~evfool/update-manager/fix727069 into lp:update-manager

  1. fix727069
  2. Merge into main
Proposed by Robert Roth
Status: Merged
Merged at revision: 2087
Proposed branch: lp:~evfool/update-manager/fix727069
Merge into: lp:update-manager
Diff against target: 40 lines (+18/-2)
1 file modified
UpdateManager/UpdateManager.py (+18/-2)
To merge this branch: bzr merge lp:~evfool/update-manager/fix727069
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+55972@code.launchpad.net

Description of the change

If unity is running, refer to Applications, otherwise to Administration menu when pointing the user where to find the Update Manager later.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks again, looks fine! Merged

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py 2011-03-09 09:24:58 +0000
+++ UpdateManager/UpdateManager.py 2011-04-01 16:48:33 +0000
@@ -102,6 +102,16 @@
102# NetworkManager enums102# NetworkManager enums
103from Core.roam import NetworkManagerHelper103from Core.roam import NetworkManagerHelper
104104
105def is_unity_running():
106 """ return True if Unity is currently running """
107 unity_running = False
108 try:
109 bus = dbus.SessionBus()
110 unity_running = bus.name_has_owner("com.canonical.Unity")
111 except:
112 LOG.exception("could not check for Unity dbus service")
113 return unity_running
114
105def show_dist_no_longer_supported_dialog(parent=None):115def show_dist_no_longer_supported_dialog(parent=None):
106 """ show a no-longer-supported dialog """116 """ show a no-longer-supported dialog """
107 msg = "<big><b>%s</b></big>\n\n%s" % (117 msg = "<big><b>%s</b></big>\n\n%s" % (
@@ -650,11 +660,17 @@
650 firstrun = self.gconfclient.get_bool("/apps/update-manager/first_run")660 firstrun = self.gconfclient.get_bool("/apps/update-manager/first_run")
651 if firstrun:661 if firstrun:
652 text_header = "<big><b>%s</b></big>" % _("Welcome to Ubuntu")662 text_header = "<big><b>%s</b></big>" % _("Welcome to Ubuntu")
653 text_label_main = _("These software updates have been issued since Ubuntu was released. If you don't want to install them now, choose \"Update Manager\" from the Administration Menu later.")663 if is_unity_running():
664 text_label_main = _("These software updates have been issued since Ubuntu was released. If you don't want to install them now, choose \"Update Manager\" from Applications later.")
665 else:
666 text_label_main = _("These software updates have been issued since Ubuntu was released. If you don't want to install them now, choose \"Update Manager\" from the Administration Menu later.")
654 self.gconfclient.set_bool("/apps/update-manager/first_run", False)667 self.gconfclient.set_bool("/apps/update-manager/first_run", False)
655 else:668 else:
656 text_header = "<big><b>%s</b></big>" % _("Software updates are available for this computer")669 text_header = "<big><b>%s</b></big>" % _("Software updates are available for this computer")
657 text_label_main = _("If you don't want to install them now, choose \"Update Manager\" from the Administration menu later.")670 if is_unity_running():
671 text_label_main = _("If you don't want to install them now, choose \"Update Manager\" from Applications later.")
672 else:
673 text_label_main = _("If you don't want to install them now, choose \"Update Manager\" from the Administration menu later.")
658 self.notebook_details.set_sensitive(True)674 self.notebook_details.set_sensitive(True)
659 self.treeview_update.set_sensitive(True)675 self.treeview_update.set_sensitive(True)
660 self.button_install.grab_default()676 self.button_install.grab_default()

Subscribers

People subscribed via source and target branches

to status/vote changes: