|
 |
4b6aa8 |
From dc5823cdbf0923825c56c650c968ddb466cf26e7 Mon Sep 17 00:00:00 2001
|
|
|
4b6aa8 |
From: Jakub Filak <jfilak@redhat.com>
|
|
|
4b6aa8 |
Date: Wed, 14 Jan 2015 11:54:02 +0100
|
|
|
4b6aa8 |
Subject: [LIBREPORT PATCH 125/125] Do not use 'bool' in OPT_BOOL() macro : it
|
|
|
4b6aa8 |
expects 'int'
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
Resolves: rhbz#1182091
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
|
|
4b6aa8 |
---
|
|
|
4b6aa8 |
src/gui-wizard-gtk/main.c | 6 +++---
|
|
|
4b6aa8 |
src/plugins/reporter-ureport.c | 8 ++++----
|
|
|
4b6aa8 |
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
diff --git a/src/gui-wizard-gtk/main.c b/src/gui-wizard-gtk/main.c
|
|
|
4b6aa8 |
index 44918ec..41a8089 100644
|
|
|
4b6aa8 |
--- a/src/gui-wizard-gtk/main.c
|
|
|
4b6aa8 |
+++ b/src/gui-wizard-gtk/main.c
|
|
|
4b6aa8 |
@@ -117,13 +117,13 @@ static void
|
|
|
4b6aa8 |
activate_wizard(GApplication *app,
|
|
|
4b6aa8 |
gpointer user_data)
|
|
|
4b6aa8 |
{
|
|
|
4b6aa8 |
- create_assistant(GTK_APPLICATION(app), (bool)user_data);
|
|
|
4b6aa8 |
+ create_assistant(GTK_APPLICATION(app), *(int *)user_data);
|
|
|
4b6aa8 |
update_gui_state_from_problem_data(UPDATE_SELECTED_EVENT);
|
|
|
4b6aa8 |
}
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
int main(int argc, char **argv)
|
|
|
4b6aa8 |
{
|
|
|
4b6aa8 |
- bool expert_mode = false;
|
|
|
4b6aa8 |
+ int expert_mode = 0;
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
const char *prgname = "abrt";
|
|
|
4b6aa8 |
abrt_init(argv);
|
|
|
4b6aa8 |
@@ -217,7 +217,7 @@ int main(int argc, char **argv)
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
g_custom_logger = &show_error_as_msgbox;
|
|
|
4b6aa8 |
GtkApplication *app = gtk_application_new("org.freedesktop.libreport.report", G_APPLICATION_NON_UNIQUE);
|
|
|
4b6aa8 |
- g_signal_connect(app, "activate", G_CALLBACK(activate_wizard), (gpointer)expert_mode);
|
|
|
4b6aa8 |
+ g_signal_connect(app, "activate", G_CALLBACK(activate_wizard), (gpointer)&expert_mode);
|
|
|
4b6aa8 |
g_signal_connect(app, "startup", G_CALLBACK(startup_wizard), NULL);
|
|
|
4b6aa8 |
/* Enter main loop */
|
|
|
4b6aa8 |
g_application_run(G_APPLICATION(app), argc, argv);
|
|
|
4b6aa8 |
diff --git a/src/plugins/reporter-ureport.c b/src/plugins/reporter-ureport.c
|
|
|
4b6aa8 |
index 22efb76..e0c2281 100644
|
|
|
4b6aa8 |
--- a/src/plugins/reporter-ureport.c
|
|
|
4b6aa8 |
+++ b/src/plugins/reporter-ureport.c
|
|
|
4b6aa8 |
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
|
|
|
4b6aa8 |
};
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
int ret = 1; /* "failure" (for now) */
|
|
|
4b6aa8 |
- bool insecure = !config.ur_ssl_verify;
|
|
|
4b6aa8 |
+ int insecure = !config.ur_ssl_verify;
|
|
|
4b6aa8 |
const char *conf_file = UREPORT_CONF_FILE_PATH;
|
|
|
4b6aa8 |
const char *arg_server_url = NULL;
|
|
|
4b6aa8 |
const char *client_auth = NULL;
|
|
|
4b6aa8 |
@@ -56,11 +56,11 @@ int main(int argc, char **argv)
|
|
|
4b6aa8 |
GList *auth_items = NULL;
|
|
|
4b6aa8 |
const char *dump_dir_path = ".";
|
|
|
4b6aa8 |
const char *ureport_hash = NULL;
|
|
|
4b6aa8 |
- bool ureport_hash_from_rt = false;
|
|
|
4b6aa8 |
+ int ureport_hash_from_rt = 0;
|
|
|
4b6aa8 |
int rhbz_bug = -1;
|
|
|
4b6aa8 |
- bool rhbz_bug_from_rt = false;
|
|
|
4b6aa8 |
+ int rhbz_bug_from_rt = 0;
|
|
|
4b6aa8 |
const char *email_address = NULL;
|
|
|
4b6aa8 |
- bool email_address_from_env = false;
|
|
|
4b6aa8 |
+ int email_address_from_env = 0;
|
|
|
4b6aa8 |
struct dump_dir *dd = NULL;
|
|
|
4b6aa8 |
struct options program_options[] = {
|
|
|
4b6aa8 |
OPT__VERBOSE(&g_verbose),
|
|
|
4b6aa8 |
--
|
|
|
4b6aa8 |
1.8.3.1
|
|
|
4b6aa8 |
|