--- a/mcabber/src/screen.c Sat Jul 08 12:47:54 2006 +0200
+++ b/mcabber/src/screen.c Sat Jul 08 15:32:55 2006 +0200
@@ -30,16 +30,6 @@
#include <langinfo.h>
#include <config.h>
-#if HAVE_NCURSESW_NCURSES_H
-# include <ncursesw/ncurses.h>
-#elif HAVE_NCURSES_NCURSES_H
-# include <ncurses/ncurses.h>
-#elif HAVE_NCURSES_H
-# include <ncurses.h>
-#else
-# include <curses.h>
-#endif
-
#include "screen.h"
#include "utf8.h"
#include "hbuf.h"
@@ -490,7 +480,7 @@
return NULL;
}
-bool scr_BuddyBufferExists(const char *jid)
+int scr_BuddyBufferExists(const char *jid)
{
return (scr_SearchWindow(jid, FALSE) != NULL);
}
@@ -1290,7 +1280,7 @@
scr_ShowWindow(jidto, FALSE);
}
-inline void set_autoaway(bool setaway)
+static inline void set_autoaway(bool setaway)
{
static enum imstatus oldstatus;
static char *oldmsg;
@@ -1321,7 +1311,7 @@
}
// Check if we should enter/leave automatic away status
-void scr_CheckAutoAway(bool activity)
+void scr_CheckAutoAway(int activity)
{
static time_t LastActivity;
enum imstatus cur_st;
--- a/mcabber/src/screen.h Sat Jul 08 12:47:54 2006 +0200
+++ b/mcabber/src/screen.h Sat Jul 08 15:32:55 2006 +0200
@@ -1,9 +1,18 @@
#ifndef __SCREEN_H__
#define __SCREEN_H__ 1
-#include <ncurses.h>
#include <glib.h>
+#if HAVE_NCURSESW_NCURSES_H
+# include <ncursesw/ncurses.h>
+#elif HAVE_NCURSES_NCURSES_H
+# include <ncurses/ncurses.h>
+#elif HAVE_NCURSES_H
+# include <ncurses.h>
+#else
+# include <curses.h>
+#endif
+
#include "logprint.h"
// Length of the timestamp & flag prefix in the chat buffer window
@@ -67,7 +76,7 @@
time_t timestamp, guint prefix);
void scr_WriteOutgoingMessage(const char *jidto, const char *text);
void scr_ShowBuddyWindow(void);
-bool scr_BuddyBufferExists(const char *jid);
+int scr_BuddyBufferExists(const char *jid);
inline void scr_UpdateBuddyWindow(void);
inline void scr_set_chatmode(int enable);
inline void scr_set_multimode(int enable, char *subject);
@@ -79,7 +88,7 @@
inline void scr_Beep(void);
-void scr_CheckAutoAway(bool activity);
+void scr_CheckAutoAway(int activity);
// For commands...
void scr_RosterTop(void);