From 90cf500b2ff19af27e5352d4f8b2d5f5a2003811 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 1 Dec 2014 12:04:12 +0100 Subject: Fixed libnotify patch --- mozilla-858919-2.patch | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 mozilla-858919-2.patch (limited to 'mozilla-858919-2.patch') diff --git a/mozilla-858919-2.patch b/mozilla-858919-2.patch deleted file mode 100644 index ece5906..0000000 --- a/mozilla-858919-2.patch +++ /dev/null @@ -1,28 +0,0 @@ -# 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