Mercurial > audlegacy-plugins
changeset 89:bb090afdc868 trunk
[svn] - some fixes via alxorlov on the forums
| author | nenolod |
|---|---|
| date | Thu, 12 Oct 2006 05:04:58 -0700 |
| parents | 80a28e538008 |
| children | 77e8e032601b |
| files | ChangeLog src/m3u/m3u.c src/mpg123/fileinfo.c |
| diffstat | 3 files changed, 25 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Oct 07 13:34:06 2006 -0700 +++ b/ChangeLog Thu Oct 12 05:04:58 2006 -0700 @@ -1,3 +1,17 @@ +2006-10-07 20:34:06 +0000 Jonathan Schleifer <js@h3c.de> + revision [176] + - Replace ?= at CFLAGS, CPPFLAGS and CXXFLAGS with += + - Replace ?= at CC, CPP and CXX with = + + The reason for this is that on some systems CC, CFLAGS, CPP, CPPFLAGS, + CXX and CXXFLAGS are set by default and therefore are already set at + this step so that it can happen that the wrong variables are used (or + the ones from the configure script are ignored). + + trunk/mk/rules.mk.in | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + + 2006-10-06 17:51:55 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> revision [174] - mtime=-1 has been introduced to represent "uninitialized".
--- a/src/m3u/m3u.c Sat Oct 07 13:34:06 2006 -0700 +++ b/src/m3u/m3u.c Thu Oct 12 05:04:58 2006 -0700 @@ -42,6 +42,7 @@ parse_extm3u_info(const gchar * info, gchar ** title, gint * length) { gchar *str; + gchar *temp; g_return_if_fail(info != NULL); g_return_if_fail(title != NULL); @@ -64,11 +65,12 @@ *length *= 1000; if ((str = strchr(info, ','))) { - *title = g_strstrip(g_strdup(str + 1)); - if (strlen(*title) < 1) { - g_free(*title); - *title = NULL; - } + temp = g_strstrip(g_strdup(str + 1)); + if (strlen(temp) > 0) + *title = g_locale_to_utf8(temp, -1, NULL, NULL, NULL); + + g_free(temp); + temp = NULL; } }
--- a/src/mpg123/fileinfo.c Sat Oct 07 13:34:06 2006 -0700 +++ b/src/mpg123/fileinfo.c Thu Oct 12 05:04:58 2006 -0700 @@ -767,8 +767,10 @@ if (ptr != NULL) gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(genre_combo)->entry), ptr); - gtk_widget_set_sensitive(GTK_WIDGET(w), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(data), FALSE); + if (w != NULL) + gtk_widget_set_sensitive(GTK_WIDGET(w), FALSE); + if (data != NULL) + gtk_widget_set_sensitive(GTK_WIDGET(data), FALSE); taglib_file_free(taglib_file); taglib_tag_free_strings();