1
0
mirror of https://github.com/weechat/weechat.git synced 2026-06-25 04:16:38 +02:00

Moved IRC sources from src/irc/ to src/protocols/irc/

This commit is contained in:
Sebastien Helleu
2007-09-20 18:06:38 +02:00
parent a679f70bd1
commit 8ecb7a4d4a
51 changed files with 147 additions and 112 deletions
+2 -1
View File
@@ -798,7 +798,8 @@ AC_OUTPUT([Makefile
doc/sv/Makefile
src/Makefile
src/common/Makefile
src/irc/Makefile
src/protocols/Makefile
src/protocols/irc/Makefile
src/plugins/Makefile
src/plugins/scripts/Makefile
src/plugins/scripts/perl/Makefile
+11 -11
View File
@@ -1,14 +1,14 @@
./src/irc/irc-mode.c
./src/irc/irc-nick.c
./src/irc/irc-server.c
./src/irc/irc-channel.c
./src/irc/irc-commands.c
./src/irc/irc-display.c
./src/irc/irc-send.c
./src/irc/irc-recv.c
./src/irc/irc-dcc.c
./src/irc/irc-ignore.c
./src/irc/irc.h
./src/protocols/irc/irc-mode.c
./src/protocols/irc/irc-nick.c
./src/protocols/irc/irc-server.c
./src/protocols/irc/irc-channel.c
./src/protocols/irc/irc-commands.c
./src/protocols/irc/irc-display.c
./src/protocols/irc/irc-send.c
./src/protocols/irc/irc-recv.c
./src/protocols/irc/irc-dcc.c
./src/protocols/irc/irc-ignore.c
./src/protocols/irc/irc.h
./src/plugins/plugins.c
./src/plugins/plugins.h
./src/plugins/plugins-config.c
+11 -11
View File
@@ -1,15 +1,15 @@
SET(WEECHAT_SOURCES
src/irc/irc-mode.c
src/irc/irc-nick.c
src/irc/irc-server.c
src/irc/irc-channel.c
src/irc/irc-commands.c
src/irc/irc-display.c
src/irc/irc-send.c
src/irc/irc-recv.c
src/irc/irc-dcc.c
src/irc/irc-ignore.c
src/irc/irc.h
src/protocols/irc/irc-mode.c
src/protocols/irc/irc-nick.c
src/protocols/irc/irc-server.c
src/protocols/irc/irc-channel.c
src/protocols/irc/irc-commands.c
src/protocols/irc/irc-display.c
src/protocols/irc/irc-send.c
src/protocols/irc/irc-recv.c
src/protocols/irc/irc-dcc.c
src/protocols/irc/irc-ignore.c
src/protocols/irc/irc.h
src/plugins/plugins.c
src/plugins/plugins.h
src/plugins/plugins-config.c
+2 -2
View File
@@ -104,9 +104,9 @@ IF(NOT DISABLE_PLUGINS)
ENDIF(NOT DISABLE_PLUGINS)
ADD_SUBDIRECTORY( common )
List(APPEND STATIC_LIBS weechat_main)
LIST(APPEND STATIC_LIBS weechat_main)
ADD_SUBDIRECTORY( irc )
ADD_SUBDIRECTORY( protocols )
LIST(APPEND STATIC_LIBS weechat_irc)
IF(NOT DISABLE_PLUGINS)
+1 -1
View File
@@ -14,4 +14,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
SUBDIRS = common irc plugins gui
SUBDIRS = common protocols plugins gui
+1 -1
View File
@@ -29,7 +29,7 @@
#include "weechat.h"
#include "alias.h"
#include "util.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
t_weechat_alias *weechat_alias = NULL;
+1 -1
View File
@@ -20,7 +20,7 @@
#ifndef __WEECHAT_ALIAS_H
#define __WEECHAT_ALIAS_H 1
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
typedef struct t_weechat_alias t_weechat_alias;
+1 -1
View File
@@ -38,7 +38,7 @@
#include "util.h"
#include "weelist.h"
#include "weeconfig.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#include "../gui/gui.h"
#ifdef PLUGINS
+1 -1
View File
@@ -21,7 +21,7 @@
#define __WEECHAT_COMMAND_H 1
#include "weelist.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#include "../gui/gui.h"
#define MAX_ARGS 8192
+1 -1
View File
@@ -39,7 +39,7 @@
#include "util.h"
#include "weelist.h"
#include "weeconfig.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#ifdef PLUGINS
#include "../plugins/plugins.h"
+1 -1
View File
@@ -30,7 +30,7 @@
#include "history.h"
#include "util.h"
#include "weeconfig.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#include "../gui/gui.h"
+1 -1
View File
@@ -31,7 +31,7 @@
#include "log.h"
#include "util.h"
#include "weeconfig.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#include "../gui/gui.h"
+1 -1
View File
@@ -20,7 +20,7 @@
#ifndef __WEECHAT_HOTLIST_H
#define __WEECHAT_HOTLIST_H 1
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#define HOTLIST_LOW 0
#define HOTLIST_MSG 1
+1 -1
View File
@@ -39,7 +39,7 @@
#include "log.h"
#include "utf8.h"
#include "util.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#include "../gui/gui.h"
+1 -1
View File
@@ -65,7 +65,7 @@
#include "utf8.h"
#include "util.h"
#include "weeconfig.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#include "../gui/gui.h"
#ifdef PLUGINS
+1 -1
View File
@@ -43,7 +43,7 @@
#include "log.h"
#include "utf8.h"
#include "util.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#include "../gui/gui.h"
+1 -1
View File
@@ -20,7 +20,7 @@
#ifndef __WEECHAT_CONFIG_H
#define __WEECHAT_CONFIG_H 1
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#define WEECHAT_CONFIG_NAME "weechat.rc"
+1 -1
View File
@@ -40,7 +40,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
ADD_EXECUTABLE(${EXECUTABLE} ${WEECHAT_CURSES_SRC})
INCLUDE_DIRECTORIES(.. ../../common ../../irc ../../plugins)
INCLUDE_DIRECTORIES(.. ../../common ../../protocols/irc ../../plugins)
TARGET_LINK_LIBRARIES(${EXECUTABLE} ${STATIC_LIBS} ${EXTRA_LIBS})
INSTALL(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
+2 -2
View File
@@ -21,7 +21,7 @@ bin_PROGRAMS = weechat-curses
if PLUGINS
weechat_curses_LDADD = ../lib_weechat_gui_common.a \
../../common/lib_weechat_main.a \
../../irc/lib_weechat_irc.a \
../../protocols/irc/lib_weechat_irc.a \
../../plugins/lib_weechat_plugins.a \
$(PLUGINS_LIBS) \
$(NCURSES_LIBS) \
@@ -29,7 +29,7 @@ weechat_curses_LDADD = ../lib_weechat_gui_common.a \
else
weechat_curses_LDADD = ../lib_weechat_gui_common.a \
../../common/lib_weechat_main.a \
../../irc/lib_weechat_irc.a \
../../protocols/irc/lib_weechat_irc.a \
$(PLUGINS_LIBS) \
$(NCURSES_LIBS) \
$(GNUTLS_LFLAGS)
+1 -1
View File
@@ -32,7 +32,7 @@
#include "../../common/utf8.h"
#include "../../common/util.h"
#include "../../common/weeconfig.h"
#include "../../irc/irc.h"
#include "../../protocols/irc/irc.h"
#include "gui-curses.h"
+1 -1
View File
@@ -35,7 +35,7 @@
#include "../../common/utf8.h"
#include "../../common/util.h"
#include "../../common/weeconfig.h"
#include "../../irc/irc.h"
#include "../../protocols/irc/irc.h"
#include "gui-curses.h"
#ifdef PLUGINS
+1 -1
View File
@@ -30,7 +30,7 @@
#include "../../common/utf8.h"
#include "../../common/util.h"
#include "../../common/weeconfig.h"
#include "../../irc/irc.h"
#include "../../protocols/irc/irc.h"
#include "gui-curses.h"
+1 -1
View File
@@ -27,7 +27,7 @@
#include "../../common/weechat.h"
#include "../gui.h"
#include "../../irc/irc.h"
#include "../../protocols/irc/irc.h"
#include "gui-curses.h"
+1 -1
View File
@@ -32,7 +32,7 @@ IF(PKG_CONFIG_FOUND)
ENDIF(PKG_CONFIG_FOUND)
ADD_EXECUTABLE(${EXECUTABLE} ${WEECHAT_GTK_SRC})
INCLUDE_DIRECTORIES(.. ../../common ../../irc ../../plugins)
INCLUDE_DIRECTORIES(.. ../../common ../../protocols/irc ../../plugins)
TARGET_LINK_LIBRARIES(${EXECUTABLE} ${STATIC_LIBS} ${EXTRA_LIBS})
INSTALL(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
+2 -2
View File
@@ -21,7 +21,7 @@ bin_PROGRAMS = weechat-gtk
if PLUGINS
weechat_gtk_LDADD = ../lib_weechat_gui_common.a \
../../common/lib_weechat_main.a \
../../irc/lib_weechat_irc.a \
../../protocols/irc/lib_weechat_irc.a \
../../plugins/lib_weechat_plugins.a \
$(PLUGINS_LIBS) \
$(GTK_LIBS) \
@@ -29,7 +29,7 @@ weechat_gtk_LDADD = ../lib_weechat_gui_common.a \
else
weechat_gtk_LDADD = ../lib_weechat_gui_common.a \
../../common/lib_weechat_main.a \
../../irc/lib_weechat_irc.a \
../../protocols/irc/lib_weechat_irc.a \
$(PLUGINS_LIBS) \
$(GTK_LIBS) \
$(GNUTLS_LFLAGS)
+1 -1
View File
@@ -31,7 +31,7 @@
#include "../gui.h"
#include "../../common/utf8.h"
#include "../../common/weeconfig.h"
#include "../../irc/irc.h"
#include "../../protocols/irc/irc.h"
#include "gui-gtk.h"
+1 -1
View File
@@ -26,7 +26,7 @@
#include "../../common/weechat.h"
#include "../gui.h"
#include "../../common/weeconfig.h"
#include "../../irc/irc.h"
#include "../../protocols/irc/irc.h"
#include "gui-gtk.h"
+2 -2
View File
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* gui-common.c: display functions, used by all GUI */
/* gui-action.c: GUI actions */
#ifdef HAVE_CONFIG_H
@@ -40,7 +40,7 @@
#include "../common/log.h"
#include "../common/utf8.h"
#include "../common/util.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
/*
+2 -2
View File
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* gui-window.c: window functions, used by all GUI */
/* gui-buffer.c: buffer functions, used by all GUI */
#ifdef HAVE_CONFIG_H
@@ -41,7 +41,7 @@
#include "../common/log.h"
#include "../common/utf8.h"
#include "../common/util.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#ifdef PLUGINS
#include "../plugins/plugins.h"
+1 -1
View File
@@ -41,7 +41,7 @@
#include "../common/log.h"
#include "../common/utf8.h"
#include "../common/util.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#ifdef PLUGINS
#include "../plugins/plugins.h"
+1 -1
View File
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* gui-keyboard: keyboard functions (GUI independant) */
/* gui-keyboard: keyboard functions, used by all GUI */
#ifdef HAVE_CONFIG_H
+1 -1
View File
@@ -40,7 +40,7 @@
#include "../common/hotlist.h"
#include "../common/log.h"
#include "../common/utf8.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
t_gui_window *gui_windows = NULL; /* pointer to first window */
+1 -1
View File
@@ -33,7 +33,7 @@
#include "weechat-plugin.h"
#include "plugins-config.h"
#include "../common/util.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
t_plugin_option *plugin_options = NULL;
+1 -1
View File
@@ -39,7 +39,7 @@
#include "../common/utf8.h"
#include "../common/util.h"
#include "../common/weeconfig.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#include "../gui/gui.h"
+1 -1
View File
@@ -40,7 +40,7 @@
#include "../common/log.h"
#include "../common/util.h"
#include "../common/weeconfig.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#include "../gui/gui.h"
+1 -1
View File
@@ -22,7 +22,7 @@
#include "weechat-plugin.h"
#include "plugins-config.h"
#include "../irc/irc.h"
#include "../protocols/irc/irc.h"
#include "../gui/gui.h"
typedef struct t_plugin_irc_color t_plugin_irc_color;
+17
View File
@@ -0,0 +1,17 @@
# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
#
# This program 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.
#
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
ADD_SUBDIRECTORY( irc )
+17
View File
@@ -0,0 +1,17 @@
# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
#
# This program 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.
#
# 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
SUBDIRS = irc
@@ -27,13 +27,13 @@
#include <unistd.h>
#include <string.h>
#include "../common/weechat.h"
#include "../../common/weechat.h"
#include "irc.h"
#include "../common/log.h"
#include "../common/utf8.h"
#include "../common/util.h"
#include "../common/weeconfig.h"
#include "../gui/gui.h"
#include "../../common/log.h"
#include "../../common/utf8.h"
#include "../../common/util.h"
#include "../../common/weeconfig.h"
#include "../../gui/gui.h"
/*
@@ -24,9 +24,9 @@
#include "config.h"
#endif
#include "../common/weechat.h"
#include "../../common/weechat.h"
#include "irc.h"
#include "../common/command.h"
#include "../../common/command.h"
t_irc_command irc_commands[] =
@@ -39,13 +39,13 @@
#include <arpa/inet.h>
#include <netdb.h>
#include "../common/weechat.h"
#include "../../common/weechat.h"
#include "irc.h"
#include "../common/log.h"
#include "../common/hotlist.h"
#include "../common/util.h"
#include "../common/weeconfig.h"
#include "../gui/gui.h"
#include "../../common/log.h"
#include "../../common/hotlist.h"
#include "../../common/util.h"
#include "../../common/weeconfig.h"
#include "../../gui/gui.h"
t_irc_dcc *irc_dcc_list = NULL; /* DCC files & chat list */
@@ -28,11 +28,11 @@
#include <stdio.h>
#include <string.h>
#include "../common/weechat.h"
#include "../../common/weechat.h"
#include "irc.h"
#include "../common/utf8.h"
#include "../common/weeconfig.h"
#include "../gui/gui.h"
#include "../../common/utf8.h"
#include "../../common/weeconfig.h"
#include "../../gui/gui.h"
/*
@@ -26,11 +26,11 @@
#include <stdlib.h>
#include <string.h>
#include "../common/weechat.h"
#include "../../common/weechat.h"
#include "irc.h"
#include "../common/command.h"
#include "../common/log.h"
#include "../common/util.h"
#include "../../common/command.h"
#include "../../common/log.h"
#include "../../common/util.h"
t_irc_ignore *irc_ignore = NULL;
@@ -26,10 +26,10 @@
#include <stdlib.h>
#include <string.h>
#include "../common/weechat.h"
#include "../../common/weechat.h"
#include "irc.h"
#include "../common/util.h"
#include "../gui/gui.h"
#include "../../common/util.h"
#include "../../gui/gui.h"
/*
@@ -27,12 +27,12 @@
#include <string.h>
#include <limits.h>
#include "../common/weechat.h"
#include "../../common/weechat.h"
#include "irc.h"
#include "../common/log.h"
#include "../common/utf8.h"
#include "../common/util.h"
#include "../common/weeconfig.h"
#include "../../common/log.h"
#include "../../common/utf8.h"
#include "../../common/util.h"
#include "../../common/weeconfig.h"
/*
@@ -35,18 +35,18 @@
#include <sys/utsname.h>
#include <regex.h>
#include "../common/weechat.h"
#include "../../common/weechat.h"
#include "irc.h"
#include "../common/alias.h"
#include "../common/command.h"
#include "../common/hotlist.h"
#include "../common/utf8.h"
#include "../common/util.h"
#include "../common/weeconfig.h"
#include "../gui/gui.h"
#include "../../common/alias.h"
#include "../../common/command.h"
#include "../../common/hotlist.h"
#include "../../common/utf8.h"
#include "../../common/util.h"
#include "../../common/weeconfig.h"
#include "../../gui/gui.h"
#ifdef PLUGINS
#include "../plugins/plugins.h"
#include "../../plugins/plugins.h"
#endif
@@ -35,12 +35,12 @@
#include <sys/utsname.h>
#include <regex.h>
#include "../common/weechat.h"
#include "../../common/weechat.h"
#include "irc.h"
#include "../common/command.h"
#include "../common/util.h"
#include "../common/weeconfig.h"
#include "../gui/gui.h"
#include "../../common/command.h"
#include "../../common/util.h"
#include "../../common/weeconfig.h"
#include "../../gui/gui.h"
/*
@@ -42,15 +42,15 @@
#include <gnutls/gnutls.h>
#endif
#include "../common/weechat.h"
#include "../../common/weechat.h"
#include "irc.h"
#include "../common/log.h"
#include "../common/util.h"
#include "../common/weeconfig.h"
#include "../gui/gui.h"
#include "../../common/log.h"
#include "../../common/util.h"
#include "../../common/weeconfig.h"
#include "../../gui/gui.h"
#ifdef PLUGINS
#include "../plugins/plugins.h"
#include "../../plugins/plugins.h"
#endif
+1 -1
View File
@@ -33,7 +33,7 @@
#include <gnutls/gnutls.h>
#endif
#include "../gui/gui.h"
#include "../../gui/gui.h"
#ifndef NI_MAXHOST
#define NI_MAXHOST 256