I just hide() for trayicon clicking and stuff. KISS :P and works everywhere

plugins/gtkgui/roster_window.py

@@ -124,7 +124,7 @@ class roster_window:
 		if user.groups == []:
 			if user.jid.find("@") <= 0:
 				user.groups.append('Agents')
-			else:
+			elif user.groups == []:
 				user.groups.append('general')
 
 		if (user.show == 'offline' or user.show == 'error') and not showOffline\
@@ -922,8 +922,7 @@ class roster_window:
 	def on_gajim_window_delete_event(self, widget, event):
 		"""When we want to close the window"""
 		if self.plugin.systray_visible:
-			self.window.iconify()
-			win.skip_taskbar_hint = True
+			self.window.hide()
 		else:
 			self.quit_gtkgui_plugin()
 		return 1

plugins/gtkgui/systray.py

@@ -175,14 +175,10 @@ class systray:
 		if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1:
 			if len(self.jids) == 0:
 				win = self.plugin.roster.window
-				print 'before', win.is_active()
 				if win.is_active():
-					win.iconify()
-					win.skip_taskbar_hint = True
+					win.hide()
 				else:
 					win.present()
-					win.skip_taskbar_hint = False
-				print 'after', win.is_active()
 			else:
 				account = self.jids[0][0]
 				jid = self.jids[0][1]