# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1200740940 -3600
# Node ID f89844a0448a808460f6fd6713e9a1eb9ed3296d
# Parent  0e1ef9597420809ab329f8ce5fa0a4eec84217a8
Remove useless inlines

diff -r 0e1ef9597420 -r f89844a0448a mcabber/src/histolog.h
--- a/mcabber/src/histolog.h	Sun Jan 13 20:28:07 2008 +0100
+++ b/mcabber/src/histolog.h	Sat Jan 19 12:09:00 2008 +0100
@@ -8,10 +8,10 @@
 void hlog_enable(guint enable, const char *root_dir, guint loadfile);
 char *hlog_get_log_jid(const char *bjid);
 void hlog_read_history(const char *bjid, GList **p_buddyhbuf, guint width);
-inline void hlog_write_message(const char *bjid, time_t timestamp, int sent,
-        const char *msg);
-inline void hlog_write_status(const char *bjid, time_t timestamp,
-        enum imstatus status, const char *status_msg);
+void hlog_write_message(const char *bjid, time_t timestamp, int sent,
+                        const char *msg);
+void hlog_write_status(const char *bjid, time_t timestamp,
+                       enum imstatus status, const char *status_msg);
 
 #endif /* __HISTOLOG_H__ */
 
diff -r 0e1ef9597420 -r f89844a0448a mcabber/src/jabglue.c
--- a/mcabber/src/jabglue.c	Sun Jan 13 20:28:07 2008 +0100
+++ b/mcabber/src/jabglue.c	Sat Jan 19 12:09:00 2008 +0100
@@ -109,7 +109,7 @@
   return fjid;
 }
 
-inline unsigned char jb_getonline(void)
+unsigned char jb_getonline(void)
 {
   return online;
 }
diff -r 0e1ef9597420 -r f89844a0448a mcabber/src/jabglue.h
--- a/mcabber/src/jabglue.h	Sun Jan 13 20:28:07 2008 +0100
+++ b/mcabber/src/jabglue.h	Sat Jan 19 12:09:00 2008 +0100
@@ -47,7 +47,7 @@
                   const char *resource);
 jconn jb_connect(const char *fjid, const char *server, unsigned int port,
                  int ssl, const char *pass);
-inline unsigned char jb_getonline(void);
+unsigned char jb_getonline(void);
 void jb_disconnect(void);
 void jb_main(void);
 void jb_subscr_send_auth(const char *bjid);
@@ -57,18 +57,18 @@
 void jb_addbuddy(const char *bjid, const char *name, const char *group);
 void jb_delbuddy(const char *bjid);
 void jb_updatebuddy(const char *bjid, const char *name, const char *group);
-inline enum imstatus jb_getstatus(void);
-inline const char *jb_getstatusmsg(void);
+enum imstatus jb_getstatus(void);
+const char *jb_getstatusmsg(void);
 void jb_setstatus(enum imstatus st, const char *recipient, const char *msg,
                   int do_not_sign);
-inline void jb_setprevstatus(void);
+void jb_setprevstatus(void);
 void jb_send_msg(const char *fjid, const char *text, int type,
                  const char *subject, const char *id, gint *encrypted,
                  const char *type_overwrite);
 void jb_send_raw(const char *str);
 void jb_send_chatstate(gpointer buddy, guint chatstate);
 void jb_keepalive(void);
-inline void jb_reset_keepalive(void);
+void jb_reset_keepalive(void);
 void jb_set_keepalive_delay(unsigned int delay);
 void jb_room_join(const char *room, const char *nickname, const char *passwd);
 void jb_room_unlock(const char *room);
diff -r 0e1ef9597420 -r f89844a0448a mcabber/src/logprint.h
--- a/mcabber/src/logprint.h	Sun Jan 13 20:28:07 2008 +0100
+++ b/mcabber/src/logprint.h	Sat Jan 19 12:09:00 2008 +0100
@@ -12,7 +12,7 @@
 
 void scr_LogPrint(unsigned int flag, const char *fmt, ...);
 
-inline void scr_DoUpdate(void);
+void scr_DoUpdate(void);
 
 #endif /* __LOGPRINT_H__ */
 
diff -r 0e1ef9597420 -r f89844a0448a mcabber/src/pgp.c
--- a/mcabber/src/pgp.c	Sun Jan 13 20:28:07 2008 +0100
+++ b/mcabber/src/pgp.c	Sat Jan 19 12:09:00 2008 +0100
@@ -454,14 +454,14 @@
   return -1;
 }
 
-inline int gpg_enabled(void)
+int gpg_enabled(void)
 {
   return gpg.enabled;
 }
 
 #else  /* not HAVE_GPGME */
 
-inline int gpg_enabled(void)
+int gpg_enabled(void)
 {
   return 0;
 }
diff -r 0e1ef9597420 -r f89844a0448a mcabber/src/pgp.h
--- a/mcabber/src/pgp.h	Sun Jan 13 20:28:07 2008 +0100
+++ b/mcabber/src/pgp.h	Sat Jan 19 12:09:00 2008 +0100
@@ -22,7 +22,7 @@
 
 #endif /* HAVE_GPGME */
 
-inline int gpg_enabled(void);
+int gpg_enabled(void);
 
 #endif /* __PGP_H__ */
 
diff -r 0e1ef9597420 -r f89844a0448a mcabber/src/roster.c
--- a/mcabber/src/roster.c	Sun Jan 13 20:28:07 2008 +0100
+++ b/mcabber/src/roster.c	Sat Jan 19 12:09:00 2008 +0100
@@ -794,7 +794,7 @@
   }
 }
 
-inline int buddylist_isset_filter(void)
+int buddylist_isset_filter(void)
 {
   return (display_filter != DFILTER_ALL);
 }
diff -r 0e1ef9597420 -r f89844a0448a mcabber/src/roster.h
--- a/mcabber/src/roster.h	Sun Jan 13 20:28:07 2008 +0100
+++ b/mcabber/src/roster.h	Sat Jan 19 12:09:00 2008 +0100
@@ -177,7 +177,7 @@
 void    buddylist_build(void);
 void    buddy_hide_group(gpointer rosterdata, int hide);
 void    buddylist_set_hide_offline_buddies(int hide);
-inline int buddylist_isset_filter(void);
+int     buddylist_isset_filter(void);
 void    buddylist_set_filter(guchar);
 guchar  buddylist_get_filter(void);
 const char *buddy_getjid(gpointer rosterdata);
diff -r 0e1ef9597420 -r f89844a0448a mcabber/src/screen.c
--- a/mcabber/src/screen.c	Sun Jan 13 20:28:07 2008 +0100
+++ b/mcabber/src/screen.c	Sat Jan 19 12:09:00 2008 +0100
@@ -145,6 +145,9 @@
                        unsigned int prefix_flags, int force_show,
                        unsigned mucnicklen);
 
+inline void scr_UpdateBuddyWindow(void);
+inline void scr_set_chatmode(int enable);
+
 #ifdef HAVE_ASPELL_H
 #define ASPELLBADCHAR 5
 AspellConfig *spell_config;
@@ -162,7 +165,7 @@
 static GHashTable *muccolors = NULL, *nickcolors = NULL;
 
 typedef struct {
-  bool manual;//Manually set?
+  bool manual; // Manually set?
   int color;
 } nickcolor;
 
@@ -793,7 +796,7 @@
   return;
 }
 
-inline void scr_Beep(void)
+void scr_Beep(void)
 {
   beep();
 }
@@ -2733,7 +2736,7 @@
 // Public function to (un)set multimode...
 // Convention:
 //  0 = disabled / 1 = multimode / 2 = multimode verbatim (commands disabled)
-inline void scr_set_multimode(int enable, char *subject)
+void scr_set_multimode(int enable, char *subject)
 {
   g_free(multiline);
   multiline = NULL;
@@ -2749,7 +2752,7 @@
 
 //  scr_get_multiline()
 // Public function to get the current multi-line.
-inline const char *scr_get_multiline(void)
+const char *scr_get_multiline(void)
 {
   if (multimode && multiline)
     return multiline;
@@ -2758,7 +2761,7 @@
 
 //  scr_get_multimode_subj()
 // Public function to get the multi-line subject, if any.
-inline const char *scr_get_multimode_subj(void)
+const char *scr_get_multimode_subj(void)
 {
   if (multimode)
     return multimode_subj;
@@ -3108,7 +3111,7 @@
 {
   int i, n;
 
-  if (scr_get_multimode() != 2) {
+  if (multimode != 2) {
     // Not in verbatim multi-line mode
     scr_handle_tab();
   } else {
@@ -3232,7 +3235,7 @@
 void readline_send_multiline(void)
 {
   // Validate current multi-line
-  if (scr_get_multimode())
+  if (multimode)
     process_command(mkcmdstr("msay send"), TRUE);
 }
 
@@ -3676,7 +3679,7 @@
   return;
 }
 
-inline void scr_DoUpdate(void)
+void scr_DoUpdate(void)
 {
   doupdate();
 }
diff -r 0e1ef9597420 -r f89844a0448a mcabber/src/screen.h
--- a/mcabber/src/screen.h	Sun Jan 13 20:28:07 2008 +0100
+++ b/mcabber/src/screen.h	Sat Jan 19 12:09:00 2008 +0100
@@ -119,17 +119,17 @@
                               guint prefix);
 void scr_ShowBuddyWindow(void);
 int  scr_BuddyBufferExists(const char *jid);
-inline void scr_UpdateBuddyWindow(void);
-inline void scr_set_chatmode(int enable);
-inline int  scr_get_chatmode(void);
-inline void scr_set_multimode(int enable, char *subject);
-inline int  scr_get_multimode(void);
+void scr_UpdateBuddyWindow(void);
+void scr_set_chatmode(int enable);
+int  scr_get_chatmode(void);
+void scr_set_multimode(int enable, char *subject);
+int  scr_get_multimode(void);
 void scr_setmsgflag_if_needed(const char *jid, int special);
 void scr_append_multiline(const char *line);
-inline const char *scr_get_multiline(void);
-inline const char *scr_get_multimode_subj(void);
+const char *scr_get_multiline(void);
+const char *scr_get_multimode_subj(void);
 
-inline void scr_Beep(void);
+void scr_Beep(void);
 
 bool Autoaway;
 
diff -r 0e1ef9597420 -r f89844a0448a mcabber/src/utils.h
--- a/mcabber/src/utils.h	Sun Jan 13 20:28:07 2008 +0100
+++ b/mcabber/src/utils.h	Sat Jan 19 12:09:00 2008 +0100
@@ -26,11 +26,11 @@
 int    to_iso8601(char *dststr, time_t timestamp);
 time_t from_iso8601(const char *timestamp, int utc);
 
-inline void safe_usleep(unsigned int usec); /* Only for delays < 1s */
+void safe_usleep(unsigned int usec); /* Only for delays < 1s */
 
 int check_jid_syntax(const char *fjid);
 
-inline void mc_strtolower(char *str);
+void mc_strtolower(char *str);
 
 void strip_arg_special_chars(char *s);
 char **split_arg(const char *arg, unsigned int n, int dontstriplast);