changeset 3a8133f1fe2e in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3a8133f1fe2e description: rename some icons so we don't need to check in code if installed iconset has it. Fixes #7445

diffstat:

icons/hicolor/16x16/actions/document-send.png | Bin icons/hicolor/16x16/actions/gajim-upload.png | Bin icons/hicolor/16x16/status/applications-internet.png | Bin icons/hicolor/16x16/status/gajim-earth.png | Bin src/chat_control.py | 2 -- src/groupchat_control.py | 2 -- src/gui_interface.py | 2 -- src/gui_menu_builder.py | 2 -- 8 files changed, 0 insertions(+), 8 deletions(-)

diffs (56 lines):

diff -r 3e88b9a62b75 -r 3a8133f1fe2e icons/hicolor/16x16/actions/document-send.png Binary file icons/hicolor/16x16/actions/document-send.png has changed diff -r 3e88b9a62b75 -r 3a8133f1fe2e icons/hicolor/16x16/actions/gajim-upload.png Binary file icons/hicolor/16x16/actions/gajim-upload.png has changed diff -r 3e88b9a62b75 -r 3a8133f1fe2e icons/hicolor/16x16/status/applications-internet.png Binary file icons/hicolor/16x16/status/applications-internet.png has changed diff -r 3e88b9a62b75 -r 3a8133f1fe2e icons/hicolor/16x16/status/gajim-earth.png Binary file icons/hicolor/16x16/status/gajim-earth.png has changed diff -r 3e88b9a62b75 -r 3a8133f1fe2e src/chat_control.py --- a/src/chat_control.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/chat_control.py Fri Mar 28 21:48:15 2014 +0100 @@ -1535,8 +1535,6 @@ self._send_file_button = self.xml.get_object('send_file_button') # add a special img for send file button pixbuf = gtkgui_helpers.get_icon_pixmap('document-send', quiet=True) - if not pixbuf: - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-upload') img = Gtk.Image.new_from_pixbuf(pixbuf) self._send_file_button.set_image(img) id_ = self._send_file_button.connect('clicked', diff -r 3e88b9a62b75 -r 3a8133f1fe2e src/groupchat_control.py --- a/src/groupchat_control.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/groupchat_control.py Fri Mar 28 21:48:15 2014 +0100 @@ -2597,8 +2597,6 @@ item = xml.get_object('send_file_menuitem') # add a special img for send file menuitem pixbuf = gtkgui_helpers.get_icon_pixmap('document-send', quiet=True) - if not pixbuf: - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-upload') img = Gtk.Image.new_from_pixbuf(pixbuf) item.set_image(img)

diff -r 3e88b9a62b75 -r 3a8133f1fe2e src/gui_interface.py --- a/src/gui_interface.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/gui_interface.py Fri Mar 28 21:48:15 2014 +0100 @@ -2636,8 +2636,6 @@ elif isinstance(pep_obj, pep.UserLocationPEP): icon = gtkgui_helpers.get_icon_pixmap('applications-internet', quiet=True) - if not icon: - icon = gtkgui_helpers.get_icon_pixmap('gajim-earth') return icon

def create_ipython_window(self): diff -r 3e88b9a62b75 -r 3a8133f1fe2e src/gui_menu_builder.py --- a/src/gui_menu_builder.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/gui_menu_builder.py Fri Mar 28 21:48:15 2014 +0100 @@ -260,8 +260,6 @@

# add a special img for send file menuitem pixbuf = gtkgui_helpers.get_icon_pixmap('document-send', quiet=True) - if not pixbuf: - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-upload') img = Gtk.Image.new_from_pixbuf(pixbuf) send_file_menuitem.set_image(img)