changeset 2804:d5c77e670be0 trunk

[svn] - temporal fix for crash in compare_func().
author yaz
date Fri, 25 May 2007 01:35:44 -0700
parents 2d915b3e3e52
children 6295535fbf49
files ChangeLog src/audacious/build_stamp.c src/audacious/pluginenum.c
diffstat 3 files changed, 30 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri May 25 00:28:41 2007 -0700
+++ b/ChangeLog	Fri May 25 01:35:44 2007 -0700
@@ -1,3 +1,12 @@
+2007-05-25 07:28:41 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [4632]
+  - adjust naming scheme of audacious_drct_* to audacious_remote_* by defining macros.
+  
+  trunk/src/audacious/auddrct.c |    7 -------
+  trunk/src/audacious/auddrct.h |   41 ++++++++++++++++++++++++++++++++++++++++-
+  2 files changed, 40 insertions(+), 8 deletions(-)
+
+
 2007-05-24 23:17:12 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [4630]
   - guard v2 module header with G_BEGIN_DECLS and G_END_DECLS
--- a/src/audacious/build_stamp.c	Fri May 25 00:28:41 2007 -0700
+++ b/src/audacious/build_stamp.c	Fri May 25 01:35:44 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070524-4630";
+const gchar *svn_stamp = "20070525-4632";
--- a/src/audacious/pluginenum.c	Fri May 25 00:28:41 2007 -0700
+++ b/src/audacious/pluginenum.c	Fri May 25 01:35:44 2007 -0700
@@ -63,35 +63,50 @@
 inputlist_compare_func(gconstpointer a, gconstpointer b)
 {
     const InputPlugin *ap = a, *bp = b;
-    return strcasecmp(ap->description, bp->description);
+    if(ap->description && bp->description)
+        return strcasecmp(ap->description, bp->description);
+    else
+        return 0;
 }
 
 static gint
 outputlist_compare_func(gconstpointer a, gconstpointer b)
 {
     const OutputPlugin *ap = a, *bp = b;
-    return strcasecmp(ap->description, bp->description);
+    if(ap->description && bp->description)
+        return strcasecmp(ap->description, bp->description);
+    else
+        return 0;
 }
 
 static gint
 effectlist_compare_func(gconstpointer a, gconstpointer b)
 {
     const EffectPlugin *ap = a, *bp = b;
-    return strcasecmp(ap->description, bp->description);
+    if(ap->description && bp->description)
+        return strcasecmp(ap->description, bp->description);
+    else
+        return 0;
 }
 
 static gint
 generallist_compare_func(gconstpointer a, gconstpointer b)
 {
     const GeneralPlugin *ap = a, *bp = b;
-    return strcasecmp(ap->description, bp->description);
+    if(ap->description && bp->description)
+        return strcasecmp(ap->description, bp->description);
+    else
+        return 0;
 }
 
 static gint
 vislist_compare_func(gconstpointer a, gconstpointer b)
 {
     const VisPlugin *ap = a, *bp = b;
-    return strcasecmp(ap->description, bp->description);
+    if(ap->description && bp->description)
+        return strcasecmp(ap->description, bp->description);
+    else
+        return 0;
 }
 
 static gboolean