#! /bin/sh /usr/share/dpatch/dpatch-run
## use-gtk-statusicon.patch.dpatch by  <divius@divius-pc>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad gajim-0.13.4~/src/gajim.py gajim-0.13.4/src/gajim.py
--- gajim-0.13.4~/src/gajim.py	2010-03-28 13:35:54.000000000 +0400
+++ gajim-0.13.4/src/gajim.py	2010-04-23 14:16:27.767801678 +0400
@@ -3619,21 +3619,10 @@
 		gtkgui_helpers.make_jabber_state_images()
 
 		self.systray_enabled = False
-		self.systray_capabilities = False
-
-		if (os.name == 'nt'):
-			import statusicon
-			self.systray = statusicon.StatusIcon()
-			self.systray_capabilities = True
-		else: # use ours, not GTK+ one
-			# [FIXME: remove this when we migrate to 2.10 and we can do
-			# cool tooltips somehow and (not dying to keep) animation]
-			import systray
-			self.systray_capabilities = systray.HAS_SYSTRAY_CAPABILITIES
-			if self.systray_capabilities:
-				self.systray = systray.Systray()
-			else:
-				gajim.config.set('trayicon', 'never')
+		
+		import statusicon
+		self.systray = statusicon.StatusIcon()
+		self.systray_capabilities = True
 
 		path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png')
 		pix = gtk.gdk.pixbuf_new_from_file(path_to_file)