From ba8a8fd37326dc06b5f912ba316ac3ce7381252c Mon Sep 17 00:00:00 2001 From: Peter Eisenmann Date: Sun, 5 Nov 2023 13:07:38 +0100 Subject: [PATCH] general: remove eel-debug Oversight from https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1319 where this was forgotten. --- eel/eel-debug.c | 105 ---------------------------------- eel/eel-debug.h | 40 ------------- eel/meson.build | 2 - src/nautilus-file-utilities.c | 1 - src/nautilus-main.c | 4 -- src/nautilus-module.c | 1 - src/nautilus-signaller.c | 1 - 7 files changed, 154 deletions(-) delete mode 100644 eel/eel-debug.c delete mode 100644 eel/eel-debug.h diff --git a/eel/eel-debug.c b/eel/eel-debug.c deleted file mode 100644 index f3d94ec0f..000000000 --- a/eel/eel-debug.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * eel-debug.c: Eel debugging aids. - * - * Copyright (C) 2000, 2001 Eazel, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this program; if not, see . - * - * Author: Darin Adler - */ - -#include -#include "eel-debug.h" - -#include -#include -#include - -typedef struct -{ - gpointer data; - GFreeFunc function; -} ShutdownFunction; - -static GList *shutdown_functions; - -/* Raise a SIGINT signal to get the attention of the debugger. - * When not running under the debugger, we don't want to stop, - * so we ignore the signal for just the moment that we raise it. - */ -static void -eel_stop_in_debugger (void) -{ - void (*saved_handler) (int); - - saved_handler = signal (SIGINT, SIG_IGN); - raise (SIGINT); - signal (SIGINT, saved_handler); -} - -/* Stop in the debugger after running the default log handler. - * This makes certain kinds of messages stop in the debugger - * without making them fatal (you can continue). - */ -static void -log_handler (const char *domain, - GLogLevelFlags level, - const char *message, - gpointer data) -{ - g_log_default_handler (domain, level, message, data); - if ((level & (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING)) != 0) - { - eel_stop_in_debugger (); - } -} - -void -eel_make_warnings_and_criticals_stop_in_debugger (void) -{ - g_log_set_default_handler (log_handler, NULL); -} - -void -eel_debug_shut_down (void) -{ - ShutdownFunction *f; - - while (shutdown_functions != NULL) - { - f = shutdown_functions->data; - shutdown_functions = g_list_remove (shutdown_functions, f); - - f->function (f->data); - g_free (f); - } -} - -void -eel_debug_call_at_shutdown (EelFunction function) -{ - eel_debug_call_at_shutdown_with_data ((GFreeFunc) function, NULL); -} - -void -eel_debug_call_at_shutdown_with_data (GFreeFunc function, - gpointer data) -{ - ShutdownFunction *f; - - f = g_new (ShutdownFunction, 1); - f->data = data; - f->function = function; - shutdown_functions = g_list_prepend (shutdown_functions, f); -} diff --git a/eel/eel-debug.h b/eel/eel-debug.h deleted file mode 100644 index 5d659322b..000000000 --- a/eel/eel-debug.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - eel-debug.h: Eel debugging aids. - - Copyright (C) 2000, 2001 Eazel, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, see . - - Author: Darin Adler -*/ - -#pragma once - -#include - -G_BEGIN_DECLS - -typedef void (* EelFunction) (void); - -void eel_make_warnings_and_criticals_stop_in_debugger (void); - -/* A way to do cleanup at exit for compatibility with shutdown tools - * like the ones in Bonobo. - */ -void eel_debug_shut_down (void); -void eel_debug_call_at_shutdown (EelFunction function); -void eel_debug_call_at_shutdown_with_data (GFreeFunc function, - gpointer data); - -G_END_DECLS \ No newline at end of file diff --git a/eel/meson.build b/eel/meson.build index f24a3807e..2888196d2 100644 --- a/eel/meson.build +++ b/eel/meson.build @@ -1,6 +1,4 @@ libeel_2_sources = [ - 'eel-debug.h', - 'eel-debug.c', 'eel-stock-dialogs.h', 'eel-stock-dialogs.c', 'eel-vfs-extensions.h', diff --git a/src/nautilus-file-utilities.c b/src/nautilus-file-utilities.c index 868181b6a..3b8cc5ce4 100644 --- a/src/nautilus-file-utilities.c +++ b/src/nautilus-file-utilities.c @@ -34,7 +34,6 @@ #include "nautilus-search-directory.h" #include "nautilus-starred-directory.h" #include "nautilus-ui-utilities.h" -#include #include #include #include diff --git a/src/nautilus-main.c b/src/nautilus-main.c index 25aeea90d..7e4779c3e 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -30,8 +30,6 @@ #include "nautilus-application.h" #include "nautilus-resources.h" -#include - #include #include #include @@ -77,7 +75,5 @@ main (int argc, g_object_unref (application); - eel_debug_shut_down (); - return retval; } diff --git a/src/nautilus-module.c b/src/nautilus-module.c index a137d3306..3f1051ba5 100644 --- a/src/nautilus-module.c +++ b/src/nautilus-module.c @@ -23,7 +23,6 @@ #include #include "nautilus-module.h" -#include #include #define NAUTILUS_TYPE_MODULE (nautilus_module_get_type ()) diff --git a/src/nautilus-signaller.c b/src/nautilus-signaller.c index 4020cb205..2e6f9a197 100644 --- a/src/nautilus-signaller.c +++ b/src/nautilus-signaller.c @@ -26,7 +26,6 @@ #include #include "nautilus-signaller.h" -#include typedef GObject NautilusSignaller; typedef GObjectClass NautilusSignallerClass;