Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 105635 | Differences between
and this patch

Collapse All | Expand All

(-)./browser-bookmarks-menu.py (-7 / +8 lines)
Lines 470-479 def applet_factory(applet, iid): Link Here
470
		widget "*.browser-bookmarks-menu" style "browser-bookmarks-menubar-style"''')
470
		widget "*.browser-bookmarks-menu" style "browser-bookmarks-menubar-style"''')
471
	
471
	
472
	root_menu = gtk.Menu()
472
	root_menu = gtk.Menu()
473
	tooltips = gtk.Tooltips()
474
	tooltips.enable()
473
475
474
	bookmarks_info = get_bookmarks()
476
	bookmarks_info = get_bookmarks()
475
	handle = gnomevfs.monitor_add(bookmarks_info[0], gnomevfs.MONITOR_FILE, on_bookmarks_file_changed, (root_menu, bookmarks_info))
477
	handle = gnomevfs.monitor_add(bookmarks_info[0], gnomevfs.MONITOR_FILE, on_bookmarks_file_changed, (root_menu, bookmarks_info, tooltips))
476
	gobject.idle_add(on_bookmarks_file_changed, None, None, gnomevfs.MONITOR_EVENT_CHANGED, (root_menu, bookmarks_info))
478
	gobject.idle_add(on_bookmarks_file_changed, None, None, gnomevfs.MONITOR_EVENT_CHANGED, (root_menu, bookmarks_info, tooltips))
477
479
478
	root_menu_item = gtk.MenuItem("Bookmarks")
480
	root_menu_item = gtk.MenuItem("Bookmarks")
479
	root_menu_item.set_name("browser-bookmarks-menu")
481
	root_menu_item.set_name("browser-bookmarks-menu")
Lines 484-489 def applet_factory(applet, iid): Link Here
484
	menubar.connect("button-press-event", on_menubar_click)
486
	menubar.connect("button-press-event", on_menubar_click)
485
	menubar.connect("size-allocate", on_menubar_size_allocate)
487
	menubar.connect("size-allocate", on_menubar_size_allocate)
486
	menubar.append(root_menu_item)
488
	menubar.append(root_menu_item)
489
	tooltips.set_tip(menubar, "Access web browser bookmarks")
487
490
488
	applet.add(menubar)
491
	applet.add(menubar)
489
	applet.connect("destroy", on_applet_destroy, None)
492
	applet.connect("destroy", on_applet_destroy, None)
Lines 506-514 def applet_factory(applet, iid): Link Here
506
	return True
509
	return True
507
510
508
511
509
def fill_root_menu(menu, info):
512
def fill_root_menu(menu, info, tooltips):
510
	tooltips = gtk.Tooltips()
511
	tooltips.enable()
512
	(bookmarks_file, bookmarks_func, bookmarks_editor_text, bookmarks_editor_cmd, favicons_call) = info
513
	(bookmarks_file, bookmarks_func, bookmarks_editor_text, bookmarks_editor_cmd, favicons_call) = info
513
	if bookmarks_editor_cmd is not None:
514
	if bookmarks_editor_cmd is not None:
514
		menu_item = gtk.ImageMenuItem(bookmarks_editor_text)
515
		menu_item = gtk.ImageMenuItem(bookmarks_editor_text)
Lines 635-643 def on_menubar_click(widget, event): Link Here
635
def on_bookmarks_file_changed(monitorUri, infoUri, eventType, data):
636
def on_bookmarks_file_changed(monitorUri, infoUri, eventType, data):
636
	if eventType != gnomevfs.MONITOR_EVENT_CHANGED:
637
	if eventType != gnomevfs.MONITOR_EVENT_CHANGED:
637
		return
638
		return
638
	menu, info = data
639
	menu, info, tooltips = data
639
	menu.foreach(lambda x: menu.remove(x))
640
	menu.foreach(lambda x: menu.remove(x))
640
	fill_root_menu(menu, info)
641
	fill_root_menu(menu, info, tooltips)
641
	menu.show_all()
642
	menu.show_all()
642
643
643
644

Return to bug 105635