/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to bzr-notify

  • Committer: Curtis Hovey
  • Date: 2011-08-01 14:46:23 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110801144623-ldjf0bu7kyi5bxzu
Updated commit to gtk3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr-notify
9
9
from bzrlib.plugin import load_plugins
10
10
load_plugins()
11
11
 
12
 
from bzrlib.plugins.gtk import open_display, icon_path
 
12
from bzrlib.plugins.gtk.commands import open_display
13
13
 
14
14
from bzrlib.plugins.gtk.notify import NotifyPopupMenu
15
 
gtk = open_display()
 
15
Gtk = open_display()
16
16
 
17
17
import cgi
18
18
import dbus
27
27
try:
28
28
    import appindicator
29
29
except ImportError:
30
 
    icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
 
30
    icon = gtk.status_icon_new_from_icon_name("bzr-panel")
31
31
    icon.connect('popup-menu', menu.display)
32
32
    icon.set_visible(False)
33
33
    hide_icon = lambda: icon.set_visible(False)
34
34
    show_icon = lambda: icon.set_visible(True)
35
35
else:
36
36
    indicator = appindicator.Indicator ("bzr-gtk-notify",
37
 
        "bzr-icon-64", appindicator.CATEGORY_APPLICATION_STATUS)
 
37
        "bzr-panel", appindicator.CATEGORY_OTHER)
38
38
    indicator.set_status (appindicator.STATUS_PASSIVE)
39
 
    indicator.set_attention_icon("bzr-icon-64")
 
39
    indicator.set_attention_icon("bzr-panel")
40
40
    indicator.set_menu(menu)
41
41
    hide_icon = lambda: indicator.set_status (appindicator.STATUS_PASSIVE)
42
42
    show_icon = lambda: indicator.set_status (appindicator.STATUS_ATTENTION)