diff options
| author | Bilal Akhtar <bilalakhtar@ubuntu.com> | 2012-07-24 23:11:05 -0400 |
|---|---|---|
| committer | Tarmac <> | 2012-07-24 23:11:05 -0400 |
| commit | cfee237f169536aa1133335f41018ef6f4e9ff3d (patch) | |
| tree | 89b44980d07d8bf5b169ac2ac63cf96eff437da0 /launcher | |
| parent | 589500f4bee308c7867e05b89c7d8bbc378889f2 (diff) | |
| parent | c71f27ed8426dac7cc5c100a0cfdc9736a07d03a (diff) | |
SoftwareCenterLauncherIcon: avoid the "Waiting to Install" tooltip to stay after installation
Be consistent with auto-hiding launcher.. Fixes: https://bugs.launchpad.net/bugs/925014. Approved by Brandon Schaefer, Tim Penhey, Marco Trevisan (Treviño). (bzr r2520)
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/SoftwareCenterLauncherIcon.cpp | 4 | ||||
| -rw-r--r-- | launcher/SoftwareCenterLauncherIcon.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/launcher/SoftwareCenterLauncherIcon.cpp b/launcher/SoftwareCenterLauncherIcon.cpp index e7a7fe0f6..2780457bb 100644 --- a/launcher/SoftwareCenterLauncherIcon.cpp +++ b/launcher/SoftwareCenterLauncherIcon.cpp @@ -43,6 +43,7 @@ SoftwareCenterLauncherIcon::SoftwareCenterLauncherIcon(BamfApplication* app, G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START) , finished_(true) , needs_urgent_(false) +, aptdaemon_trans_id_(aptdaemon_trans_id) { aptdaemon_trans_.Connect("PropertyChanged", sigc::mem_fun(this, &SoftwareCenterLauncherIcon::OnPropertyChanged)); @@ -50,7 +51,8 @@ SoftwareCenterLauncherIcon::SoftwareCenterLauncherIcon(BamfApplication* app, SetIconType(TYPE_APPLICATION); icon_name = icon_path; - tooltip_text = _("Waiting to install"); + if (!aptdaemon_trans_id_.empty()) // Application is being installed, or hasn't been installed yet + tooltip_text = _("Waiting to install"); } void SoftwareCenterLauncherIcon::Animate(nux::ObjectPtr<Launcher> launcher, diff --git a/launcher/SoftwareCenterLauncherIcon.h b/launcher/SoftwareCenterLauncherIcon.h index 3d7b01cf6..70794437a 100644 --- a/launcher/SoftwareCenterLauncherIcon.h +++ b/launcher/SoftwareCenterLauncherIcon.h @@ -21,6 +21,7 @@ #ifndef SOFTWARE_CENTER_LAUNCHERICON_H #define SOFTWARE_CENTER_LAUNCHERICON_H +#include <string> #include <UnityCore/GLibDBusProxy.h> #include "BamfLauncherIcon.h" #include "LauncherDragWindow.h" @@ -60,6 +61,8 @@ private: nux::ObjectPtr<Launcher> launcher_; bool finished_; bool needs_urgent_; + + std::string aptdaemon_trans_id_; }; } |