[Goodies-commits] r2879 - in xfce4-cddrive-plugin/trunk: . panel-plugin

[Sylvain Reynal]

Author: syl
Date: 2007-06-29 08:39:05 +0000 (Fri, 29 Jun 2007)
New Revision: 2879

Modified:
   xfce4-cddrive-plugin/trunk/ChangeLog
   xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-audio.c
Log:
fix audio cd infos reading when thread support is disabled

Modified: xfce4-cddrive-plugin/trunk/ChangeLog
===================================================================
--- xfce4-cddrive-plugin/trunk/ChangeLog	2007-06-28 16:51:01 UTC (rev 2878)
+++ xfce4-cddrive-plugin/trunk/ChangeLog	2007-06-29 08:39:05 UTC (rev 2879)
@@ -11,6 +11,7 @@
   - fix bug that disabled the name entry when opening the configuration dialog
     if the "use in tooltip" option was not selected.
   - fix wrong error handling when drive detection fails (bug #3354).
+  - fix audio cd infos reading when thread support is disabled.
 	
 
 2007-04-20	Sylvain Reynal <sreynal at nerim.net>

Modified: xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-audio.c
===================================================================
--- xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-audio.c	2007-06-28 16:51:01 UTC (rev 2878)
+++ xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-audio.c	2007-06-29 08:39:05 UTC (rev 2879)
@@ -464,7 +464,9 @@
       g_static_mutex_unlock (&mutex);
     }
   
+#ifdef HAVE_GTHREAD
   cddb_disc_destroy (cdda);
+#endif
   
   return NULL; /* dummy return value */
 }
@@ -509,9 +511,12 @@
         
 #else
                       /* no thread support, plugin freeze will depend on the connection quality */
-                      /* note: cdda is destroyed in this function */
+                      /* note: cdda is NOT destroyed in this function (disabled with no thread support) */
                       cddrive_audio_cache_infos_from_server (cdda);
-                      res = g_strdup (cddb_disc_get_title (cdda));
+                    
+                      res = cddrive_audio_new_infos (g_strdup (cddb_disc_get_artist (cdda)),
+                                                     g_strdup (cddb_disc_get_title (cdda)));
+                      cddb_disc_destroy (cdda);
 #endif
                     }
                 }