=== modified file 'data/glade/cover_prefs_pane.glade'
--- data/glade/cover_prefs_pane.glade	2008-10-29 20:10:27 +0000
+++ data/glade/cover_prefs_pane.glade	2009-09-11 11:21:43 +0000
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Wed Oct 29 10:54:06 2008 -->
+<?xml version="1.0"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="prefs_window">
     <child>
       <widget class="GtkVBox" id="prefs_pane">
@@ -19,9 +19,9 @@
                   <widget class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <property name="shadow_type">etched-in</property>
                     <child>
                       <widget class="GtkTreeView" id="covers/preferred_order">
                         <property name="visible">True</property>
@@ -30,6 +30,9 @@
                       </widget>
                     </child>
                   </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <widget class="GtkLabel" id="label3">
@@ -49,27 +52,6 @@
               </packing>
             </child>
             <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
               <widget class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
                 <child>
@@ -81,6 +63,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -93,9 +76,41 @@
                 </child>
               </widget>
             </child>
+            <child>
+              <widget class="GtkCheckButton" id="covers/automatic_fetching">
+                <property name="label" translatable="yes" comments="TRANSLATORS: Keep the current track visible in playlist">Automatically fetch album cover on playback start</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="draw_indicator">True</property>
+              </widget>
+              <packing>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_padding">11</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>

=== modified file 'xlgui/cover.py'
--- xlgui/cover.py	2009-09-07 19:17:34 +0000
+++ xlgui/cover.py	2009-09-12 00:43:49 +0000
@@ -463,13 +463,27 @@
         self.emit('cover-found', nocover)
         gobject.idle_add(self.image.set_image, xdg.get_data_path('images/nocover.png'))
 
-        try:
-            cov = self.covers.get_cover(self.current_track,
-                update_track=True)
-        except cover.NoCoverFoundException:
-            logger.warning("No covers found")
-            gobject.idle_add(self.image.set_image, xdg.get_data_path('images/nocover.png'))
-            return
+        if (settings.get_option('covers/automatic_fetching', True)):
+            try:
+                cov = self.covers.get_cover(self.current_track,
+                    update_track=True)
+            except cover.NoCoverFoundException:
+                logger.warning("No covers found")
+                gobject.idle_add(self.image.set_image, xdg.get_data_path('images/nocover.png'))
+                return
+        else:
+            try:
+                item = track.get_album_tuple()
+                if item[0] and item[1]: 
+                    cov = self.coverdb.get_cover(item[0], item[1]) 
+            except TypeError: # one of the fields is missing
+                pass
+            except AttributeError:
+                pass
+            
+            if not cov:
+                gobject.idle_add(self.image.set_image, xdg.get_data_path('images/nocover.png'))
+                return
 
         if self.player.current == self.current_track:
             self.image.loc = cov