Code cleanup
This commit is contained in:
Sebastien Helleu
parent
6d6eafa82a
commit
cafd93dcdd
28
configure.in
28
configure.in
@ -61,29 +61,21 @@ RUBY_CFLAGS=
|
||||
enable_debug=no
|
||||
DEBUG_CFLAGS=
|
||||
|
||||
|
||||
AM_CONDITIONAL(GUI_CURSES, test "$enable_curses" = "yes")
|
||||
AM_CONDITIONAL(GUI_GTK, test "$enable_gtk" = "yes")
|
||||
AM_CONDITIONAL(GUI_QT, test "$enable_qt" = "yes")
|
||||
|
||||
#if test "x$enable_gtk" = "xyes" ; then
|
||||
# AM_PATH_GTK_2_0(2.0.0, havegtk=yes, havegtk=no)
|
||||
# if test "$havegtk" = no; then
|
||||
# enable_gtk="no"
|
||||
# echo
|
||||
# echo Cannot find Gtk+\! Not building Gtk+ interface...
|
||||
# echo
|
||||
# fi
|
||||
#fi
|
||||
if test "x$enable_curses" = "xyes" ; then
|
||||
CURSES_LIBS=-lcurses
|
||||
AC_SUBST(CURSES_LIBS)
|
||||
fi
|
||||
|
||||
CURSES_LIBS=-lcurses
|
||||
|
||||
GTK_CFLAGS=`pkg-config --cflags gtk+-2.0`
|
||||
GTK_LIBS=`pkg-config --libs gtk+-2.0`
|
||||
|
||||
AC_SUBST(CURSES_LIBS)
|
||||
AC_SUBST(GTK_CFLAGS)
|
||||
AC_SUBST(GTK_LIBS)
|
||||
if test "x$enable_gtk" = "xyes" ; then
|
||||
GTK_CFLAGS=`pkg-config --cflags gtk+-2.0`
|
||||
GTK_LIBS=`pkg-config --libs gtk+-2.0`
|
||||
AC_SUBST(GTK_CFLAGS)
|
||||
AC_SUBST(GTK_LIBS)
|
||||
fi
|
||||
|
||||
CFLAGS="-Wall -W -pipe -O2"
|
||||
|
||||
|
||||
@ -65,13 +65,6 @@
|
||||
#define WIN_IS_CHANNEL(window) (CHANNEL(window) && (CHANNEL(window)->type == CHAT_CHANNEL))
|
||||
#define WIN_IS_PRIVATE(window) (CHANNEL(window) && (CHANNEL(window)->type == CHAT_PRIVATE))
|
||||
|
||||
#ifdef WEE_CURSES
|
||||
//#define WIN_HAS_NICKLIST(window) (window->win_nick)
|
||||
#endif
|
||||
#ifdef WEE_GTK
|
||||
//#define WIN_HAS_NICKLIST(window) (window->textbuffer_nicklist)
|
||||
#endif
|
||||
|
||||
#define MSG_TYPE_TIME 0
|
||||
#define MSG_TYPE_NICK 1
|
||||
#define MSG_TYPE_INFO 2
|
||||
@ -149,16 +142,11 @@ struct t_gui_window
|
||||
void *win_input; /* input window */
|
||||
|
||||
/* windows for Curses GUI */
|
||||
//GtkWidget *textview_chat; /* textview widget for chat */
|
||||
//GtkTextBuffer *textbuffer_chat; /* textbuffer widget for chat */
|
||||
//GtkTextTag *texttag_chat; /* texttag widget for chat */
|
||||
//GtkWidget *textview_nicklist; /* textview widget for nicklist */
|
||||
//GtkTextBuffer *textbuffer_nicklist; /* textbuffer widget for nicklist */
|
||||
void *textview_chat; /* textview widget for chat */
|
||||
void *textbuffer_chat; /* textbuffer widget for chat */
|
||||
void *texttag_chat; /* texttag widget for chat */
|
||||
void *textview_nicklist; /* textview widget for nicklist */
|
||||
void *textbuffer_nicklist; /* textbuffer widget for nicklist */
|
||||
void *textview_chat; /* textview widget for chat */
|
||||
void *textbuffer_chat; /* textbuffer widget for chat */
|
||||
void *texttag_chat; /* texttag widget for chat */
|
||||
void *textview_nicklist; /* textview widget for nicklist */
|
||||
void *textbuffer_nicklist; /* textbuffer widget for nicklist */
|
||||
|
||||
/* windows for Curses GUI */
|
||||
/* TODO: declare Qt window */
|
||||
|
||||
@ -61,29 +61,21 @@ RUBY_CFLAGS=
|
||||
enable_debug=no
|
||||
DEBUG_CFLAGS=
|
||||
|
||||
|
||||
AM_CONDITIONAL(GUI_CURSES, test "$enable_curses" = "yes")
|
||||
AM_CONDITIONAL(GUI_GTK, test "$enable_gtk" = "yes")
|
||||
AM_CONDITIONAL(GUI_QT, test "$enable_qt" = "yes")
|
||||
|
||||
#if test "x$enable_gtk" = "xyes" ; then
|
||||
# AM_PATH_GTK_2_0(2.0.0, havegtk=yes, havegtk=no)
|
||||
# if test "$havegtk" = no; then
|
||||
# enable_gtk="no"
|
||||
# echo
|
||||
# echo Cannot find Gtk+\! Not building Gtk+ interface...
|
||||
# echo
|
||||
# fi
|
||||
#fi
|
||||
if test "x$enable_curses" = "xyes" ; then
|
||||
CURSES_LIBS=-lcurses
|
||||
AC_SUBST(CURSES_LIBS)
|
||||
fi
|
||||
|
||||
CURSES_LIBS=-lcurses
|
||||
|
||||
GTK_CFLAGS=`pkg-config --cflags gtk+-2.0`
|
||||
GTK_LIBS=`pkg-config --libs gtk+-2.0`
|
||||
|
||||
AC_SUBST(CURSES_LIBS)
|
||||
AC_SUBST(GTK_CFLAGS)
|
||||
AC_SUBST(GTK_LIBS)
|
||||
if test "x$enable_gtk" = "xyes" ; then
|
||||
GTK_CFLAGS=`pkg-config --cflags gtk+-2.0`
|
||||
GTK_LIBS=`pkg-config --libs gtk+-2.0`
|
||||
AC_SUBST(GTK_CFLAGS)
|
||||
AC_SUBST(GTK_LIBS)
|
||||
fi
|
||||
|
||||
CFLAGS="-Wall -W -pipe -O2"
|
||||
|
||||
|
||||
@ -65,13 +65,6 @@
|
||||
#define WIN_IS_CHANNEL(window) (CHANNEL(window) && (CHANNEL(window)->type == CHAT_CHANNEL))
|
||||
#define WIN_IS_PRIVATE(window) (CHANNEL(window) && (CHANNEL(window)->type == CHAT_PRIVATE))
|
||||
|
||||
#ifdef WEE_CURSES
|
||||
//#define WIN_HAS_NICKLIST(window) (window->win_nick)
|
||||
#endif
|
||||
#ifdef WEE_GTK
|
||||
//#define WIN_HAS_NICKLIST(window) (window->textbuffer_nicklist)
|
||||
#endif
|
||||
|
||||
#define MSG_TYPE_TIME 0
|
||||
#define MSG_TYPE_NICK 1
|
||||
#define MSG_TYPE_INFO 2
|
||||
@ -149,16 +142,11 @@ struct t_gui_window
|
||||
void *win_input; /* input window */
|
||||
|
||||
/* windows for Curses GUI */
|
||||
//GtkWidget *textview_chat; /* textview widget for chat */
|
||||
//GtkTextBuffer *textbuffer_chat; /* textbuffer widget for chat */
|
||||
//GtkTextTag *texttag_chat; /* texttag widget for chat */
|
||||
//GtkWidget *textview_nicklist; /* textview widget for nicklist */
|
||||
//GtkTextBuffer *textbuffer_nicklist; /* textbuffer widget for nicklist */
|
||||
void *textview_chat; /* textview widget for chat */
|
||||
void *textbuffer_chat; /* textbuffer widget for chat */
|
||||
void *texttag_chat; /* texttag widget for chat */
|
||||
void *textview_nicklist; /* textview widget for nicklist */
|
||||
void *textbuffer_nicklist; /* textbuffer widget for nicklist */
|
||||
void *textview_chat; /* textview widget for chat */
|
||||
void *textbuffer_chat; /* textbuffer widget for chat */
|
||||
void *texttag_chat; /* texttag widget for chat */
|
||||
void *textview_nicklist; /* textview widget for nicklist */
|
||||
void *textbuffer_nicklist; /* textbuffer widget for nicklist */
|
||||
|
||||
/* windows for Curses GUI */
|
||||
/* TODO: declare Qt window */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user