rhythmbox r5836 - in trunk: . plugins/audioscrobbler plugins/ipod plugins/iradio podcast rhythmdb sources widgets

[jmatthew svn gnome org]

Author: jmatthew
Date: Mon Aug  4 12:01:15 2008
New Revision: 5836
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5836&view=rev

Log:
2008-08-04  Jonathan Matthew  <jonathan d14n org>

	* plugins/audioscrobbler/rb-lastfm-source.c:
	(rb_lastfm_source_title_from_uri):
	* plugins/ipod/rb-ipod-source.c: (ipod_get_filename_for_uri):
	* plugins/iradio/rb-iradio-source.c:
	(rb_iradio_source_add_station):
	* plugins/iradio/rb-station-properties-dialog.c:
	(rb_station_properties_dialog_update_location):
	* podcast/rb-feed-podcast-properties-dialog.c:
	(rb_feed_podcast_properties_dialog_update_location):
	* podcast/rb-podcast-properties-dialog.c:
	(rb_podcast_properties_dialog_update_location),
	(rb_podcast_properties_dialog_update_download_location):
	* rhythmdb/rhythmdb.c: (make_access_failed_error):
	* sources/rb-library-source.c:
	(rb_library_source_location_button_clicked_cb),
	(rb_library_source_preferences_sync):
	* widgets/rb-entry-view.c: (rb_entry_view_location_cell_data_func):
	* widgets/rb-query-creator-properties.c:
	(escapedStringCriteriaSetWidgetData):
	* widgets/rb-song-info.c: (rb_song_info_update_location):
	All the g_uri_unescape_string calls were wrong.  We're using it for
	display purposes, so there's no reason to reject any strings.
	Fixes #546203.


Modified:
   trunk/ChangeLog
   trunk/plugins/audioscrobbler/rb-lastfm-source.c
   trunk/plugins/ipod/rb-ipod-source.c
   trunk/plugins/iradio/rb-iradio-source.c
   trunk/plugins/iradio/rb-station-properties-dialog.c
   trunk/podcast/rb-feed-podcast-properties-dialog.c
   trunk/podcast/rb-podcast-properties-dialog.c
   trunk/rhythmdb/rhythmdb.c
   trunk/sources/rb-library-source.c
   trunk/widgets/rb-entry-view.c
   trunk/widgets/rb-query-creator-properties.c
   trunk/widgets/rb-song-info.c

Modified: trunk/plugins/audioscrobbler/rb-lastfm-source.c
==============================================================================
--- trunk/plugins/audioscrobbler/rb-lastfm-source.c	(original)
+++ trunk/plugins/audioscrobbler/rb-lastfm-source.c	Mon Aug  4 12:01:15 2008
@@ -1125,7 +1125,7 @@
 	}
 
 	g_strfreev (data);
-	unesc_title = g_uri_unescape_string (title, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+	unesc_title = g_uri_unescape_string (title, NULL);
 	g_free (title);
 	return unesc_title;
 }

Modified: trunk/plugins/ipod/rb-ipod-source.c
==============================================================================
--- trunk/plugins/ipod/rb-ipod-source.c	(original)
+++ trunk/plugins/ipod/rb-ipod-source.c	Mon Aug  4 12:01:15 2008
@@ -1569,7 +1569,7 @@
 	if (escaped == NULL) {
 		return NULL;
 	}
-	filename = g_uri_unescape_string (escaped, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+	filename = g_uri_unescape_string (escaped, NULL);
 	g_free (escaped);
 	if (filename == NULL) {
 		return NULL;

Modified: trunk/plugins/iradio/rb-iradio-source.c
==============================================================================
--- trunk/plugins/iradio/rb-iradio-source.c	(original)
+++ trunk/plugins/iradio/rb-iradio-source.c	Mon Aug  4 12:01:15 2008
@@ -506,7 +506,7 @@
 	if (title) {
 		fixed_title = rb_make_valid_utf8 (title, '?');
 	} else {
-		fixed_title = g_uri_unescape_string (uri, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+		fixed_title = g_uri_unescape_string (uri, NULL);
 	}
 	g_value_take_string (&val, fixed_title);
 

Modified: trunk/plugins/iradio/rb-station-properties-dialog.c
==============================================================================
--- trunk/plugins/iradio/rb-station-properties-dialog.c	(original)
+++ trunk/plugins/iradio/rb-station-properties-dialog.c	Mon Aug  4 12:01:15 2008
@@ -426,7 +426,7 @@
 	char *unescaped;
 
 	location = rhythmdb_entry_get_string (dialog->priv->current_entry, RHYTHMDB_PROP_LOCATION);
-	unescaped = g_uri_unescape_string (location, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+	unescaped = g_uri_unescape_string (location, NULL);
 	gtk_entry_set_text (GTK_ENTRY (dialog->priv->location), unescaped);
 	g_free (unescaped);
 }

Modified: trunk/podcast/rb-feed-podcast-properties-dialog.c
==============================================================================
--- trunk/podcast/rb-feed-podcast-properties-dialog.c	(original)
+++ trunk/podcast/rb-feed-podcast-properties-dialog.c	Mon Aug  4 12:01:15 2008
@@ -244,7 +244,7 @@
 	char *unescaped;
 
 	location = rhythmdb_entry_get_string (dialog->priv->current_entry, RHYTHMDB_PROP_LOCATION);
-	unescaped = g_uri_unescape_string (location, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+	unescaped = g_uri_unescape_string (location, NULL);
 	gtk_label_set_text (GTK_LABEL (dialog->priv->location), unescaped);
 	g_free (unescaped);
 }

Modified: trunk/podcast/rb-podcast-properties-dialog.c
==============================================================================
--- trunk/podcast/rb-podcast-properties-dialog.c	(original)
+++ trunk/podcast/rb-podcast-properties-dialog.c	Mon Aug  4 12:01:15 2008
@@ -403,7 +403,7 @@
 	char *display;
 
 	location = rhythmdb_entry_get_string (dialog->priv->current_entry, RHYTHMDB_PROP_LOCATION);
-	display = g_uri_unescape_string (location, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+	display = g_uri_unescape_string (location, NULL);
 	gtk_label_set_text (GTK_LABEL (dialog->priv->location), display);
 	g_free (display);
 }
@@ -416,7 +416,7 @@
 	location = rhythmdb_entry_get_string (dialog->priv->current_entry, RHYTHMDB_PROP_MOUNTPOINT);
 	if (location != NULL && location[0] != '\0') {
 		char *display;
-		display = g_uri_unescape_string (location, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+		display = g_uri_unescape_string (location, NULL);
 		gtk_label_set_text (GTK_LABEL (dialog->priv->download_location), display);
 		g_free (display);
 	} else {

Modified: trunk/rhythmdb/rhythmdb.c
==============================================================================
--- trunk/rhythmdb/rhythmdb.c	(original)
+++ trunk/rhythmdb/rhythmdb.c	Mon Aug  4 12:01:15 2008
@@ -593,7 +593,7 @@
 	GError *error;
 
 	/* make sure the URI we put in the error message is valid utf8 */
-	unescaped = g_uri_unescape_string (uri, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+	unescaped = g_uri_unescape_string (uri, NULL);
 	utf8ised = rb_make_valid_utf8 (unescaped, '?');
 
 	error = g_error_new (RHYTHMDB_ERROR,

Modified: trunk/sources/rb-library-source.c
==============================================================================
--- trunk/sources/rb-library-source.c	(original)
+++ trunk/sources/rb-library-source.c	Mon Aug  4 12:01:15 2008
@@ -420,7 +420,7 @@
 			uri = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog));
 		}
 
-		path = g_uri_unescape_string (uri, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+		path = g_uri_unescape_string (uri, NULL);
 
 		gtk_entry_set_text (GTK_ENTRY (source->priv->library_location_entry), path);
 		rb_library_source_library_location_cb (GTK_ENTRY (source->priv->library_location_entry),
@@ -586,7 +586,7 @@
 
 		gtk_widget_set_sensitive (source->priv->library_location_entry, TRUE);
 
-		path = g_uri_unescape_string (list->data, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+		path = g_uri_unescape_string (list->data, NULL);
 		gtk_entry_set_text (GTK_ENTRY (source->priv->library_location_entry), path);
 		g_free (path);
 	} else if (g_slist_length (list) == 0) {

Modified: trunk/widgets/rb-entry-view.c
==============================================================================
--- trunk/widgets/rb-entry-view.c	(original)
+++ trunk/widgets/rb-entry-view.c	Mon Aug  4 12:01:15 2008
@@ -1077,7 +1077,7 @@
 	entry = rhythmdb_query_model_iter_to_entry (data->view->priv->model, iter);
 
 	location = rhythmdb_entry_get_string (entry, data->propid);
-	str = g_uri_unescape_string (location, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+	str = g_uri_unescape_string (location, NULL);
 
 	g_object_set (renderer, "text", str, NULL);
 	g_free (str);

Modified: trunk/widgets/rb-query-creator-properties.c
==============================================================================
--- trunk/widgets/rb-query-creator-properties.c	(original)
+++ trunk/widgets/rb-query-creator-properties.c	Mon Aug  4 12:01:15 2008
@@ -283,7 +283,7 @@
 static void
 escapedStringCriteriaSetWidgetData (GtkWidget *widget, GValue *val)
 {
-	char *text = g_uri_unescape_string (g_value_get_string (val), G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+	char *text = g_uri_unescape_string (g_value_get_string (val), NULL);
 	gtk_entry_set_text (GTK_ENTRY (widget), text);
 	g_free (text);
 }

Modified: trunk/widgets/rb-song-info.c
==============================================================================
--- trunk/widgets/rb-song-info.c	(original)
+++ trunk/widgets/rb-song-info.c	Mon Aug  4 12:01:15 2008
@@ -1109,7 +1109,7 @@
 		char *basename, *dir, *desktopdir;
 
 		basename = g_path_get_basename (text);
-		tmp = g_uri_unescape_string (basename, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+		tmp = g_uri_unescape_string (basename, NULL);
 		g_free (basename);
 		tmp_utf8 = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
 		g_free (tmp);
@@ -1134,7 +1134,7 @@
 
 		dir = g_path_get_dirname (tmp);
 		g_free (tmp);
-		tmp = g_uri_unescape_string (dir, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH);
+		tmp = g_uri_unescape_string (dir, NULL);
 		g_free (dir);
 		tmp_utf8 = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
 		g_free (tmp);