From f738313567e28f7b01e0d90df1840fe90d2c30df Mon Sep 17 00:00:00 2001
From: =?utf8?q?Kristoffer=20Gr=C3=B6nlund?=
 <kristoffer.gronlund@purplescout.se>
Date: Sat, 9 Jan 2010 03:14:19 +0100
Subject: [PATCH] Fixed the final two synchronous calls I could find

---
 data/icon_artist.png   |  Bin 606 -> 900 bytes
 jamaui/playerwindow.py |   34 +++++++++++++++++++++-------------
 jamaui/showalbum.py    |    1 -
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/data/icon_artist.png b/data/icon_artist.png
index 29d43a8bcd600196ead5bf16104d3c25cac248be..c7ba2ce5f3f7a2d9add134f93d1f491f5ca485c5 100644
GIT binary patch
delta 853
zcmV-b1FHPq1cV2W7YZN<1^@s62wu22ks&F64c7nw4c7reD4Tcy000McNliru+5rgy
z2n6#fX{-PM0|ZG#K~zY`t=3719Ay*-@L%_AQO8N5(J(HPAyEc5P$;*9xFA9V!9&0p
zQ3+CopooGp2LoatpdR$%L8>khf{NQAcu-tW1W~DjAs9wuKy;#@MiaBmbS4=uZ=flE
zW~#eo9yDEiU-kP}z5nucLrvvLF@kH5;(DyaG(N&E9LUP_OkI!uB^s~59k>toVx(>R
zV%&(kaX)^l186SNydN0~JXC4kUYBEIo)m*U0bl};;3D<460cxuuK<@|EUr&sA3nyX
z*p2Pjfj#m2$AYWQ9OOySz%4izExdq#_b?Ur&SzzMGVc8ZJ3|EP@m)70H)2G6_zF9+
zGHu0Pt8(uie1mm3+>45i#rKz4nYQwz7zm;-!~v|uc#Lj8PRFM!fO-5F*8}l=ZK!Ds
z&tP@P^Q{2<4Sy^J&{#yKoAE{v`5Z=Z9%k`NjBgyj;|AQGmFZ+JBl-s?FcdC-J&1#$
zlrj8`eOZ~#=SlH>fcNC&y<xOdmGyNvgSob~<2ceQz~SIwwzA%bn*!hi{E1cgp(mqd
zWqKmU^mCpRYudK91|JjH5S|&RBX}t%FYxd-wzRE1iI=b~E7Pwrj3Zf@{#ysosEO(c
z+=@3tzQ?g4NN(UdOlM^}^?%}jdN4+^3FqL-;NX1xg|qN3E{z!J9w6d+5>H_eFNaeb
zcptCh5MIT$4vDJ~WUY;-ybHJCs+e(moy2B*7QoYZEl#%mS(zSP3gB^U3<=hm<`C`)
z36I1{HWxr&M6!OHmFY}XMK1<GUGrHy7?FG|cxlF)tjEK_$>(`eY^nl(oL#4;h>fT5
zVHj&DIGL;TxggH!ck-mznJ2|)oe$b;H+E%ZIv?&G#!=Mie+#zfNiovjq4{Y{Wo5c>
zpe$rj-y$MtuYnN6ubtkY735Yk>57<tT@B;;P5?8NtZ8CJ95`K7vx^bUgaMoJkK<}Q
zuv`GEaC4p%<9IaGwz^9|aV(uhmHj6olh#B`j4mgD@X2K{s!7}#L@yh_LJi^BUY@>J
ffJO($FIxWrvpv#6kjIha00000NkvXXu0mjfLfDB0

delta 557
zcmV+|0@D422i^pb7YY~%1^@s6;CDUvks&F63ljhU3ljkVnw%H_000McNliru+5rOq
z1u=XL=g0s60p3YOK~zY`&6U4P!%z^%ufKUiVhB=9#Tu8ki^0J`QE2}I8z&(SR!|UK
zoOCO0I=MLMoWUt^a!n>tRBF4lU5p(J27OkFR03KTBekSWN)-H#d6&D~_dfUHgI|z;
z5EruJ6t_=@X%+wgn^-H=i<@FilzqREJRQwQc4w-g@Bz;SMi);}08x5VFI+!gt=+w9
z#}R)dMTCeUGDJ=Vy(FKDWhu*+YNN6v)<pTMD_{^K(P5hP!yn6&MU_VRZDw$G2?Y=p
z@kdg_DE7b&aH#~5%o8DE2%A{@|3fZ+y_Cvikh~#7<P-`Z%EI*G={)Be(_Wmn#~n@{
zwEzHCFIT?v`rTS!B?kbY!!(<YW+WjlWS!o3EHF-S`v3rXQ!l87!mEbD>rK7Te%4Dr
z_8`YDuTKw7AJ_$U<J_{vRR`UY_oK7NvyHADSZW{AF1L3}hiNuJB=bUC004l01d+^J
z!`?1#jk&hS7Q=dRGab!H3}Pl2#7LcIu7|uZvXHS05No2W8VZk1tXa>ni8a+w_)bji
z<m-p?`Qdr?z4cK)xtHs1XX0~ObvIwx(;}~&I~M4?&&8T3R~wZbYh&kPS;|uZr+|L^
vw#5{iSnI{PSBrvPId}Y{Io;<NUJHBznUeon)|-O{00000NkvXXu0mjfD{b_>

diff --git a/jamaui/playerwindow.py b/jamaui/playerwindow.py
index ea7f76c..fcf9ff3 100644
--- a/jamaui/playerwindow.py
+++ b/jamaui/playerwindow.py
@@ -47,7 +47,7 @@ class PlayerWindow(hildon.StackableWindow):
 
     def __init__(self):
         hildon.StackableWindow.__init__(self)
-        self.set_title("jamaendo")
+        self.set_title("Jamaendo")
 
         PlayerWindow.instance = self
 
@@ -122,27 +122,35 @@ class PlayerWindow(hildon.StackableWindow):
     def create_menu(self):
         self.menu = hildon.AppMenu()
 
-        def to_artist(*args):
+        def to_artist():
             from showartist import ShowArtist
-            track = self.playlist.current()
-            artist = jamaendo.get_artist(int(track.artist_id))
-            wnd = ShowArtist(artist)
-            wnd.show_all()
-        def to_album(*args):
+            try:
+                hildon.hildon_gtk_window_set_progress_indicator(self, 1)
+                track = self.playlist.current()
+                artist = jamaendo.get_artist(int(track.artist_id))
+                wnd = ShowArtist(artist)
+                wnd.show_all()
+            finally:
+                hildon.hildon_gtk_window_set_progress_indicator(self, 0)
+        def to_album():
             from showalbum import ShowAlbum
-            track = self.playlist.current()
-            album = jamaendo.get_album(int(track.album_id))
-            wnd = ShowAlbum(album)
-            wnd.show_all()
+            try:
+                hildon.hildon_gtk_window_set_progress_indicator(self, 1)
+                track = self.playlist.current()
+                album = jamaendo.get_album(int(track.album_id))
+                wnd = ShowAlbum(album)
+                wnd.show_all()
+            finally:
+                hildon.hildon_gtk_window_set_progress_indicator(self, 0)
 
         b = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
         b.set_label("Artist")
-        b.connect("clicked", to_artist)
+        b.connect("clicked", lambda w: gobject.idle_add(to_artist))
         self.menu.append(b)
 
         b = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
         b.set_label("Album")
-        b.connect("clicked", to_album)
+        b.connect("clicked", lambda w: gobject.idle_add(to_album))
         self.menu.append(b)
 
         b = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
diff --git a/jamaui/showalbum.py b/jamaui/showalbum.py
index a1aec5c..7d0eed3 100644
--- a/jamaui/showalbum.py
+++ b/jamaui/showalbum.py
@@ -145,7 +145,6 @@ class ShowAlbum(hildon.StackableWindow):
         if albumid == self.album.ID and size == 300:
             self.cover.set_from_file(cover)
 
-
     def on_add_to_playlist(self, button, user_data=None):
         add_to_playlist(self, self.tracklist)
 
-- 
1.7.9.5