App Of Jaq

Merge lp:~sil/appofjaq/dejonoify into lp:~jonobacon/appofjaq/old-trunk

  1. dejonoify
  2. Merge into old-trunk
Proposed by Stuart Langridge
Status: Needs review
Proposed branch: lp:~sil/appofjaq/dejonoify
Merge into: lp:~jonobacon/appofjaq/old-trunk
Diff against target: 41 lines (+7/-6)
1 file modified
bin/appofjaq (+7/-6)
To merge this branch: bzr merge lp:~sil/appofjaq/dejonoify
Reviewer Review Type Date Requested Status
Jono Bacon Pending
Review via email: mp+21796@code.launchpad.net

Description of the change

No bloody /home/jono paths for images :)

To post a comment you must log in.

Unmerged revisions

29. By Stuart Langridge

De-/home/jono-ify the image URIs

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/appofjaq'
2--- bin/appofjaq 2010-03-13 00:18:30 +0000
3+++ bin/appofjaq 2010-03-21 11:41:28 +0000
4@@ -164,7 +164,8 @@
5 self.ind.set_attention_icon("indicator-messages-new")
6 self.ind.set_icon("distributor-logo")
7
8- self.soj_logo.set_from_file("/home/jono/source/appofjaq/data/media/header.png")
9+ self.soj_logo.set_from_file(
10+ os.path.join(getdatapath(), 'media', 'header.png'))
11
12 self.menu = gtk.Menu()
13 self.parse_shot_feed()
14@@ -348,11 +349,11 @@
15 title = self.latestshot['title']
16 description = self.latestshot['description']
17
18- if newness == "latest":
19- imageURI = "/home/jono/source/bzr/appofjaq/data/media/logo.png"
20+ if newness == "latest":
21+ imageURI = os.path.join(getdatapath(), 'media', 'logo.png')
22 n = pynotify.Notification(_("Latest Shot Of Jaq: ") + title, _("Listen to '%s' in App Of Jaq and join in the conversation!") % title, imageURI)
23 elif newness == "new":
24- imageURI = "/home/jono/source/bzr/appofjaq/data/media/logo.png"
25+ imageURI = os.path.join(getdatapath(), 'media', 'logo.png')
26 n = pynotify.Notification(_("New Shot Of Jaq: ") + title, _("Listen to '%s' in App Of Jaq and join in the conversation!") % title, imageURI)
27
28 n.show()
29@@ -364,10 +365,10 @@
30 break
31
32 if newness == "latest":
33- imageURI = "/home/jono/source/bzr/appofjaq/data/media/logo.png"
34+ imageURI = os.path.join(getdatapath(), 'media', 'logo.png')
35 n = pynotify.Notification("Latest " + title, description[0:350] + "...", imageURI)
36 elif newness == "new":
37- imageURI = "/home/jono/source/bzr/appofjaq/data/media/logo.png"
38+ imageURI = os.path.join(getdatapath(), 'media', 'logo.png')
39 n = pynotify.Notification("New " + title, description[0:350] + "...", imageURI)
40
41 n.show()

Subscribers

People subscribed via source and target branches

to all changes: