diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/curses/Makefile.am | 3 | ||||
| -rw-r--r-- | src/gui/curses/gui-display.c | 11 | ||||
| -rw-r--r-- | src/gui/curses/gui-input.c | 7 | ||||
| -rw-r--r-- | src/gui/gtk/Makefile.am | 3 | ||||
| -rw-r--r-- | src/gui/gtk/gui-display.c | 9 | ||||
| -rw-r--r-- | src/gui/gtk/gui-input.c | 7 | ||||
| -rw-r--r-- | src/gui/gui-common.c | 5 |
7 files changed, 31 insertions, 14 deletions
diff --git a/src/gui/curses/Makefile.am b/src/gui/curses/Makefile.am index 7a8aaacc3..d54881329 100644 --- a/src/gui/curses/Makefile.am +++ b/src/gui/curses/Makefile.am @@ -21,6 +21,7 @@ weechat_curses_LDADD = ../../common/lib_weechat_main.a \ ../../irc/lib_weechat_irc.a \ $(CURSES_LIBS) -weechat_curses_SOURCES = ../gui-common.c \ +weechat_curses_SOURCES = ../gui.h \ + ../gui-common.c \ gui-display.c \ gui-input.c diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index 99ab1994c..59b9e75dd 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -19,10 +19,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - /* gui-display.c: display functions for Curses GUI */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <stdio.h> #include <unistd.h> @@ -33,7 +36,7 @@ #include "../../common/weechat.h" #include "../gui.h" -#include "../../common/config.h" +#include "../../common/weeconfig.h" #include "../../irc/irc.h" @@ -302,7 +305,7 @@ gui_draw_window_title (t_gui_window *window) { /* TODO: change this copyright as title? */ mvwprintw (window->win_title, 0, 0, - "%s", WEECHAT_NAME_AND_VERSION " - " WEECHAT_WEBSITE); + "%s", PACKAGE_STRING " - " WEECHAT_WEBSITE); mvwprintw (window->win_title, 0, COLS - strlen (WEECHAT_COPYRIGHT), "%s", WEECHAT_COPYRIGHT); } @@ -1396,7 +1399,7 @@ gui_init () #ifdef __linux__ /* set title for term window, not for console */ if (cfg_look_set_title && (strcmp (getenv ("TERM"), "linux") != 0)) - printf ("\e]2;" WEECHAT_NAME " " WEECHAT_VERSION "\a\e]1;" WEECHAT_NAME " " WEECHAT_VERSION "\a"); + printf ("\e]2;" PACKAGE_NAME " " PACKAGE_VERSION "\a\e]1;" PACKAGE_NAME " " PACKAGE_VERSION "\a"); #endif gui_ready = 1; diff --git a/src/gui/curses/gui-input.c b/src/gui/curses/gui-input.c index 61a5243d5..fb608508e 100644 --- a/src/gui/curses/gui-input.c +++ b/src/gui/curses/gui-input.c @@ -19,10 +19,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - /* gui-input: user input functions for Curses GUI */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <stdio.h> #include <unistd.h> @@ -34,7 +37,7 @@ #include "../../common/weechat.h" #include "../gui.h" -#include "../../common/config.h" +#include "../../common/weeconfig.h" #include "../../common/command.h" #include "../../irc/irc.h" diff --git a/src/gui/gtk/Makefile.am b/src/gui/gtk/Makefile.am index 8f2e52569..126eae3a8 100644 --- a/src/gui/gtk/Makefile.am +++ b/src/gui/gtk/Makefile.am @@ -23,6 +23,7 @@ weechat_gtk_LDADD = ../../common/lib_weechat_main.a \ ../../irc/lib_weechat_irc.a \ $(GTK_LIBS) -weechat_gtk_SOURCES = ../gui-common.c \ +weechat_gtk_SOURCES = ../gui.h \ + ../gui-common.c \ gui-display.c \ gui-input.c diff --git a/src/gui/gtk/gui-display.c b/src/gui/gtk/gui-display.c index d2d12fc39..77e983482 100644 --- a/src/gui/gtk/gui-display.c +++ b/src/gui/gtk/gui-display.c @@ -19,10 +19,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - /* gui-display.c: display functions for Gtk GUI */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <stdio.h> #include <unistd.h> @@ -33,7 +36,7 @@ #include "../../common/weechat.h" #include "../gui.h" -#include "../../common/config.h" +#include "../../common/weeconfig.h" #include "../../irc/irc.h" @@ -577,7 +580,7 @@ void gui_init () { gtk_main_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (gtk_main_window), WEECHAT_NAME_AND_VERSION); + gtk_window_set_title (GTK_WINDOW (gtk_main_window), PACKAGE_STRING); vbox1 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox1); diff --git a/src/gui/gtk/gui-input.c b/src/gui/gtk/gui-input.c index db30e6523..66a27684c 100644 --- a/src/gui/gtk/gui-input.c +++ b/src/gui/gtk/gui-input.c @@ -19,10 +19,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - /* gui-input: user input functions for Gtk GUI */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <stdio.h> #include <unistd.h> @@ -34,7 +37,7 @@ #include "../../common/weechat.h" #include "../gui.h" -#include "../../common/config.h" +#include "../../common/weeconfig.h" #include "../../common/command.h" #include "../../irc/irc.h" diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c index 7d626024d..453e75835 100644 --- a/src/gui/gui-common.c +++ b/src/gui/gui-common.c @@ -19,10 +19,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - /* gui-common.c: display functions, used by any GUI */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <stdio.h> #include <unistd.h> |