Nemcio/mailnag
1
0
Fork 0
mirror of https://github.com/pulb/mailnag.git synced 2026-05-07 13:37:16 +02:00
Code Issues Packages Projects Releases Activity

drop gtk2 workaround code

Browse Source
This commit is contained in:
Patrick Ulbrich
2011-10-18 19:19:33 +02:00
parent d4fb774f81
commit cf848436b4
4 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Mailnag/config_window.py
View File

@@ -24,8 +24,6 @@
PACKAGE_NAME = "mailnag"
__builtins__.USE_GTK3 = True # make keyring.py use GTK3
from gi.repository import GLib, GdkPixbuf, Gtk, GObject
import os

7
Mailnag/keyring.py
View File

@@ -22,12 +22,7 @@
# MA 02110-1301, USA.
#
if __builtins__["USE_GTK3"]:
from gi.repository import GObject, GLib, GdkPixbuf, Gtk
else:
Gtk = __import__("gtk")
GLib = __import__("glib")
from gi.repository import GObject, GLib, GdkPixbuf, Gtk
import locale
import gettext

30
Mailnag/mailnag.py
View File

@@ -31,16 +31,7 @@ import subprocess
PACKAGE_NAME = "mailnag"
# TODO : use gtk and glib from gi.repositrory
# (those conflict with pynotify and gi.repository.Notify is broken)
__builtins__.USE_GTK3 = False # (also prevents keyring.py from using GTK3)
if __builtins__.USE_GTK3:
from gi.repository import GObject, GLib, GdkPixbuf, Gtk, Notify
else:
Gtk = __import__("gtk")
GObject = __import__("gobject")
import pynotify
from gi.repository import GObject, GLib, GdkPixbuf, Gtk, Notify
import time
import email
@@ -501,21 +492,12 @@ class MailChecker:
self.mails = Mails() # create Mails object
self.reminder = Reminder() # create Reminder object
# TODO : gi.repository Notify seems to be unstable currently (set_hint and add_action crash)
# Notify.init(cfg.get('general', 'messagetray_label')) # initialize Notification
# self.notification = Notify.Notification.new(" ", None, None) # empty string will emit a gtk warning
# self.notification.set_hint("resident", GLib.Variant("b", True)) # don't close when the bubble or actions are clicked
# self.notification.set_category("email")
# self.notification.add_action("open", _("Open in mail reader"), self.__notification_action_handler, None, None)
# self.notification.add_action("close", _("Close"), self.__notification_action_handler, None, None)
pynotify.init(cfg.get('general', 'messagetray_label')) # initialize Notification
self.notification = pynotify.Notification(" ", None, None) # empty string will emit a gtk warning
self.notification.set_hint("resident", True) # don't close when the bubble or actions are clicked
Notify.init(cfg.get('general', 'messagetray_label')) # initialize Notification
self.notification = Notify.Notification.new(" ", None, None) # empty string will emit a gtk warning
self.notification.set_hint("resident", GLib.Variant("b", True)) # don't close when the bubble or actions are clicked
self.notification.set_category("email")
self.notification.add_action("open", _("Open in mail reader"), self.__notification_action_handler)
self.notification.add_action("close", _("Close"), self.__notification_action_handler)
self.notification.add_action("open", _("Open in mail reader"), self.__notification_action_handler, None, None)
self.notification.add_action("close", _("Close"), self.__notification_action_handler, None, None)
def timeout(self, firstcheck = False):

5
data/keyring_dialog.ui
View File

@@ -61,11 +61,10 @@
</packing>
</child>
<child>
<!--<object class="GtkBox" id="box1">-->
<object class="GtkVBox" id="box1">
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<!--<property name="orientation">vertical</property>-->
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">