changeset 2484:adc63272c9ff trunk

[svn] - add some debugging assertions to this code
author nenolod
date Wed, 07 Feb 2007 10:23:29 -0800
parents 2f740814b468
children 5ce3c51d4499
files ChangeLog src/audacious/build_stamp.c src/audacious/ui_fileinfopopup.c
diffstat 3 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 07 10:06:49 2007 -0800
+++ b/ChangeLog	Wed Feb 07 10:23:29 2007 -0800
@@ -1,3 +1,10 @@
+2007-02-07 18:06:49 +0000  Jonathan Schleifer <js@h3c.de>
+  revision [3976]
+  (I really hate my shell's escaping, ignore this)
+  trunk/ChangeLog |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2007-02-07 18:05:19 +0000  Jonathan Schleifer <js@h3c.de>
   revision [3974]
   Too much was reverted here. Removing the " around %U would've been sufficient.
--- a/src/audacious/build_stamp.c	Wed Feb 07 10:06:49 2007 -0800
+++ b/src/audacious/build_stamp.c	Wed Feb 07 10:23:29 2007 -0800
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070207-3974";
+const gchar *svn_stamp = "20070207-3976";
--- a/src/audacious/ui_fileinfopopup.c	Wed Feb 07 10:06:49 2007 -0800
+++ b/src/audacious/ui_fileinfopopup.c	Wed Feb 07 10:23:29 2007 -0800
@@ -93,7 +93,7 @@
 {
 	GtkWidget *widget = g_object_get_data(G_OBJECT(filepopup_win), entry_name);
 
-	if (widget == NULL)
+	if (widget == NULL || text == NULL)
 		return;
 
 	gtk_label_set_text(GTK_LABEL(widget), text);
@@ -113,11 +113,17 @@
   gint time;
 
   pl = playlist_get_active();
+
+  g_return_if_fail(pl != NULL);
+
   pos = playlist_get_position(pl);
 
   current_file = playlist_get_filename( pl , pos );
   time = playback_get_time();
 
+  if (current_file == NULL)
+      return FALSE;
+
   if ( ( time != -1 ) &&
        ( length != -1 ) &&
        ( ( current_file != NULL ) && ( tooltip_file != NULL ) &&