Merge lp:~rodrigo-moya/libubuntuone/location-property into lp:libubuntuone

[Rodrigo Moya]

Export library path from music store widget

Export library path from music store widget

[lp:~rodrigo-moya/libubuntuone/location-property]

66. By Rodrigo Moya on 2010-03-11

Added new method to Python bindings

[Stuart Langridge (sil)]

Works

review: Approve

=== modified file 'bindings/python/ubuntuone.defs'
--- bindings/python/ubuntuone.defs	2010-02-09 22:54:22 +0000
+++ bindings/python/ubuntuone.defs	2010-03-11 15:37:25 +0000
@@ -24,4 +24,9 @@
   (return-type "GtkWidget*")
 )
 
+(define-method get_library_location
+  (of-object "U1MusicStore")
+  (c-name "u1_music_store_get_library_location")
+  (return-type "const-gchar*")
+)
 
 
=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2010-03-08 16:55:26 +0000
+++ libubuntuone/u1-music-store.c	2010-03-11 15:37:25 +0000
@@ -30,6 +30,8 @@
 #include "syncdaemon.h"
 #include "u1-marshal.h"
 
+#define U1_MUSIC_LIBRARY_LOCATION  ".ubuntuone/Purchased from Ubuntu One"
+
 #define U1_STORE_URL               "/music/login"
 #define U1_LIBRARY_URL             "/music/store/library"
 #define U1_NOT_LOGGED_IN_STORE_URL "/music/store-no-token"
@@ -472,7 +474,7 @@
 			}
 
 			full_path = g_build_filename (g_get_home_dir (),
-						      ".ubuntuone/Purchased from Ubuntu One",
+						      U1_MUSIC_LIBRARY_LOCATION,
 						      prop, NULL);
 
 			download = g_hash_table_lookup (current_downloads, full_path);
@@ -788,3 +790,26 @@
 
 	return (GtkWidget *) music_store;
 }
+
+/**
+ * u1_music_store_get_library_location:
+ * @music_store: A #U1MusicStore object.
+ *
+ * Return the location where purchased music is stored on the user's
+ * computer.
+ *
+ * Return value: Location of the music library.
+ */
+const gchar *
+u1_music_store_get_library_location (U1MusicStore *music_store)
+{
+	static gchar *full_path = NULL;
+
+	if (full_path == NULL) {
+		full_path = g_build_filename (g_get_home_dir (),
+					      U1_MUSIC_LIBRARY_LOCATION,
+					      NULL);
+	}
+
+	return (const gchar *) full_path;
+}
 
=== modified file 'libubuntuone/u1-music-store.h'
--- libubuntuone/u1-music-store.h	2010-03-04 10:04:51 +0000
+++ libubuntuone/u1-music-store.h	2010-03-11 15:37:25 +0000
@@ -52,7 +52,8 @@
 
 GType      u1_music_store_get_type (void);
 
-GtkWidget *u1_music_store_new (void);
+GtkWidget   *u1_music_store_new (void);
+const gchar *u1_music_store_get_library_location (U1MusicStore *music_store);
 
 G_END_DECLS
 
 
=== modified file 'tests/test-music-store.c'
--- tests/test-music-store.c	2010-03-05 12:50:50 +0000
+++ tests/test-music-store.c	2010-03-11 15:37:25 +0000
@@ -66,6 +66,8 @@
 	g_signal_connect (G_OBJECT (music_store), "download-finished", G_CALLBACK (download_finished_cb), NULL);
 	gtk_widget_show (music_store);
 	gtk_container_add (GTK_CONTAINER (window), music_store);
+
+	g_print ("Music library location: %s\n", u1_music_store_get_library_location (music_store));
 	
 	/* Run the application */
 	gtk_widget_show (window);