[epiphany/overview] ephy-overview-store: correctly set the cancellable to NULL
- From: Claudio Saavedra <csaavedra src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/overview] ephy-overview-store: correctly set the cancellable to NULL
- Date: Wed, 15 Aug 2012 08:02:21 +0000 (UTC)
commit ffe48691680356959d598f8cdca7c1cd4ca81956
Author: Claudio Saavedra <csaavedra igalia com>
Date: Tue Aug 14 19:17:29 2012 +0300
ephy-overview-store: correctly set the cancellable to NULL
Previous attempt at doing this was wrong, should squash both changes
later when I rebase the branch again.
lib/widgets/ephy-overview-store.c | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
---
diff --git a/lib/widgets/ephy-overview-store.c b/lib/widgets/ephy-overview-store.c
index 5e425a1..12562ee 100644
--- a/lib/widgets/ephy-overview-store.c
+++ b/lib/widgets/ephy-overview-store.c
@@ -288,28 +288,29 @@ on_snapshot_retrieved_cb (GObject *object,
snapshot = ephy_snapshot_service_get_snapshot_finish (EPHY_SNAPSHOT_SERVICE (object),
res, &error);
- model = gtk_tree_row_reference_get_model (ctx->ref);
- path = gtk_tree_row_reference_get_path (ctx->ref);
- gtk_tree_model_get_iter (model, &iter, path);
- gtk_tree_path_free (path);
-
if (error) {
g_warning ("Error retrieving snapshot: %s\n", error->message);
g_error_free (error);
error = NULL;
- } else if (snapshot && gtk_tree_row_reference_valid (ctx->ref)) {
- framed_snapshot = overview_add_frame (snapshot);
+ } else {
+ model = gtk_tree_row_reference_get_model (ctx->ref);
+ path = gtk_tree_row_reference_get_path (ctx->ref);
+ gtk_tree_model_get_iter (model, &iter, path);
+ gtk_tree_path_free (path);
+ if (snapshot) {
+ framed_snapshot = overview_add_frame (snapshot);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ EPHY_OVERVIEW_STORE_SNAPSHOT, framed_snapshot,
+ -1);
+ g_object_unref (framed_snapshot);
+ g_object_unref (snapshot);
+
+ }
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- EPHY_OVERVIEW_STORE_SNAPSHOT, framed_snapshot,
+ EPHY_OVERVIEW_STORE_SNAPSHOT_CANCELLABLE, NULL,
-1);
- g_object_unref (framed_snapshot);
- g_object_unref (snapshot);
}
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- EPHY_OVERVIEW_STORE_SNAPSHOT_CANCELLABLE, NULL,
- -1);
-
peek_context_free (ctx);
}
@@ -364,8 +365,12 @@ ephy_overview_store_peek_snapshot (EphyOverviewStore *self,
self->priv->default_icon,
-1);
- if (url == NULL || g_strcmp0 (url, "about:blank") == 0)
+ if (url == NULL || g_strcmp0 (url, "about:blank") == 0) {
+ gtk_list_store_set (GTK_LIST_STORE (self), iter,
+ EPHY_OVERVIEW_STORE_SNAPSHOT_CANCELLABLE,
+ NULL, -1);
return;
+ }
cancellable = g_cancellable_new ();
gtk_list_store_set (GTK_LIST_STORE (self), iter,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]