[patch] Backport from upstream

roster_window.py_r10934.patch (text/plain), 995 bytes, created by Bruno 'brubru' Tarquini on 2009-03-20 14:00:24 UTC

Index: trunk/src/roster_window.py
===================================================================
--- trunk/src/roster_window.py (revision 10772)
+++ trunk/src/roster_window.py (revision 10934)
@@ -1000,7 +1000,7 @@
 		and ('artist' in gajim.connections[account].tune \
 		or 'title' in gajim.connections[account].tune):
+			path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
 			self.model[child_iter][C_TUNE_PIXBUF] = \
-				gtk.gdk.pixbuf_new_from_file(
-				'../data/emoticons/static/music.png')
+				gtk.gdk.pixbuf_new_from_file(path)
 		else:
 			self.model[child_iter][C_TUNE_PIXBUF] = None
@@ -1263,6 +1263,6 @@
 		contact = gajim.contacts.get_contact(account, jid)
 		if 'artist' in contact.tune or 'title' in contact.tune:
-			pixbuf = gtk.gdk.pixbuf_new_from_file(
-				'../data/emoticons/static/music.png')
+			path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
+			pixbuf = gtk.gdk.pixbuf_new_from_file(path)
 		else:
 			pixbuf = None