changeset ced9e59b0e33 in /home/hg/repos/gajim
author: Denis Fomin fominde@gmail.com branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ced9e59b0e33 description: Fix 'document-open-recent' icon problem. Fixes #7444
diffstat:
src/groupchat_control.py | 10 ++++++---- src/gui_menu_builder.py | 5 +++-- src/roster_window.py | 6 ++++-- 3 files changed, 13 insertions(+), 8 deletions(-)
diffs (59 lines):
diff -r 87fc2da42605 -r ced9e59b0e33 src/groupchat_control.py --- a/src/groupchat_control.py Tue Sep 03 21:17:36 2013 +0200 +++ b/src/groupchat_control.py Wed Sep 04 18:01:57 2013 +0400 @@ -833,11 +833,13 @@ 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() diff -r 87fc2da42605 -r ced9e59b0e33 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Tue Sep 03 21:17:36 2013 +0200 +++ b/src/gui_menu_builder.py Wed Sep 04 18:01:57 2013 +0400 @@ -257,8 +257,9 @@ 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', diff -r 87fc2da42605 -r ced9e59b0e33 src/roster_window.py --- a/src/roster_window.py Tue Sep 03 21:17:36 2013 +0200 +++ b/src/roster_window.py Wed Sep 04 18:01:57 2013 +0400 @@ -4347,6 +4347,7 @@ 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 @@ 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')