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