rpms/libreport
7
0
Fork 0
Code Issues Pull Requests Releases Activity
d24c0df77b
libreport/SOURCES/0002-Remove-option-to-screencast-problems.patch
CentOS Sources a57bfabc35 import libreport-2.9.5-6.el8
2021-10-08 13:01:00 +00:00

178 lines
6.9 KiB
Diff
Raw Blame History

From 602124e481d700e334de20418b94b2fdf015c834 Mon Sep 17 00:00:00 2001
From: Martin Kutlak <mkutlak@redhat.com>
Date: Mon, 9 Jul 2018 10:45:37 +0200
Subject: [PATCH] Remove option to screencast problems
The fros package is broken and hasn't been maintained for quite some time.
closes #104
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
---
libreport.spec.in | 1 -
src/gui-wizard-gtk/wizard.c | 75 ---------------------------------
src/gui-wizard-gtk/wizard.glade | 40 ------------------
3 files changed, 116 deletions(-)
diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c
index b02bc7de..ea49a2ea 100644
--- a/src/gui-wizard-gtk/wizard.c
+++ b/src/gui-wizard-gtk/wizard.c
@@ -127,7 +127,6 @@ static gboolean g_warning_issued;
static GtkSpinner *g_spinner_event_log;
static GtkImage *g_img_process_fail;
-static GtkButton *g_btn_startcast;
static GtkExpander *g_exp_report_log;
static GtkWidget *g_top_most_window;
@@ -3487,7 +3486,6 @@ static void add_pages(void)
g_exp_search = GTK_EXPANDER( gtk_builder_get_object(g_builder, "expander_search"));
g_spinner_event_log = GTK_SPINNER( gtk_builder_get_object(g_builder, "spinner_event_log"));
g_img_process_fail = GTK_IMAGE( gtk_builder_get_object(g_builder, "img_process_fail"));
- g_btn_startcast = GTK_BUTTON( gtk_builder_get_object(g_builder, "btn_startcast"));
g_exp_report_log = GTK_EXPANDER( gtk_builder_get_object(g_builder, "expand_report"));
g_vb_simple_details = GTK_BOX( gtk_builder_get_object(g_builder, "vb_simple_details"));
g_cmb_reproducible = GTK_COMBO_BOX_TEXT(gtk_builder_get_object(g_builder, "cmb_reproducible"));
@@ -3618,59 +3616,6 @@ static void assistant_quit_cb(void *obj, void *data)
g_wnd_assistant = (void *)0xdeadbeaf;
}
-static void on_btn_startcast(GtkWidget *btn, gpointer user_data)
-{
- const char *args[15];
- args[0] = (char *) "fros";
- args[1] = NULL;
-
- pid_t castapp = 0;
- castapp = fork_execv_on_steroids(
- EXECFLG_QUIET,
- (char **)args,
- NULL,
- /*env_vec:*/ NULL,
- g_dump_dir_name,
- /*uid (ignored):*/ 0
- );
- gtk_widget_hide(GTK_WIDGET(g_wnd_assistant));
- /*flush all gui events before we start waitpid
- * otherwise the main window wouldn't hide
- */
- while (gtk_events_pending())
- gtk_main_iteration_do(false);
-
- int status;
- safe_waitpid(castapp, &status, 0);
- problem_data_reload_from_dump_dir();
- update_gui_state_from_problem_data(0 /* don't update the selected event */);
- gtk_widget_show(GTK_WIDGET(g_wnd_assistant));
-}
-
-static bool is_screencast_available()
-{
- const char *args[3];
- args[0] = (char *) "fros";
- args[1] = "--is-available";
- args[2] = NULL;
-
- pid_t castapp = 0;
- castapp = fork_execv_on_steroids(
- EXECFLG_QUIET,
- (char **)args,
- NULL,
- /*env_vec:*/ NULL,
- g_dump_dir_name,
- /*uid (ignored):*/ 0
- );
-
- int status;
- safe_waitpid(castapp, &status, 0);
-
- /* 0 means that it's available */
- return status == 0;
-}
-
void create_assistant(GtkApplication *app, bool expert_mode)
{
g_loaded_texts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
@@ -3805,26 +3750,6 @@ void create_assistant(GtkApplication *app, bool expert_mode)
g_signal_connect(g_btn_add_file, "clicked", G_CALLBACK(on_btn_add_file), NULL);
g_signal_connect(g_btn_detail, "clicked", G_CALLBACK(on_btn_detail), NULL);
- if (is_screencast_available()) {
- /* we need to override the activate-link handler, because we use
- * the link button instead of normal button and if we wouldn't override it
- * gtk would try to run it's defualt action and open the associated URI
- * but since the URI is empty it would complain about it...
- */
- g_signal_connect(g_btn_startcast, "activate-link", G_CALLBACK(on_btn_startcast), NULL);
- }
- else {
- gtk_widget_set_sensitive(GTK_WIDGET(g_btn_startcast), false);
- gtk_widget_set_tooltip_markup(GTK_WIDGET(g_btn_startcast),
- _("In order to enable the built-in screencasting "
- "functionality the package fros-recordmydesktop has to be installed. "
- "Please run the following command if you want to install it."
- "\n\n"
- "<b>su -c \"dnf install fros-recordmydesktop\"</b>"
- ));
- }
-
-
g_signal_connect(g_search_entry_bt, "changed", G_CALLBACK(search_timeout), NULL);
g_signal_connect (g_tv_event_log, "key-press-event", G_CALLBACK (key_press_event), NULL);
diff --git a/src/gui-wizard-gtk/wizard.glade b/src/gui-wizard-gtk/wizard.glade
index 47713370..f0bd2a77 100644
--- a/src/gui-wizard-gtk/wizard.glade
+++ b/src/gui-wizard-gtk/wizard.glade
@@ -506,46 +506,6 @@
<property name="position">4</property>
</packing>
</child>
- <child>
- <object class="GtkBox" id="box3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">If you don't know how to describe it, you can</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLinkButton" id="btn_startcast">
- <property name="label" translatable="yes">add a screencast</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="halign">start</property>
- <property name="relief">none</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
- </child>
</object>
</child>
</object>
--
2.17.1
Reference in New Issue View Git Blame Copy Permalink