[ontv] Make notifications more compliant to Ubuntu notification system

[Olof Kindgren <olki src gnome org>]

commit db9ef672dd37f54368bc6b6f0edd39a8b402828c
Author: Olof Kindgren <olki src gnome org>
Date:   Wed Dec 30 22:28:39 2009 +0100

    Make notifications more compliant to Ubuntu notification system
    
    Removed details button, so that there is only a notification bubble
    on ubuntu systems. Not sure how this affects other distros.
    Fixes Launchpad bug #388604

 ontv/notify.py    |    2 --
 ontv/reminders.py |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/ontv/notify.py b/ontv/notify.py
index 82f8a20..44e332c 100644
--- a/ontv/notify.py
+++ b/ontv/notify.py
@@ -84,8 +84,6 @@ class Notification:
         self.notification.set_hint_int32("x", x)
         self.notification.set_hint_int32("y", y)
         self.notification.set_timeout(self.__get_timeout())
-        self.notification.add_action("details", _("Details"),
-                                     self.__action_invoked)
         self.notification.connect("closed", self.__closed)
         self.notification.show()
 
diff --git a/ontv/reminders.py b/ontv/reminders.py
index 7f50bc5..7cbc537 100644
--- a/ontv/reminders.py
+++ b/ontv/reminders.py
@@ -52,7 +52,8 @@ class Reminders(object):
         channel = reminder.channel.strip().lower()
         for r in self.reminders:
             if program.find(r.program.strip().lower()) != -1 and \
-               reminder.notify_time == r.notify_time:
+               reminder.notify_time <= r.notify_time \
+               and reminder.notify_time > 0:
                 if check_channel:
                     if (channel == r.channel.strip().lower() or \
                        r.channel == _("All") or r.channel == ""):