changeset 2788:b2b920b165ad trunk

[svn] - exclude codes which use session if USE_DBUS is not defined.
author yaz
date Wed, 23 May 2007 21:02:55 -0700
parents e35538325145
children 207225b804f9
files ChangeLog src/audacious/build_stamp.c src/audacious/main.c
diffstat 3 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed May 23 15:45:00 2007 -0700
+++ b/ChangeLog	Wed May 23 21:02:55 2007 -0700
@@ -1,3 +1,11 @@
+2007-05-23 22:45:00 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4600]
+  - add some assertions to chardet_to_utf8() to try to trace bad g_convert() calls
+  
+  trunk/src/audacious/strings.c |    5 +++--
+  1 file changed, 3 insertions(+), 2 deletions(-)
+
+
 2007-05-22 23:55:33 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [4598]
   - reduce startup time.
--- a/src/audacious/build_stamp.c	Wed May 23 15:45:00 2007 -0700
+++ b/src/audacious/build_stamp.c	Wed May 23 21:02:55 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070522-4598";
+const gchar *svn_stamp = "20070523-4600";
--- a/src/audacious/main.c	Wed May 23 15:45:00 2007 -0700
+++ b/src/audacious/main.c	Wed May 23 21:02:55 2007 -0700
@@ -908,6 +908,7 @@
         exit(EXIT_SUCCESS);
     }
 
+#ifdef USE_DBUS
     if (filenames != NULL)
     {
         gint pos = 0;
@@ -1003,6 +1004,7 @@
         if (is_running)
             exit(EXIT_SUCCESS);
     }
+#endif
 }
 
 static void