[nautilus/wip/oholy/properties-window-critical-fix: 16/16] properties-window: Remove unused parameter
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/oholy/properties-window-critical-fix: 16/16] properties-window: Remove unused parameter
- Date: Thu, 3 Oct 2019 07:44:41 +0000 (UTC)
commit 96729de4f760e752d01f9dee8b3f1b9b7ab2f282
Author: Ondrej Holy <oholy redhat com>
Date: Tue Sep 24 18:25:42 2019 +0200
properties-window: Remove unused parameter
The cancel_destroy_handler parameter is not used by remove_pending()
function. Let's remove it to make the code simpler.
src/nautilus-properties-window.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index f6b2f21a6..9250adbe3 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -200,8 +200,7 @@ static void set_icon (const char *icon_path,
NautilusPropertiesWindow *properties_window);
static void remove_pending (StartupData *data,
gboolean cancel_call_when_ready,
- gboolean cancel_timed_wait,
- gboolean cancel_destroy_handler);
+ gboolean cancel_timed_wait);
static void append_extension_pages (NautilusPropertiesWindow *window);
static void name_field_focus_changed (GObject *object,
@@ -5244,7 +5243,7 @@ properties_window_finish (StartupData *data)
}
cancel_timed_wait = (data->window == NULL && !data->cancelled);
- remove_pending (data, TRUE, cancel_timed_wait, FALSE);
+ remove_pending (data, TRUE, cancel_timed_wait);
startup_data_free (data);
}
@@ -5283,8 +5282,7 @@ cancel_call_when_ready_callback (gpointer key,
static void
remove_pending (StartupData *startup_data,
gboolean cancel_call_when_ready,
- gboolean cancel_timed_wait,
- gboolean cancel_destroy_handler)
+ gboolean cancel_timed_wait)
{
if (cancel_call_when_ready)
{
@@ -5339,7 +5337,7 @@ is_directory_ready_callback (NautilusFile *file,
add_window (new_window);
startup_data->window = new_window;
- remove_pending (startup_data, FALSE, TRUE, TRUE);
+ remove_pending (startup_data, FALSE, TRUE);
gtk_window_present (GTK_WINDOW (new_window));
g_signal_connect(GTK_WIDGET (new_window), "destroy",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]