[gnome-clocks/wip/cityimages] Simplify code and hide comments
- From: Evgeny Bobkin <ebobkin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-clocks/wip/cityimages] Simplify code and hide comments
- Date: Tue, 17 Sep 2013 07:53:25 +0000 (UTC)
commit 4599969443e127abb608c17a0abdcf058eccdc63
Author: Evgeny Bobkin <evgen ibqn gmail com>
Date: Tue Sep 17 09:52:47 2013 +0200
Simplify code and hide comments
src/providers.vala | 25 ++++++++-----------------
src/world.vala | 2 +-
2 files changed, 9 insertions(+), 18 deletions(-)
---
diff --git a/src/providers.vala b/src/providers.vala
index 727a26f..8522e9c 100644
--- a/src/providers.vala
+++ b/src/providers.vala
@@ -188,7 +188,7 @@ private class FlickrClient : GLib.Object {
foreach (var node in node_list) {
var photo = node.get_object ();
string title = photo.get_string_member ("title");
- stdout.printf (@"$title\n");
+ //stdout.printf (@"$title\n");
if (name == title) {
string image_id = photo.get_string_member ("id");
return image_id;
@@ -214,7 +214,7 @@ private class FlickrClient : GLib.Object {
foreach (var node in node_list) {
var image = node.get_object ();
string label = image.get_string_member ("label");
- stdout.printf (@"$label\n");
+ //stdout.printf (@"$label\n");
if (label == "Original") {
string image_url = image.get_string_member ("source");
return image_url;
@@ -257,28 +257,19 @@ public class FlickrImageProvider : GLib.Object, ImageProvider {
} catch (Error e) {
image = null;
- fetch_image (name);
+ fetch_image (name, (obj, res) => {
+ fetch_image.end (res);
+ });
}
return image;
}
- private void fetch_image (string name) {
- if (flickr_client.group_id != null) {
- receive_image.begin (name, (obj, res) => {
- receive_image.end (res);
- });
- } else {
- flickr_client.notify["group-id"].connect ((sender, property) => {
- receive_image.begin (name, (obj, res) => {
- receive_image.end (res);
- });
- });
- flickr_client.seek_group_id.begin ();
+ private async void fetch_image (string name) {
+ if (flickr_client.group_id == null) {
+ yield flickr_client.seek_group_id ();
}
- }
- private async void receive_image (string name) {
string? image_id = yield flickr_client.seek_image_id (name);
if (image_id == null) {
diff --git a/src/world.vala b/src/world.vala
index 99840e2..62fbe9f 100644
--- a/src/world.vala
+++ b/src/world.vala
@@ -156,7 +156,7 @@ private class Item : Object, ContentItem {
public void update_images (string name) {
if (file_name in name) {
- stdout.printf ("YES");
+ //stdout.printf (@"YES--file name $file_name and name $name\n");
day_pixbuf = image_provider.get_image (file_name + "-day");
scaled_day_pixbuf = day_pixbuf.scale_simple (256, 256, Gdk.InterpType.BILINEAR);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]