From b024cf0ab0d2cbfeda58c53dc5cc423f0c1883c5 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 15 Oct 2014 16:41:46 +0200 Subject: Added patches from mozbz#858919 --- mozilla-858919-2.patch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 mozilla-858919-2.patch (limited to 'mozilla-858919-2.patch') diff --git a/mozilla-858919-2.patch b/mozilla-858919-2.patch new file mode 100644 index 0000000..ece5906 --- /dev/null +++ b/mozilla-858919-2.patch @@ -0,0 +1,28 @@ +# HG changeset patch +# Parent 9d66436af432f057f65d16ab9f5871baca4ada78 +# User Martin Stransky +Bug 858919 - Send "alertshow" event for Web Notifications by libnotify, r=?karlt + +diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp +--- a/toolkit/system/gnome/nsAlertsIconListener.cpp ++++ b/toolkit/system/gnome/nsAlertsIconListener.cpp +@@ -175,16 +175,19 @@ nsAlertsIconListener::ShowAlert(GdkPixbu + // different signature, so a marshaller is used instead of a C callback to + // get the user_data (this) in a parseable format. |closure| is created + // with a floating reference, which gets sunk by g_signal_connect_closure(). + GClosure* closure = g_closure_new_simple(sizeof(GClosure), this); + g_closure_set_marshal(closure, notify_closed_marshal); + mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE); + gboolean result = notify_notification_show(mNotification, nullptr); + ++ if (result && mAlertListener) ++ mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get()); ++ + return result ? NS_OK : NS_ERROR_FAILURE; + } + + nsresult + nsAlertsIconListener::StartRequest(const nsAString & aImageUrl) + { + if (mIconRequest) { + // Another icon request is already in flight. Kill it. -- cgit