diff options
51 files changed, 147 insertions, 112 deletions
diff --git a/configure.in b/configure.in index 58c8d2e94..8351c8656 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/po/POTFILES.in b/po/POTFILES.in index 106362353..a25d31336 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -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 diff --git a/po/srcfiles.cmake b/po/srcfiles.cmake index 8c368f10d..f78168ed9 100644 --- a/po/srcfiles.cmake +++ b/po/srcfiles.cmake @@ -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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 41f271f7b..343ab8fc4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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) diff --git a/src/Makefile.am b/src/Makefile.am index c424ffd71..af158be4f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 diff --git a/src/common/alias.c b/src/common/alias.c index b08eef96c..4a8919f35 100644 --- a/src/common/alias.c +++ b/src/common/alias.c @@ -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; diff --git a/src/common/alias.h b/src/common/alias.h index 2797a54b0..759330ddd 100644 --- a/src/common/alias.h +++ b/src/common/alias.h @@ -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; diff --git a/src/common/command.c b/src/common/command.c index 059cc8331..337a961a2 100644 --- a/src/common/command.c +++ b/src/common/command.c @@ -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 diff --git a/src/common/command.h b/src/common/command.h index 6734a3bd0..644491dd0 100644 --- a/src/common/command.h +++ b/src/common/command.h @@ -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 diff --git a/src/common/completion.c b/src/common/completion.c index 64bb2e744..f04b35406 100644 --- a/src/common/completion.c +++ b/src/common/completion.c @@ -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" diff --git a/src/common/history.c b/src/common/history.c index e16004ecf..0a682f9e9 100644 --- a/src/common/history.c +++ b/src/common/history.c @@ -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" diff --git a/src/common/hotlist.c b/src/common/hotlist.c index 9671640b9..10e37ece1 100644 --- a/src/common/hotlist.c +++ b/src/common/hotlist.c @@ -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" diff --git a/src/common/hotlist.h b/src/common/hotlist.h index 3b53aa4ae..2d66e7c71 100644 --- a/src/common/hotlist.h +++ b/src/common/hotlist.h @@ -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 diff --git a/src/common/session.c b/src/common/session.c index b1047b612..f74b015e5 100644 --- a/src/common/session.c +++ b/src/common/session.c @@ -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" diff --git a/src/common/weechat.c b/src/common/weechat.c index b15668a7d..60fc100e1 100644 --- a/src/common/weechat.c +++ b/src/common/weechat.c @@ -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 diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c index 2a64c6838..b4f1c8f46 100644 --- a/src/common/weeconfig.c +++ b/src/common/weeconfig.c @@ -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" diff --git a/src/common/weeconfig.h b/src/common/weeconfig.h index 7d4f09100..cac086840 100644 --- a/src/common/weeconfig.h +++ b/src/common/weeconfig.h @@ -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" diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt index 287278a44..667564698 100644 --- a/src/gui/curses/CMakeLists.txt +++ b/src/gui/curses/CMakeLists.txt @@ -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) diff --git a/src/gui/curses/Makefile.am b/src/gui/curses/Makefile.am index 5d2ce7746..8188ce434 100644 --- a/src/gui/curses/Makefile.am +++ b/src/gui/curses/Makefile.am @@ -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) diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c index 4bfeadb36..6f5a0f41a 100644 --- a/src/gui/curses/gui-curses-chat.c +++ b/src/gui/curses/gui-curses-chat.c @@ -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" diff --git a/src/gui/curses/gui-curses-main.c b/src/gui/curses/gui-curses-main.c index 8507440d9..db62058f4 100644 --- a/src/gui/curses/gui-curses-main.c +++ b/src/gui/curses/gui-curses-main.c @@ -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 diff --git a/src/gui/curses/gui-curses-nicklist.c b/src/gui/curses/gui-curses-nicklist.c index ee425116c..d688a5571 100644 --- a/src/gui/curses/gui-curses-nicklist.c +++ b/src/gui/curses/gui-curses-nicklist.c @@ -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" diff --git a/src/gui/curses/gui-curses-panel.c b/src/gui/curses/gui-curses-panel.c index 50aad620d..a73834cf4 100644 --- a/src/gui/curses/gui-curses-panel.c +++ b/src/gui/curses/gui-curses-panel.c @@ -27,7 +27,7 @@ #include "../../common/weechat.h" #include "../gui.h" -#include "../../irc/irc.h" +#include "../../protocols/irc/irc.h" #include "gui-curses.h" diff --git a/src/gui/gtk/CMakeLists.txt b/src/gui/gtk/CMakeLists.txt index 30e3b1d1b..ac5964aee 100644 --- a/src/gui/gtk/CMakeLists.txt +++ b/src/gui/gtk/CMakeLists.txt @@ -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) diff --git a/src/gui/gtk/Makefile.am b/src/gui/gtk/Makefile.am index 1fc3542a8..a84db860c 100644 --- a/src/gui/gtk/Makefile.am +++ b/src/gui/gtk/Makefile.am @@ -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) diff --git a/src/gui/gtk/gui-gtk-chat.c b/src/gui/gtk/gui-gtk-chat.c index 27a7b7d7b..6dae777e4 100644 --- a/src/gui/gtk/gui-gtk-chat.c +++ b/src/gui/gtk/gui-gtk-chat.c @@ -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" diff --git a/src/gui/gtk/gui-gtk-nicklist.c b/src/gui/gtk/gui-gtk-nicklist.c index aaf93c2c2..a1f597cf5 100644 --- a/src/gui/gtk/gui-gtk-nicklist.c +++ b/src/gui/gtk/gui-gtk-nicklist.c @@ -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" diff --git a/src/gui/gui-action.c b/src/gui/gui-action.c index fe365ea6f..59aa40445 100644 --- a/src/gui/gui-action.c +++ b/src/gui/gui-action.c @@ -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" /* diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c index 085cae0ee..50fb7fb96 100644 --- a/src/gui/gui-buffer.c +++ b/src/gui/gui-buffer.c @@ -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" diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c index a988726f7..90d62c27a 100644 --- a/src/gui/gui-common.c +++ b/src/gui/gui-common.c @@ -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" diff --git a/src/gui/gui-keyboard.c b/src/gui/gui-keyboard.c index de5120ac4..25f0ab005 100644 --- a/src/gui/gui-keyboard.c +++ b/src/gui/gui-keyboard.c @@ -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 diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c index f99255e64..62a515537 100644 --- a/src/gui/gui-window.c +++ b/src/gui/gui-window.c @@ -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 */ diff --git a/src/plugins/plugins-config.c b/src/plugins/plugins-config.c index ba9416117..8eb75e332 100644 --- a/src/plugins/plugins-config.c +++ b/src/plugins/plugins-config.c @@ -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; diff --git a/src/plugins/plugins-interface.c b/src/plugins/plugins-interface.c index 255d74155..bbafd9b5c 100644 --- a/src/plugins/plugins-interface.c +++ b/src/plugins/plugins-interface.c @@ -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" diff --git a/src/plugins/plugins.c b/src/plugins/plugins.c index e0bfe734c..58b5bb39a 100644 --- a/src/plugins/plugins.c +++ b/src/plugins/plugins.c @@ -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" diff --git a/src/plugins/plugins.h b/src/plugins/plugins.h index 1e2704c27..03d4a4a46 100644 --- a/src/plugins/plugins.h +++ b/src/plugins/plugins.h @@ -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; diff --git a/src/protocols/CMakeLists.txt b/src/protocols/CMakeLists.txt new file mode 100644 index 000000000..ada49f185 --- /dev/null +++ b/src/protocols/CMakeLists.txt @@ -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 ) diff --git a/src/protocols/Makefile.am b/src/protocols/Makefile.am new file mode 100644 index 000000000..8e8b5c2a7 --- /dev/null +++ b/src/protocols/Makefile.am @@ -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 diff --git a/src/irc/CMakeLists.txt b/src/protocols/irc/CMakeLists.txt index 1942e6ceb..1942e6ceb 100644 --- a/src/irc/CMakeLists.txt +++ b/src/protocols/irc/CMakeLists.txt diff --git a/src/irc/Makefile.am b/src/protocols/irc/Makefile.am index 2670aca85..2670aca85 100644 --- a/src/irc/Makefile.am +++ b/src/protocols/irc/Makefile.am diff --git a/src/irc/irc-channel.c b/src/protocols/irc/irc-channel.c index 37fd63eb4..ab5dfa63d 100644 --- a/src/irc/irc-channel.c +++ b/src/protocols/irc/irc-channel.c @@ -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" /* diff --git a/src/irc/irc-commands.c b/src/protocols/irc/irc-commands.c index e973d5628..762008dd8 100644 --- a/src/irc/irc-commands.c +++ b/src/protocols/irc/irc-commands.c @@ -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[] = diff --git a/src/irc/irc-dcc.c b/src/protocols/irc/irc-dcc.c index 2fc5f2123..6580b7110 100644 --- a/src/irc/irc-dcc.c +++ b/src/protocols/irc/irc-dcc.c @@ -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 */ diff --git a/src/irc/irc-display.c b/src/protocols/irc/irc-display.c index 1c571de38..f1112eaa8 100644 --- a/src/irc/irc-display.c +++ b/src/protocols/irc/irc-display.c @@ -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" /* diff --git a/src/irc/irc-ignore.c b/src/protocols/irc/irc-ignore.c index f80be928d..c7e8b509d 100644 --- a/src/irc/irc-ignore.c +++ b/src/protocols/irc/irc-ignore.c @@ -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; diff --git a/src/irc/irc-mode.c b/src/protocols/irc/irc-mode.c index 246f618b3..766b91b5d 100644 --- a/src/irc/irc-mode.c +++ b/src/protocols/irc/irc-mode.c @@ -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" /* diff --git a/src/irc/irc-nick.c b/src/protocols/irc/irc-nick.c index 9f07c673e..27e5378a8 100644 --- a/src/irc/irc-nick.c +++ b/src/protocols/irc/irc-nick.c @@ -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" /* diff --git a/src/irc/irc-recv.c b/src/protocols/irc/irc-recv.c index 9e78b4515..4e0d195ad 100644 --- a/src/irc/irc-recv.c +++ b/src/protocols/irc/irc-recv.c @@ -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 diff --git a/src/irc/irc-send.c b/src/protocols/irc/irc-send.c index ea3d5edf9..a4d71d498 100644 --- a/src/irc/irc-send.c +++ b/src/protocols/irc/irc-send.c @@ -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" /* diff --git a/src/irc/irc-server.c b/src/protocols/irc/irc-server.c index a3c466762..0c119ceb1 100644 --- a/src/irc/irc-server.c +++ b/src/protocols/irc/irc-server.c @@ -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 diff --git a/src/irc/irc.h b/src/protocols/irc/irc.h index dff2d1fdd..9a94570c3 100644 --- a/src/irc/irc.h +++ b/src/protocols/irc/irc.h @@ -33,7 +33,7 @@ #include <gnutls/gnutls.h> #endif -#include "../gui/gui.h" +#include "../../gui/gui.h" #ifndef NI_MAXHOST #define NI_MAXHOST 256 |