--- ./browser-bookmarks-menu.py	2007/01/05 13:30:25	1.3
+++ ./browser-bookmarks-menu.py	2007/01/05 14:13:21
@@ -470,10 +470,12 @@ def applet_factory(applet, iid):
 		widget "*.browser-bookmarks-menu" style "browser-bookmarks-menubar-style"''')
 	
 	root_menu = gtk.Menu()
+	tooltips = gtk.Tooltips()
+	tooltips.enable()
 
 	bookmarks_info = get_bookmarks()
-	handle = gnomevfs.monitor_add(bookmarks_info[0], gnomevfs.MONITOR_FILE, on_bookmarks_file_changed, (root_menu, bookmarks_info))
-	gobject.idle_add(on_bookmarks_file_changed, None, None, gnomevfs.MONITOR_EVENT_CHANGED, (root_menu, bookmarks_info))
+	handle = gnomevfs.monitor_add(bookmarks_info[0], gnomevfs.MONITOR_FILE, on_bookmarks_file_changed, (root_menu, bookmarks_info, tooltips))
+	gobject.idle_add(on_bookmarks_file_changed, None, None, gnomevfs.MONITOR_EVENT_CHANGED, (root_menu, bookmarks_info, tooltips))
 
 	root_menu_item = gtk.MenuItem("Bookmarks")
 	root_menu_item.set_name("browser-bookmarks-menu")
@@ -484,6 +486,7 @@ def applet_factory(applet, iid):
 	menubar.connect("button-press-event", on_menubar_click)
 	menubar.connect("size-allocate", on_menubar_size_allocate)
 	menubar.append(root_menu_item)
+	tooltips.set_tip(menubar, "Access web browser bookmarks")
 
 	applet.add(menubar)
 	applet.connect("destroy", on_applet_destroy, None)
@@ -506,9 +509,7 @@ def applet_factory(applet, iid):
 	return True
 
 
-def fill_root_menu(menu, info):
-	tooltips = gtk.Tooltips()
-	tooltips.enable()
+def fill_root_menu(menu, info, tooltips):
 	(bookmarks_file, bookmarks_func, bookmarks_editor_text, bookmarks_editor_cmd, favicons_call) = info
 	if bookmarks_editor_cmd is not None:
 		menu_item = gtk.ImageMenuItem(bookmarks_editor_text)
@@ -635,9 +636,9 @@ def on_menubar_click(widget, event):
 def on_bookmarks_file_changed(monitorUri, infoUri, eventType, data):
 	if eventType != gnomevfs.MONITOR_EVENT_CHANGED:
 		return
-	menu, info = data
+	menu, info, tooltips = data
 	menu.foreach(lambda x: menu.remove(x))
-	fill_root_menu(menu, info)
+	fill_root_menu(menu, info, tooltips)
 	menu.show_all()