merge backout branch

THANKS.artists

@@ -2,7 +2,9 @@ Anders Ström
 Christophe Got
 Dennis Craven
 Guillaume Morin
+Gvorcek Spajreh
 Josef Vybíral
 Membris Khan
 Rederick Asher
 Jakub Szypulka
+

gajim.nsi

@@ -286,6 +286,11 @@ Section "sun" SecIconsetsSun
 	File /r "data\iconsets\sun"
 SectionEnd
 
+Section "wroop" SecIconsetsSun
+	SetOutPath "$INSTDIR\data\iconsets"
+	File /r "data\iconsets\wroop"
+SectionEnd
+
 Section "transports" SecIconsetsTransports
 	SetOutPath "$INSTDIR\data\iconsets"
 	File /r "data\iconsets\transports"
@@ -692,6 +697,7 @@ Section "Uninstall"
 	RMDir /r "$INSTDIR\data\iconsets\gota"
 	RMDir /r "$INSTDIR\data\iconsets\jabberbulb"
 	RMDir /r "$INSTDIR\data\iconsets\sun"
+	RMDir /r "$INSTDIR\data\iconsets\wroop"
 	RMDir /r "$INSTDIR\data\iconsets\transports"
 	RMDir "$INSTDIR\data\iconsets"
 	RMDir "$INSTDIR\data"

src/groupchat_control.py

@@ -647,7 +647,7 @@ class GroupchatControl(ChatControlBase):
 		bookmark_separator = xml.get_widget('bookmark_separator')
 		separatormenuitem2 = xml.get_widget('separatormenuitem2')
 
-		if hide_buttonbar_entries:
+		if hide_buttonbar_items:
 			change_nick_menuitem.hide()
 			change_subject_menuitem.hide()
 			bookmark_room_menuitem.hide()