Author: js Date: 2009-03-06 23:18:04 +0100 (Fri, 06 Mar 2009) New Revision: 11145

Modified: branches/osx_newbuildsys/src/roster_window.py Log: Fix #4854. Seems a merge went wrong there.

Modified: branches/osx_newbuildsys/src/roster_window.py =================================================================== --- branches/osx_newbuildsys/src/roster_window.py 2009-03-06 21:46:52 UTC (rev 11144) +++ branches/osx_newbuildsys/src/roster_window.py 2009-03-06 22:18:04 UTC (rev 11145) @@ -999,8 +999,8 @@ and ('artist' in gajim.connections[account].tune \ or 'title' in gajim.connections[account].tune): self.model[child_iter][C_TUNE_PIXBUF] = \ - gtk.gdk.pixbuf_new_from_file( - '../data/emoticons/static/music.png') + gtk.gdk.pixbuf_new_from_file(os.path.join(gajim.DATA_DIR, + 'emoticons', 'static', 'music.png')) else: self.model[child_iter][C_TUNE_PIXBUF] = None

@@ -1261,8 +1261,8 @@ jid = jid.decode('utf-8') 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') + pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(gajim.DATA_DIR, + 'emoticons', 'static', 'music.png')) else: pixbuf = None for child_iter in iters: