Matej Habrnal 0b651c
From 783a85a5161335f6722e132cc6fcb030054766e7 Mon Sep 17 00:00:00 2001
Matej Habrnal 0b651c
From: Jakub Filak <jfilak@redhat.com>
Matej Habrnal 0b651c
Date: Wed, 1 Oct 2014 17:14:50 +0200
Matej Habrnal 0b651c
Subject: [PATCH] applet: confirm ignoring of notifications
Matej Habrnal 0b651c
Matej Habrnal 0b651c
and fix a bug in abrt-action-notify
Matej Habrnal 0b651c
Matej Habrnal 0b651c
Related to rhbz#1084031
Matej Habrnal 0b651c
Matej Habrnal 0b651c
Signed-off-by: Jakub Filak <jfilak@redhat.com>
Matej Habrnal 0b651c
---
Matej Habrnal 0b651c
 src/applet/applet.c            | 16 +++++++++++++---
Matej Habrnal 0b651c
 src/plugins/abrt-action-notify |  2 +-
Matej Habrnal 0b651c
 2 files changed, 14 insertions(+), 4 deletions(-)
Matej Habrnal 0b651c
Matej Habrnal 0b651c
diff --git a/src/applet/applet.c b/src/applet/applet.c
Matej Habrnal 0b651c
index 27c5fad..1618d8c 100644
Matej Habrnal 0b651c
--- a/src/applet/applet.c
Matej Habrnal 0b651c
+++ b/src/applet/applet.c
Matej Habrnal 0b651c
@@ -667,9 +667,19 @@ static void action_ignore(NotifyNotification *notification, gchar *action, gpoin
Matej Habrnal 0b651c
 {
Matej Habrnal 0b651c
     problem_info_t *pi = (problem_info_t *)user_data;
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
-    log_debug("Ignoring problem '%s'", problem_info_get_dir(pi));
Matej Habrnal 0b651c
-
Matej Habrnal 0b651c
-    ignored_problems_add_problem_data(g_ignore_set, pi->problem_data);
Matej Habrnal 0b651c
+    const char *const message = _(
Matej Habrnal 0b651c
+            "You are going to mute notifications of a particular problem. " \
Matej Habrnal 0b651c
+            "You will never see a notification bubble for this problem again, " \
Matej Habrnal 0b651c
+            "however, ABRT will be detecting it and you will be able " \
Matej Habrnal 0b651c
+            "to report it from ABRT GUI." \
Matej Habrnal 0b651c
+            "\n\n" \
Matej Habrnal 0b651c
+            "Do you want to continue?");
Matej Habrnal 0b651c
+
Matej Habrnal 0b651c
+    if (run_ask_yes_no_yesforever_dialog("AskIgnoreForever", message, NULL))
Matej Habrnal 0b651c
+    {
Matej Habrnal 0b651c
+        log_debug("Ignoring problem '%s'", problem_info_get_dir(pi));
Matej Habrnal 0b651c
+        ignored_problems_add_problem_data(g_ignore_set, pi->problem_data);
Matej Habrnal 0b651c
+    }
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
     GError *err = NULL;
Matej Habrnal 0b651c
     notify_notification_close(notification, &err;;
Matej Habrnal 0b651c
diff --git a/src/plugins/abrt-action-notify b/src/plugins/abrt-action-notify
Matej Habrnal 0b651c
index cbabf74..8b8f38e 100644
Matej Habrnal 0b651c
--- a/src/plugins/abrt-action-notify
Matej Habrnal 0b651c
+++ b/src/plugins/abrt-action-notify
Matej Habrnal 0b651c
@@ -99,7 +99,7 @@ def emit_crash_dbus_signal(problem_data):
Matej Habrnal 0b651c
         # member is a Boolean flag which is True if the element is required
Matej Habrnal 0b651c
         arguments = ((FILENAME_PACKAGE, True), (CD_DUMPDIR, True),
Matej Habrnal 0b651c
                 (FILENAME_UID, False), (FILENAME_UUID, False),
Matej Habrnal 0b651c
-                (FILENAME_PACKAGE, False))
Matej Habrnal 0b651c
+                (FILENAME_DUPHASH, False))
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
         for elem in arguments:
Matej Habrnal 0b651c
             itm = problem_data.get(elem[0])
Matej Habrnal 0b651c
-- 
Matej Habrnal 0b651c
1.9.3
Matej Habrnal 0b651c