X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fposter%2Fmovie-poster-factory.vala;h=4c74c00799a6062483d08760286bbb7193d437cd;hb=9f39dc2effe951862cb6d3a6e0e0f70438b4beb6;hp=98d0e32d59c303c31cb6438a92a9bb12c6ae9982;hpb=3a5d4195403cbebc6515c6134a26273312a3b973;p=cinaest

diff --git a/src/poster/movie-poster-factory.vala b/src/poster/movie-poster-factory.vala
index 98d0e32..4c74c00 100644
--- a/src/poster/movie-poster-factory.vala
+++ b/src/poster/movie-poster-factory.vala
@@ -36,15 +36,19 @@ namespace MoviePoster {
 				server = conn.get_object ("org.maemo.movieposter.GoogleImages",
 		                                          "/org/maemo/movieposter/GoogleImages",
 		                                          "org.maemo.movieposter.Provider");
-				server.Fetched += this.on_poster_fetched;
+				server.Fetched.connect (this.on_poster_fetched);
 			} catch (Error e) {
 				warning ("Couldn't connect to Google image downloader: %s\n", e.message);
 			}
 			gc = GConf.Client.get_default ();
 
-			download_posters = gc.get_bool ("/apps/cinaest/download_posters");
-        		gc.add_dir ("/apps/cinaest", GConf.ClientPreloadType.ONELEVEL);
-			cxnid = gc.notify_add ("/apps/cinaest/download_posters", on_download_posters_changed);
+			try {
+				download_posters = gc.get_bool ("/apps/cinaest/download_posters");
+        			gc.add_dir ("/apps/cinaest", GConf.ClientPreloadType.ONELEVEL);
+				cxnid = gc.notify_add ("/apps/cinaest/download_posters", on_download_posters_changed);
+			} catch (Error e) {
+				stdout.printf ("Error installing GConf notification: %s\n", e.message);
+			}
 		}
 
 		private static void on_download_posters_changed (GConf.Client gc, uint cxnid, GConf.Entry entry) {
@@ -67,7 +71,7 @@ namespace MoviePoster {
 			} else if (server != null && download_posters) {
 				var request = new Request ();
 
-				request.handle = server.fetch (movie.title.down (), movie.year.to_string (), "movie");
+				request.handle = server.Fetch (movie.title.down (), movie.year.to_string (), "movie");
 				request.movie = movie;
 				request.callback = callback;
 				request.width = 268;
@@ -87,7 +91,7 @@ namespace MoviePoster {
 			} else if (server != null && download_posters) {
 				var request = new Request ();
 
-				request.handle = server.fetch_thumbnail (movie.title.down (), movie.year.to_string (), "movie");
+				request.handle = server.FetchThumbnail (movie.title.down (), movie.year.to_string (), "movie");
 				request.movie = movie;
 				request.callback = callback;
 				request.width = (int) width;
@@ -128,11 +132,10 @@ namespace MoviePoster {
 		}
 
 		public void clear_queue () {
-
-			// FIXME
-			if (server != null)
-				server.unqueue (0);
-
+			if (server != null) {
+				foreach (Request r in requests)
+					server.Unqueue (r.handle);
+			}
 			requests = null;
 		}
 	}
@@ -146,7 +149,7 @@ namespace MoviePoster {
 
 		public void unqueue () {
 			if (Factory.get_instance ().server != null)
-				Factory.get_instance ().server.unqueue (this.handle);
+				Factory.get_instance ().server.Unqueue (this.handle);
 
 			Factory.get_instance ().requests.remove (this);
 		}