diff -Nru muon-1.3.1/debian/changelog muon-1.3.1/debian/changelog --- muon-1.3.1/debian/changelog 2012-04-01 17:55:50.000000000 +0000 +++ muon-1.3.1/debian/changelog 2012-04-14 01:39:41.000000000 +0000 @@ -1,3 +1,10 @@ +muon (1.3.1-0ubuntu2) precise; urgency=low + + * Backport update_notifier_auto_hide.diff from 1.3 branch to fix the + update notifier not going away after updating all packages. + + -- Jonathan Thomas Fri, 13 Apr 2012 21:39:11 -0400 + muon (1.3.1-0ubuntu1) precise; urgency=low * New upstream release diff -Nru muon-1.3.1/debian/patches/series muon-1.3.1/debian/patches/series --- muon-1.3.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ muon-1.3.1/debian/patches/series 2012-04-14 01:36:25.000000000 +0000 @@ -0,0 +1 @@ +update_notifier_auto_hide.diff diff -Nru muon-1.3.1/debian/patches/update_notifier_auto_hide.diff muon-1.3.1/debian/patches/update_notifier_auto_hide.diff --- muon-1.3.1/debian/patches/update_notifier_auto_hide.diff 1970-01-01 00:00:00.000000000 +0000 +++ muon-1.3.1/debian/patches/update_notifier_auto_hide.diff 2012-04-14 01:39:01.000000000 +0000 @@ -0,0 +1,57 @@ +Index: muon-1.3.1/kded/MuonNotifier.cpp +=================================================================== +--- muon-1.3.1.orig/kded/MuonNotifier.cpp 2012-04-01 13:35:23.000000000 -0400 ++++ muon-1.3.1/kded/MuonNotifier.cpp 2012-04-13 21:38:21.391059749 -0400 +@@ -85,6 +85,7 @@ + stampDirWatch->addDir("/var/lib/apt/lists/"); + stampDirWatch->addDir("/var/lib/apt/lists/partial/"); + stampDirWatch->addFile("/var/lib/update-notifier/updates-available"); ++ stampDirWatch->addFile("/var/lib/update-notifier/dpkg-run-stamp"); + connect(stampDirWatch, SIGNAL(dirty(QString)), + this, SLOT(updateEvent())); + connect(m_configWatcher, SIGNAL(reloadConfigCalled()), +Index: muon-1.3.1/kded/UpdateEvent/UpdateEvent.cpp +=================================================================== +--- muon-1.3.1.orig/kded/UpdateEvent/UpdateEvent.cpp 2012-04-01 13:35:23.000000000 -0400 ++++ muon-1.3.1/kded/UpdateEvent/UpdateEvent.cpp 2012-04-13 21:38:43.859171179 -0400 +@@ -42,6 +42,7 @@ + void UpdateEvent::show(int updates, int securityUpdates) + { + if (!updates && !securityUpdates) { ++ Event::ignore(); + return; + } + +Index: muon-1.3.1/kded/event.cpp +=================================================================== +--- muon-1.3.1.orig/kded/event.cpp 2012-04-01 13:35:23.000000000 -0400 ++++ muon-1.3.1/kded/event.cpp 2012-04-13 21:38:57.575239177 -0400 +@@ -194,7 +194,7 @@ + + void Event::ignore() + { +- m_notifierItem->deleteLater(); ++ delete m_notifierItem; + m_notifierItem = 0; + notifyClosed(); + } +Index: muon-1.3.1/kded/event.h +=================================================================== +--- muon-1.3.1.orig/kded/event.h 2012-04-01 13:35:23.000000000 -0400 ++++ muon-1.3.1/kded/event.h 2012-04-13 21:38:57.575239177 -0400 +@@ -46,6 +46,7 @@ + public slots: + bool isHidden() const; + void show(const QString &icon, const QString &text, const QStringList &actions, const QString &tTipIcon = QString()); ++ void ignore(); + void update(const QString &icon, const QString &text, const QString &tTipIcon = QString()); + void run(); + virtual void reloadConfig(); +@@ -54,7 +55,6 @@ + bool readHiddenConfig(); + void writeHiddenConfig(bool value); + void readNotifyConfig(); +- void ignore(); + void hide(); + void notifyClosed(); +