|
 |
a60cd7 |
From 9bc8bc16ca37d2e5c0caa20649a92dc1ae814051 Mon Sep 17 00:00:00 2001
|
|
|
a60cd7 |
From: Jakub Filak <jfilak@redhat.com>
|
|
|
a60cd7 |
Date: Mon, 24 Feb 2014 11:24:20 +0100
|
|
|
a60cd7 |
Subject: [ABRT PATCH 38/40] stop sending ureports from abrt-applet
|
|
|
a60cd7 |
|
|
|
a60cd7 |
Related to rhbz#1067114
|
|
|
a60cd7 |
|
|
|
a60cd7 |
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
|
|
a60cd7 |
---
|
|
|
a60cd7 |
src/applet/applet.c | 10 ++++++++++
|
|
|
a60cd7 |
1 file changed, 10 insertions(+)
|
|
|
a60cd7 |
|
|
|
a60cd7 |
diff --git a/src/applet/applet.c b/src/applet/applet.c
|
|
|
a60cd7 |
index 131d2ab..6ce400f 100644
|
|
|
a60cd7 |
--- a/src/applet/applet.c
|
|
|
a60cd7 |
+++ b/src/applet/applet.c
|
|
|
a60cd7 |
@@ -49,6 +49,8 @@
|
|
|
a60cd7 |
|
|
|
a60cd7 |
#define GUI_EXECUTABLE "gnome-abrt"
|
|
|
a60cd7 |
|
|
|
a60cd7 |
+#define RHBZ_1067114_NO_UREPORT
|
|
|
a60cd7 |
+
|
|
|
a60cd7 |
enum
|
|
|
a60cd7 |
{
|
|
|
a60cd7 |
/*
|
|
|
a60cd7 |
@@ -90,6 +92,7 @@ static bool is_autoreporting_enabled(void)
|
|
|
a60cd7 |
return get_configured_bool_or_default("AutoreportingEnabled", g_settings_autoreporting);
|
|
|
a60cd7 |
}
|
|
|
a60cd7 |
|
|
|
a60cd7 |
+#ifndef RHBZ_1067114_NO_UREPORT
|
|
|
a60cd7 |
static bool is_ureport_auth_enabled(void)
|
|
|
a60cd7 |
{
|
|
|
a60cd7 |
bool success, auth_enabled;
|
|
|
a60cd7 |
@@ -110,6 +113,7 @@ static bool is_ureport_auth_enabled(void)
|
|
|
a60cd7 |
|
|
|
a60cd7 |
return auth_enabled;
|
|
|
a60cd7 |
}
|
|
|
a60cd7 |
+#endif//RHBZ_1067114_NO_UREPORT
|
|
|
a60cd7 |
|
|
|
a60cd7 |
static const char *get_autoreport_event_name(void)
|
|
|
a60cd7 |
{
|
|
|
a60cd7 |
@@ -118,6 +122,7 @@ static const char *get_autoreport_event_name(void)
|
|
|
a60cd7 |
return configured ? configured : g_settings_autoreporting_event;
|
|
|
a60cd7 |
}
|
|
|
a60cd7 |
|
|
|
a60cd7 |
+#ifndef RHBZ_1067114_NO_UREPORT
|
|
|
a60cd7 |
static void ask_start_autoreporting()
|
|
|
a60cd7 |
{
|
|
|
a60cd7 |
struct strbuf *question = strbuf_new();
|
|
|
a60cd7 |
@@ -156,6 +161,7 @@ static void ask_start_autoreporting()
|
|
|
a60cd7 |
/* must be called immediately, otherwise the data could be lost in case of crash */
|
|
|
a60cd7 |
save_user_settings();
|
|
|
a60cd7 |
}
|
|
|
a60cd7 |
+#endif//RHBZ_1067114_NO_UREPORT
|
|
|
a60cd7 |
|
|
|
a60cd7 |
static bool is_shortened_reporting_enabled()
|
|
|
a60cd7 |
{
|
|
|
a60cd7 |
@@ -632,10 +638,13 @@ static void action_report(NotifyNotification *notification, gchar *action, gpoin
|
|
|
a60cd7 |
problem_info_t *pi = (problem_info_t *)user_data;
|
|
|
a60cd7 |
if (problem_info_get_dir(pi))
|
|
|
a60cd7 |
{
|
|
|
a60cd7 |
+#ifndef RHBZ_1067114_NO_UREPORT
|
|
|
a60cd7 |
if (strcmp(A_REPORT_REPORT, action) == 0)
|
|
|
a60cd7 |
{
|
|
|
a60cd7 |
+#endif//RHBZ_1067114_NO_UREPORT
|
|
|
a60cd7 |
run_report_from_applet(problem_info_get_dir(pi));
|
|
|
a60cd7 |
problem_info_free(pi);
|
|
|
a60cd7 |
+#ifndef RHBZ_1067114_NO_UREPORT
|
|
|
a60cd7 |
}
|
|
|
a60cd7 |
else
|
|
|
a60cd7 |
{
|
|
|
a60cd7 |
@@ -647,6 +656,7 @@ static void action_report(NotifyNotification *notification, gchar *action, gpoin
|
|
|
a60cd7 |
run_event_async(pi, get_autoreport_event_name(),
|
|
|
a60cd7 |
is_shortened_reporting_enabled() ? 0 : REPORT_UNKNOWN_PROBLEM_IMMEDIATELY);
|
|
|
a60cd7 |
}
|
|
|
a60cd7 |
+#endif//RHBZ_1067114_NO_UREPORT
|
|
|
a60cd7 |
}
|
|
|
a60cd7 |
else
|
|
|
a60cd7 |
problem_info_free(pi);
|
|
|
a60cd7 |
--
|
|
|
a60cd7 |
1.8.3.1
|
|
|
a60cd7 |
|