Index: rhythmdb/rhythmdb.c
===================================================================
--- rhythmdb/rhythmdb.c	(revisjon 6012)
+++ rhythmdb/rhythmdb.c	(arbeidskopi)
@@ -4604,7 +4604,7 @@
 	mount_point = rb_uri_get_mount_point (realuri);
 	if (mount_point != NULL) {
 		g_value_init (&value, G_TYPE_STRING);
-		g_value_set_string_take_ownership (&value, mount_point);
+		g_value_take_string (&value, mount_point);
 		rhythmdb_entry_set_internal (db, entry, FALSE,
 					     RHYTHMDB_PROP_MOUNTPOINT,
 					     &value);
Index: shell/rb-shell-player.c
===================================================================
--- shell/rb-shell-player.c	(revisjon 6012)
+++ shell/rb-shell-player.c	(arbeidskopi)
@@ -1344,7 +1344,7 @@
 		char *play_order = eel_gconf_get_string (CONF_STATE_PLAY_ORDER);
 		if (!play_order)
 			play_order = g_strdup ("linear");
-		g_value_set_string_take_ownership (value, play_order);
+		g_value_take_string (value, play_order);
 		break;
 	}
 	case PROP_PLAYING:
Index: plugins/daap/rb-daap-connection.c
===================================================================
--- plugins/daap/rb-daap-connection.c	(revisjon 6012)
+++ plugins/daap/rb-daap-connection.c	(arbeidskopi)
@@ -370,7 +370,7 @@
 		gchar hash[33] = {0};
 		gchar *no_daap_path = (gchar *)path;
 
-		if (g_strncasecmp (path, "daap://", 7) == 0) {
+		if (g_ascii_strncasecmp (path, "daap://", 7) == 0) {
 			no_daap_path = strstr (path, "/data");
 		}
 
@@ -1650,7 +1650,7 @@
 
 	priv->request_id++;
 
-	if (g_strncasecmp (uri, "daap://", 7) == 0) {
+	if (g_ascii_strncasecmp (uri, "daap://", 7) == 0) {
 		norb_daap_uri = strstr (uri, "/data");
 	}
 
Index: plugins/daap/rb-daap-src.c
===================================================================
--- plugins/daap/rb-daap-src.c	(revisjon 6012)
+++ plugins/daap/rb-daap-src.c	(arbeidskopi)
@@ -558,7 +558,7 @@
 			len_str = soup_message_headers_get (header_table, "Content-Length");
 
 			if (enc_str) {
-				if (g_strcasecmp (enc_str, "chunked") == 0) {
+				if (g_ascii_strcasecmp (enc_str, "chunked") == 0) {
 					src->chunked = TRUE;
 				} else {
 					GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL),
Index: plugins/audiocd/sj-metadata-musicbrainz3.c
===================================================================
--- plugins/audiocd/sj-metadata-musicbrainz3.c	(revisjon 6012)
+++ plugins/audiocd/sj-metadata-musicbrainz3.c	(arbeidskopi)
@@ -220,7 +220,7 @@
   char *id = NULL;
   char buffer[512];
   int i;
-  g_return_val_if_fail (SJ_IS_METADATA_MUSICBRAINZ3 (metadata), FALSE);
+  g_return_val_if_fail (SJ_IS_METADATA_MUSICBRAINZ3 (metadata), NULL);
 
   priv = GET_PRIVATE (metadata);
 
Index: plugins/audiocd/sj-metadata.c
===================================================================
--- plugins/audiocd/sj-metadata.c	(revisjon 6012)
+++ plugins/audiocd/sj-metadata.c	(arbeidskopi)
@@ -18,6 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include <glib-object.h>
 #include <glib/gi18n.h>
 #include <stdlib.h>
