changeset 9c6487d0be7c in /home/hg/repos/gajim

author: Denis Fomin fominde@gmail.com branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=9c6487d0be7c 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 файлов изменено, 13 вставок(+), 8 удалений(-)

различия (59 строк):

diff -r 5eae49e90205 -r 9c6487d0be7c src/groupchat_control.py --- a/src/groupchat_control.py Tue Sep 03 23:29:20 2013 +0400 +++ b/src/groupchat_control.py Wed Sep 04 18:01:57 2013 +0400 @@ -823,11 +823,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 5eae49e90205 -r 9c6487d0be7c src/gui_menu_builder.py --- a/src/gui_menu_builder.py Tue Sep 03 23:29:20 2013 +0400 +++ b/src/gui_menu_builder.py Wed Sep 04 18:01:57 2013 +0400 @@ -254,8 +254,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 5eae49e90205 -r 9c6487d0be7c src/roster_window.py --- a/src/roster_window.py Tue Sep 03 23:29:20 2013 +0400 +++ b/src/roster_window.py Wed Sep 04 18:01:57 2013 +0400 @@ -4331,6 +4331,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() @@ -5219,8 +5220,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')