From 29d12c6484f9be8e5d61e44b5031fb7bb7d1c076 Mon Sep 17 00:00:00 2001 From: "Ira W. Snyder" Date: Wed, 23 Jan 2008 14:00:20 -0800 Subject: [PATCH] [Controller] Rename tilda_controller_delete_window() This renames tilda_controller_delete_window() to tilda_controller_remove_window() to keep with the naming scheme in the TildaWindow class. --- tilda-controller.c | 6 +++--- tilda-controller.h | 2 +- tilda-window.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tilda-controller.c b/tilda-controller.c index aa61823..cf0c23c 100644 --- a/tilda-controller.c +++ b/tilda-controller.c @@ -73,7 +73,7 @@ tilda_controller_add_window (TildaController *self) } gboolean -tilda_controller_delete_window (TildaController *self, gint window_number) +tilda_controller_remove_window (TildaController *self, gint window_number) { debug_enter (); debug_assert (TILDA_IS_CONTROLLER(self)); @@ -101,12 +101,12 @@ tilda_controller_delete_window (TildaController *self, gint window_number) gtk_main_quit (); } - /* We were able to delete the window */ + /* We were able to remove the window */ return TRUE; } } - /* There must have been no window to delete */ + /* There must have been no window to remove */ return FALSE; } diff --git a/tilda-controller.h b/tilda-controller.h index 0982ccb..44e7a2a 100644 --- a/tilda-controller.h +++ b/tilda-controller.h @@ -33,7 +33,7 @@ gboolean tilda_controller_add_window (TildaController *self); // FIXME: needs GE gboolean tilda_controller_quit (TildaController *self, GError **error); /* API */ -gboolean tilda_controller_delete_window (TildaController *self, gint window_number); +gboolean tilda_controller_remove_window (TildaController *self, gint window_number); #endif /* TILDA_CONTROLLER_H */ diff --git a/tilda-window.c b/tilda-window.c index 1ac2a14..ed45af3 100644 --- a/tilda-window.c +++ b/tilda-window.c @@ -77,7 +77,7 @@ tilda_window_close (TildaWindow *self) debug_enter (); debug_assert (TILDA_IS_WINDOW(self)); - tilda_controller_delete_window (TILDA_CONTROLLER(self->controller), self->number); + tilda_controller_remove_window (TILDA_CONTROLLER(self->controller), self->number); return TRUE; } @@ -157,7 +157,7 @@ tilda_window_remove_terminal (TildaWindow *self, gint terminal_number) if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (self->notebook)) < 1) { debug_printf ("no terminals left, closing window %d\n", self->number); - tilda_controller_delete_window (TILDA_CONTROLLER(self->controller), self->number); + tilda_controller_remove_window (TILDA_CONTROLLER(self->controller), self->number); } /* Leave the loop, we're done */ -- 2.25.1