[rhythmbox] mtp: take a copy of the raw device info before opening (bug #605584)

[Jonathan Matthew <jmatthew src gnome org>]

commit 072b899d4df3d1d180a02eaf0979753e467f2094
Author: Kevin Hester <kevinh geeksville com>
Date:   Tue Dec 29 17:50:39 2009 +1000

    mtp: take a copy of the raw device info before opening (bug #605584)
    
    Since the device is opened asynchronously now, the raw device list could
    be freed before (or while) it happened.  The source now takes a copy of
    the device information and passes that to the device handling thread.

 plugins/mtpdevice/rb-mtp-source.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/plugins/mtpdevice/rb-mtp-source.c b/plugins/mtpdevice/rb-mtp-source.c
index 672bd48..e495a6f 100644
--- a/plugins/mtpdevice/rb-mtp-source.c
+++ b/plugins/mtpdevice/rb-mtp-source.c
@@ -117,7 +117,7 @@ static void prepare_encoder_sink_cb (RBEncoderFactory *factory,
 typedef struct
 {
 	RBMtpThread *device_thread;
-	LIBMTP_raw_device_t *raw_device;
+	LIBMTP_raw_device_t raw_device;
 	GHashTable *entry_map;
 	GHashTable *artwork_request_map;
 	GHashTable *track_transfer_map;
@@ -259,7 +259,11 @@ rb_mtp_source_constructed (GObject *object)
 
 	/* start the device thread */
 	priv->device_thread = rb_mtp_thread_new ();
-	rb_mtp_thread_open_device (priv->device_thread, priv->raw_device, (RBMtpOpenCallback)mtp_device_open_cb, g_object_ref (source), g_object_unref);
+	rb_mtp_thread_open_device (priv->device_thread,
+				   &priv->raw_device,
+				   (RBMtpOpenCallback)mtp_device_open_cb,
+				   g_object_ref (source),
+				   g_object_unref);
 
 	tracks = rb_source_get_entry_view (RB_SOURCE (source));
 	rb_entry_view_append_column (tracks, RB_ENTRY_VIEW_COL_RATING, FALSE);
@@ -312,10 +316,12 @@ rb_mtp_source_set_property (GObject *object,
 			    GParamSpec *pspec)
 {
 	RBMtpSourcePrivate *priv = MTP_SOURCE_GET_PRIVATE (object);
+	LIBMTP_raw_device_t *raw_device;
 
 	switch (prop_id) {
 	case PROP_RAW_DEVICE:
-		priv->raw_device = g_value_get_pointer (value);
+		raw_device = g_value_get_pointer (value);
+		priv->raw_device = *raw_device;
 		break;
 #if !defined(HAVE_GUDEV)
 	case PROP_UDI:
@@ -338,7 +344,7 @@ rb_mtp_source_get_property (GObject *object,
 
 	switch (prop_id) {
 	case PROP_RAW_DEVICE:
-		g_value_set_pointer (value, priv->raw_device);
+		g_value_set_pointer (value, &priv->raw_device);
 		break;
 #if !defined(HAVE_GUDEV)
 	case PROP_UDI: