# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1130691565 0
# Node ID a1aa681f14481d7a04b3600e2da0dfff849180ca
# Parent  8aa6462e563c6013bc5969d9dc638115c25c3e7f
[gaim-migrate @ 14188]
Make some things static and make msn disconnect errors slightly less geeky

committer: Tailor Script <tailor@pidgin.im>

diff -r 8aa6462e563c -r a1aa681f1448 src/protocols/msn/command.c
--- a/src/protocols/msn/command.c	Sat Oct 29 21:11:07 2005 +0000
+++ b/src/protocols/msn/command.c	Sun Oct 30 16:59:25 2005 +0000
@@ -24,7 +24,7 @@
 #include "msn.h"
 #include "command.h"
 
-gboolean
+static gboolean
 is_num(char *str)
 {
 	char *c;
diff -r 8aa6462e563c -r a1aa681f1448 src/protocols/msn/servconn.c
--- a/src/protocols/msn/servconn.c	Sat Oct 29 21:11:07 2005 +0000
+++ b/src/protocols/msn/servconn.c	Sun Oct 30 16:59:25 2005 +0000
@@ -133,8 +133,10 @@
 			reason = _("Unknown error"); break;
 	}
 
-	tmp = g_strdup_printf(_("Connection error from %s server (%s):\n%s"),
-						  name, servconn->host, reason);
+	gaim_debug_error("msn", "Connection error from %s server (%s): %s\n",
+					 name, servconn->host, reason);
+	tmp = g_strdup_printf(_("Connection error from %s server:\n%s"),
+						  name, reason);
 
 	if (servconn->type == MSN_SERVCONN_NS)
 	{
diff -r 8aa6462e563c -r a1aa681f1448 src/protocols/msn/slp.c
--- a/src/protocols/msn/slp.c	Sat Oct 29 21:11:07 2005 +0000
+++ b/src/protocols/msn/slp.c	Sun Oct 30 16:59:25 2005 +0000
@@ -43,7 +43,7 @@
  * Util
  **************************************************************************/
 
-char *
+static char *
 get_token(const char *str, const char *start, const char *end)
 {
 	const char *c, *c2;
@@ -970,7 +970,7 @@
 	}
 }
 
-void
+static void
 got_user_display(MsnSlpCall *slpcall,
 				 const guchar *data, gsize size)
 {
@@ -1012,7 +1012,7 @@
 #endif
 }
 
-void
+static void
 end_user_display(MsnSlpCall *slpcall)
 {
 	MsnUserList *userlist;
diff -r 8aa6462e563c -r a1aa681f1448 src/protocols/msn/slpcall.c
--- a/src/protocols/msn/slpcall.c	Sat Oct 29 21:11:07 2005 +0000
+++ b/src/protocols/msn/slpcall.c	Sun Oct 30 16:59:25 2005 +0000
@@ -33,7 +33,7 @@
  * Util
  **************************************************************************/
 
-char *
+static char *
 rand_guid()
 {
 	return g_strdup_printf("%4X%4X-%4X-%4X-%4X-%4X%4X%4X",
diff -r 8aa6462e563c -r a1aa681f1448 src/protocols/msn/switchboard.c
--- a/src/protocols/msn/switchboard.c	Sat Oct 29 21:11:07 2005 +0000
+++ b/src/protocols/msn/switchboard.c	Sun Oct 30 16:59:25 2005 +0000
@@ -931,7 +931,7 @@
 #endif
 }
 
-void
+static void
 nudge_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
 	MsnSwitchBoard *swboard;
diff -r 8aa6462e563c -r a1aa681f1448 src/protocols/msn/switchboard.h
--- a/src/protocols/msn/switchboard.h	Sat Oct 29 21:11:07 2005 +0000
+++ b/src/protocols/msn/switchboard.h	Sun Oct 30 16:59:25 2005 +0000
@@ -265,14 +265,6 @@
 void msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
 /**
- * Processes nudge messages.
- *
- * @param cmdproc The command processor.
- * @param msg     The message.
- */
-void msn_nudge_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
-
-/**
  * Processes INVITE messages.
  *
  * @param cmdproc The command processor.
diff -r 8aa6462e563c -r a1aa681f1448 src/protocols/msn/utils.c
--- a/src/protocols/msn/utils.c	Sat Oct 29 21:11:07 2005 +0000
+++ b/src/protocols/msn/utils.c	Sun Oct 30 16:59:25 2005 +0000
@@ -130,7 +130,7 @@
  * We need this because we're only supposed to encode spaces in the font
  * names. gaim_url_encode() isn't acceptable.
  */
-const char *
+static const char *
 encode_spaces(const char *str)
 {
 	static char buf[BUF_LEN];
diff -r 8aa6462e563c -r a1aa681f1448 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Sat Oct 29 21:11:07 2005 +0000
+++ b/src/protocols/yahoo/yahoo.c	Sun Oct 30 16:59:25 2005 +0000
@@ -1067,7 +1067,7 @@
 
 /* This is taken from Sylpheed by Hiroyuki Yamamoto.  We have our own tobase64 function
  * in util.c, but it has a bug I don't feel like finding right now ;) */
-void to_y64(char *out, const unsigned char *in, gsize inlen)
+static void to_y64(char *out, const unsigned char *in, gsize inlen)
      /* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
 {
 	for (; inlen >= 3; inlen -= 3)
diff -r 8aa6462e563c -r a1aa681f1448 src/protocols/yahoo/yahoo_filexfer.c
--- a/src/protocols/yahoo/yahoo_filexfer.c	Sat Oct 29 21:11:07 2005 +0000
+++ b/src/protocols/yahoo/yahoo_filexfer.c	Sun Oct 30 16:59:25 2005 +0000
@@ -214,7 +214,7 @@
 
 }
 
-guint calculate_length(const gchar *l, size_t len)
+static guint calculate_length(const gchar *l, size_t len)
 {
 	int i;