Fix 'document-open-recent' icon problem. Fixes #7444

This commit is contained in:
Denis Fomin 2013-09-04 18:01:57 +04:00
parent d88c1fad89
commit d81f296e4c
3 changed files with 13 additions and 8 deletions

View File

@ -833,11 +833,13 @@ class GroupchatControl(ChatControlBase):
request_voice_separator = xml.get_object('request_voice_separator')
if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'):
gtkgui_helpers.add_image_to_menuitem(bookmark_room_menuitem,
'bookmark-new')
img = gtk.Image()
img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU)
bookmark_room_menuitem.set_image(img)
if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'):
gtkgui_helpers.add_image_to_menuitem(history_menuitem,
'document-open-recent')
img = gtk.Image()
img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU)
history_menuitem.set_image(img)
if hide_buttonbar_items:
change_nick_menuitem.hide()

View File

@ -257,8 +257,9 @@ control=None, gc_contact=None, is_anonymous=True):
account)
history_menuitem.connect('activate', roster.on_history, contact, account)
if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'):
gtkgui_helpers.add_image_to_menuitem(history_menuitem,
'document-open-recent')
img = gtk.Image()
img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU)
history_menuitem.set_image(img)
if control:
convert_to_gc_menuitem.connect('activate',

View File

@ -4347,6 +4347,7 @@ class RosterWindow:
w.set_sensitive(True)
def on_view_menu_activate(self, widget):
self.make_menu()
# Hide the show roster menu if we are not in the right windowing mode.
if self.hpaned.get_child2() is not None:
self.xml.get_object('show_roster_menuitem').show()
@ -5241,8 +5242,9 @@ class RosterWindow:
return
history_menuitem = self.xml.get_object('history_menuitem')
if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'):
gtkgui_helpers.add_image_to_menuitem(history_menuitem,
'document-open-recent')
img = gtk.Image()
img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU)
history_menuitem.set_image(img)
new_chat_menuitem = self.xml.get_object('new_chat_menuitem')
single_message_menuitem = self.xml.get_object(
'send_single_message_menuitem')