From 0fd616167ee86562077327695f5f32974e9f5578 Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 27 Oct 2015 20:49:06 +0000 Subject: [PATCH] Removed ui_events module --- Makefile.am | 2 -- src/command/commands.c | 3 +-- src/event/ui_events.c | 42 ------------------------------------------ src/event/ui_events.h | 40 ---------------------------------------- src/ui/core.c | 1 - src/ui/inputwin.c | 1 - src/window_list.c | 1 - 7 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 src/event/ui_events.c delete mode 100644 src/event/ui_events.h diff --git a/Makefile.am b/Makefile.am index 6b5a3928..a00ff6d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,6 @@ core_sources = \ src/xmpp/form.c src/xmpp/form.h \ src/event/server_events.c src/event/server_events.h \ src/event/client_events.c src/event/client_events.h \ - src/event/ui_events.c src/event/ui_events.h \ src/ui/ui.h src/ui/window.c src/ui/window.h src/ui/core.c \ src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \ src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \ @@ -67,7 +66,6 @@ unittest_sources = \ src/window_list.c src/window_list.h \ src/event/server_events.c src/event/server_events.h \ src/event/client_events.c src/event/client_events.h \ - src/event/ui_events.c src/event/ui_events.h \ tests/unittests/xmpp/stub_xmpp.c \ tests/unittests/ui/stub_ui.c \ tests/unittests/log/stub_log.c \ diff --git a/src/command/commands.c b/src/command/commands.c index cb68b6b9..c7cf9340 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -70,7 +70,6 @@ #include "ui/ui.h" #include "window_list.h" #include "event/client_events.h" -#include "event/ui_events.h" static void _update_presence(const resource_presence_t presence, const char *const show, gchar **args); @@ -1498,7 +1497,7 @@ cmd_msg(ProfWin *window, const char *const command, gchar **args) ProfPrivateWin *privwin = wins_get_private(full_jid->str); if (!privwin) { - privwin = ui_ev_new_private_win(full_jid->str); + privwin = ui_new_private_win(full_jid->str); } ui_switch_win((ProfWin*)privwin); diff --git a/src/event/ui_events.c b/src/event/ui_events.c deleted file mode 100644 index 63b7d244..00000000 --- a/src/event/ui_events.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * ui_events.c - * - * Copyright (C) 2012 - 2015 James Booth - * - * This file is part of Profanity. - * - * Profanity is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Profanity 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Profanity. If not, see . - * - * In addition, as a special exception, the copyright holders give permission to - * link the code of portions of this program with the OpenSSL library under - * certain conditions as described in each individual source file, and - * distribute linked combinations including the two. - * - * You must obey the GNU General Public License in all respects for all of the - * code used other than OpenSSL. If you modify file(s) with this exception, you - * may extend this exception to your version of the file(s), but you are not - * obligated to do so. If you do not wish to do so, delete this exception - * statement from your version. If you delete this exception statement from all - * source files in the program, then also delete it here. - * - */ - -#include "ui/ui.h" -#include "window_list.h" - -ProfPrivateWin* -ui_ev_new_private_win(const char *const fulljid) -{ - return ui_new_private_win(fulljid); -} diff --git a/src/event/ui_events.h b/src/event/ui_events.h deleted file mode 100644 index 97fd916a..00000000 --- a/src/event/ui_events.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * ui_events.h - * - * Copyright (C) 2012 - 2015 James Booth - * - * This file is part of Profanity. - * - * Profanity is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Profanity 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Profanity. If not, see . - * - * In addition, as a special exception, the copyright holders give permission to - * link the code of portions of this program with the OpenSSL library under - * certain conditions as described in each individual source file, and - * distribute linked combinations including the two. - * - * You must obey the GNU General Public License in all respects for all of the - * code used other than OpenSSL. If you modify file(s) with this exception, you - * may extend this exception to your version of the file(s), but you are not - * obligated to do so. If you do not wish to do so, delete this exception - * statement from your version. If you delete this exception statement from all - * source files in the program, then also delete it here. - * - */ - -#ifndef UI_EVENTS_H -#define UI_EVENTS_H - -ProfPrivateWin* ui_ev_new_private_win(const char *const fulljid); - -#endif diff --git a/src/ui/core.c b/src/ui/core.c index 0b941b70..ae446969 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -74,7 +74,6 @@ #include "ui/window.h" #include "window_list.h" #include "xmpp/xmpp.h" -#include "event/ui_events.h" static char *win_title; diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c index 21f945f3..038e1dda 100644 --- a/src/ui/inputwin.c +++ b/src/ui/inputwin.c @@ -64,7 +64,6 @@ #include "ui/inputwin.h" #include "ui/window.h" #include "window_list.h" -#include "event/ui_events.h" #include "xmpp/xmpp.h" static WINDOW *inp_win; diff --git a/src/window_list.c b/src/window_list.c index 19c405b4..6e3f85b1 100644 --- a/src/window_list.c +++ b/src/window_list.c @@ -46,7 +46,6 @@ #include "ui/ui.h" #include "ui/statusbar.h" #include "window_list.h" -#include "event/ui_events.h" static GHashTable *windows; static int current;