some cleanup in icons folder. Fixes #7455

src/conversation_textview.py

@@ -171,21 +171,9 @@ class ConversationTextview(gobject.GObject):
 
     FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap(
         'gajim-muc_separator')
-    XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no',
+    XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no')
-        quiet=True)
+    XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes')
-    if not XEP0184_WARNING_PIXBUF:
+    MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check')
-        MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
-            'gajim-receipt_missing')
-    XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes',
-        quiet=True)
-    if not XEP0184_RECEIVED_PIXBUF:
-        MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
-            'gajim-receipt_received')
-    MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
-        'gtk-spell-check', quiet=True)
-    if not MESSAGE_CORRECTED_PIXBUF:
-        MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
-            'gajim-message_corrected')
 
     # smooth scroll constants
     MAX_SCROLL_TIME = 0.4 # seconds

src/dialogs.py

@@ -1311,7 +1311,7 @@ class AboutDialog:
 
         dlg.props.wrap_license = True
 
-        pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-about', 128)
+        pixbuf = gtkgui_helpers.get_icon_pixmap('gajim', 128)
 
         dlg.set_logo(pixbuf)
         #here you write your name in the form Name FamilyName <someone@somewhere>

src/gui_interface.py

@@ -662,7 +662,7 @@ class Interface:
                 'key.')
             dialogs.WarningDialog(_('Your passphrase is incorrect'), sectext)
         else:
-            path = gtkgui_helpers.get_icon_path('gajim-warning', 48)
+            path = gtkgui_helpers.get_icon_path('gtk-dialog-warning', 48)
             account = obj.conn.name
             notify.popup('warning', account, account, 'warning', path,
                 _('OpenPGP Passphrase Incorrect'),

src/htmltextview.py

@@ -521,7 +521,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
                     if alt:
                         alt += '\n'
                     alt += _('Loading')
-                    pixbuf = get_icon_pixmap('gajim-receipt_missing')
+                    pixbuf = get_icon_pixmap('gtk-no')
             if mem:
                 # Caveat: GdkPixbuf is known not to be safe to load
                 # images from network... this program is now potentially

src/roster_window.py

@@ -6474,6 +6474,11 @@ class RosterWindow:
         # Add a Separator (self._iter_is_separator() checks on string SEPARATOR)
         liststore.append(['SEPARATOR', None, '', True])
 
+        path = gtkgui_helpers.get_icon_path('gajim-plugins')
+        img = gtk.Image()
+        img.set_from_file(path)
+        self.xml.get_object('plugins_menuitem').set_image(img)
+
         path = gtkgui_helpers.get_icon_path('gajim-kbd_input')
         img = gtk.Image()
         img.set_from_file(path)