[epiphany] ephy-history-service: fix CLEAR signal emission
- From: Xan Lopez <xan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-history-service: fix CLEAR signal emission
- Date: Fri, 31 Aug 2012 15:46:28 +0000 (UTC)
commit c9644b2636ccd87a116f303fd0373c89950629ae
Author: Xan Lopez <xan igalia com>
Date: Fri Aug 31 17:43:50 2012 +0200
ephy-history-service: fix CLEAR signal emission
We were only emitting it if we happened to have a callback method
associated with the history message, that does not make sense.
lib/history/ephy-history-service.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/lib/history/ephy-history-service.c b/lib/history/ephy-history-service.c
index 9c5d72e..64b1760 100644
--- a/lib/history/ephy-history-service.c
+++ b/lib/history/ephy-history-service.c
@@ -425,13 +425,15 @@ ephy_history_service_execute_job_callback (gpointer data)
{
EphyHistoryServiceMessage *message = (EphyHistoryServiceMessage*) data;
- g_assert (message->callback);
+ g_assert (message->callback || message->type == CLEAR);
if (g_cancellable_is_cancelled (message->cancellable)) {
ephy_history_service_message_free (message);
return FALSE;
}
- message->callback (message->service, message->success, message->result, message->user_data);
+
+ if (message->callback)
+ message->callback (message->service, message->success, message->result, message->user_data);
if (message->type == CLEAR)
g_signal_emit (message->service, signals[CLEARED], 0);
@@ -967,7 +969,7 @@ ephy_history_service_process_message (EphyHistoryService *self,
message->result = NULL;
message->success = method (message->service, message->method_argument, &message->result);
- if (message->callback)
+ if (message->callback || message->type == CLEAR)
g_idle_add ((GSourceFunc)ephy_history_service_execute_job_callback, message);
else
ephy_history_service_message_free (message);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]