summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2017-05-12 17:30:35 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2017-05-12 17:30:35 +0200
commitdff4b9f555ac102fa9280a3362865eb33fd9ae5e (patch)
tree49edb47bfa5b59070bb90da7d2d6f3fe25f988c9
parent891f99fe81b5c4584dbf01f7fa9605aac28e5aaf (diff)
downloadmgaonline-dff4b9f555ac102fa9280a3362865eb33fd9ae5e.tar
mgaonline-dff4b9f555ac102fa9280a3362865eb33fd9ae5e.tar.gz
mgaonline-dff4b9f555ac102fa9280a3362865eb33fd9ae5e.tar.bz2
mgaonline-dff4b9f555ac102fa9280a3362865eb33fd9ae5e.tar.xz
mgaonline-dff4b9f555ac102fa9280a3362865eb33fd9ae5e.zip
Fix broken notifications when the user does a manual check too early
If the user does a manual check for updates before the first automatic check has been triggered, notifications no longer work.
-rw-r--r--NEWS2
-rwxr-xr-xmgaapplet6
2 files changed, 7 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 7326332d..cdd52d06 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
- mgaapplet:
o correctly detect right-clicks before the first check for updates (mga#20540)
+ o fix broken notifications when the user does a manual check before
+ the first automatic check has been triggered
o correctly display the application logo in the 'About' dialog box
o fix broken paths to drakconnect and drakrpm-editmedia
diff --git a/mgaapplet b/mgaapplet
index 2f996598..ab1b41c4 100755
--- a/mgaapplet
+++ b/mgaapplet
@@ -242,9 +242,13 @@ go2State('delayed');
# will be emitted and caught above (mga#20540).
Glib::Timeout->add(100, sub { $icon->set_context_menu($menu); 0 }) if $is_plasma;
-Glib::Timeout->add_seconds($config{FIRST_CHECK_DELAY}/1000, sub {
+Glib::Timeout->add_seconds(1, sub {
POSIX::sigprocmask(SIG_UNBLOCK, POSIX::SigSet->new(SIGCHLD));
$SIG{CHLD} = \&harvester;
+ 0;
+ });
+
+Glib::Timeout->add_seconds($config{FIRST_CHECK_DELAY}/1000, sub {
# schedule future checks:
setup_cyclic_check();
# perform a test after initial delay: