Changes in / [1065dd4:bc7a0d4]

Files:

• COPYING (modified) (11 diffs)
• bitlbee.c (modified) (1 diff)
• bitlbee.h (modified) (1 diff)
• commands.h (modified) (1 diff)
• conf.c (modified) (1 diff)
• conf.h (modified) (1 diff)
• dcc.c (modified) (2 diffs)
• dcc.h (modified) (1 diff)
• help.c (modified) (1 diff)
• help.h (modified) (1 diff)
• ipc.c (modified) (1 diff)
• ipc.h (modified) (1 diff)
• irc.c (modified) (1 diff)
• irc.h (modified) (1 diff)
• irc_channel.c (modified) (3 diffs)
• irc_commands.c (modified) (1 diff)
• irc_im.c (modified) (3 diffs)
• irc_send.c (modified) (1 diff)
• irc_user.c (modified) (1 diff)
• irc_util.c (modified) (3 diffs)
• lib/events.h (modified) (1 diff)
• lib/events_glib.c (modified) (1 diff)
• lib/events_libevent.c (modified) (1 diff)
• lib/http_client.c (modified) (2 diffs)
• lib/http_client.h (modified) (1 diff)
• lib/ini.c (modified) (2 diffs)
• lib/ini.h (modified) (1 diff)
• lib/json.c (modified) (4 diffs)
• lib/misc.c (modified) (5 diffs)
• lib/misc.h (modified) (1 diff)
• lib/proxy.c (modified) (1 diff)
• lib/proxy.h (modified) (1 diff)
• lib/ssl_client.h (modified) (1 diff)
• lib/ssl_gnutls.c (modified) (2 diffs)
• lib/ssl_nss.c (modified) (1 diff)
• lib/ssl_openssl.c (modified) (2 diffs)
• lib/url.c (modified) (1 diff)
• lib/url.h (modified) (1 diff)
• log.c (modified) (1 diff)
• log.h (modified) (1 diff)
• nick.c (modified) (5 diffs)
• nick.h (modified) (1 diff)
• otr.c (modified) (4 diffs)
• otr.h (modified) (1 diff)
• protocols/account.c (modified) (5 diffs)
• protocols/account.h (modified) (1 diff)
• protocols/bee.c (modified) (1 diff)
• protocols/bee.h (modified) (1 diff)
• protocols/bee_chat.c (modified) (1 diff)
• protocols/bee_ft.c (modified) (1 diff)
• protocols/bee_user.c (modified) (1 diff)
• protocols/ft.h (modified) (1 diff)
• protocols/jabber/jabber_util.c (modified) (2 diffs)
• protocols/jabber/sasl.c (modified) (2 diffs)
• protocols/msn/invitation.c (modified) (1 diff)
• protocols/msn/invitation.h (modified) (1 diff)
• protocols/msn/msn.c (modified) (2 diffs)
• protocols/msn/msn.h (modified) (1 diff)
• protocols/msn/msn_util.c (modified) (1 diff)
• protocols/msn/ns.c (modified) (3 diffs)
• protocols/msn/sb.c (modified) (3 diffs)
• protocols/msn/soap.c (modified) (1 diff)
• protocols/msn/soap.h (modified) (1 diff)
• protocols/msn/tables.c (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)
• protocols/nogaim.h (modified) (1 diff)
• protocols/oscar/auth.c (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (4 diffs)
• protocols/oscar/oscar_util.c (modified) (1 diff)
• protocols/purple/purple.c (modified) (2 diffs)
• protocols/skype/skype.c (modified) (2 diffs)
• protocols/twitter/twitter.c (modified) (1 diff)
• protocols/yahoo/libyahoo2.c (modified) (1 diff)
• protocols/yahoo/yahoo.c (modified) (1 diff)
• protocols/yahoo/yahoo2.h (modified) (1 diff)
• protocols/yahoo/yahoo2_callbacks.h (modified) (1 diff)
• protocols/yahoo/yahoo2_types.h (modified) (1 diff)
• protocols/yahoo/yahoo_debug.h (modified) (1 diff)
• protocols/yahoo/yahoo_httplib.c (modified) (2 diffs)
• protocols/yahoo/yahoo_httplib.h (modified) (1 diff)
• protocols/yahoo/yahoo_list.h (modified) (1 diff)
• protocols/yahoo/yahoo_util.c (modified) (1 diff)
• protocols/yahoo/yahoo_util.h (modified) (1 diff)
• query.c (modified) (1 diff)
• query.h (modified) (1 diff)
• root_commands.c (modified) (1 diff)
• set.c (modified) (2 diffs)
• set.h (modified) (1 diff)
• storage.c (modified) (1 diff)
• storage.h (modified) (1 diff)
• storage_xml.c (modified) (1 diff)
• unix.c (modified) (1 diff)

COPYING

@@ -1 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                            Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
@@ -16 +16 @@
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
 
@@ -57 +57 @@
 modification follow.
 
-                    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -112 +113 @@
     the Program is not required to print an announcement.)
 
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
@@ -169 +171 @@
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
+
 
   4. You may not copy, modify, sublicense, or distribute the Program
@@ -227 +230 @@
 be a consequence of the rest of this License.
 
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
@@ -256 +260 @@
 of promoting the sharing and reuse of software generally.
 
-                            NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
@@ -278 +282 @@
 POSSIBILITY OF SUCH DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -304 +309 @@
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 
 Also add information on how to contact you by electronic and paper mail.
@@ -313 +319 @@
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision version 69, Copyright (C) year  name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
@@ -336 +342 @@
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.

bitlbee.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

bitlbee.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

commands.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

conf.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

conf.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

dcc.c

@@ -18 +18 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -523 +523 @@
                 
                 host = ctcp[3];
-                while( *host && g_ascii_isdigit( *host ) ) host++; /* Just digits? */
+                while( *host && isdigit( *host ) ) host++; /* Just digits? */
                 if( *host == '\0' )
                 {

dcc.h

@@ -19 +19 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

help.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

help.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

ipc.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

ipc.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

irc.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

irc.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

irc_channel.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -575 +575 @@
         
         /* Scan for non-whitespace chars followed by a colon: */
-        for( s = msg; *s && !g_ascii_isspace( *s ) && *s != ':' && *s != ','; s ++ ) {}
+        for( s = msg; *s && !isspace( *s ) && *s != ':' && *s != ','; s ++ ) {}
         
         if( *s == ':' || *s == ',' )
@@ -583 +583 @@
                 memset( to, 0, sizeof( to ) );
                 strncpy( to, msg, s - msg );
-                while( *(++s) && g_ascii_isspace( *s ) ) {}
+                while( *(++s) && isspace( *s ) ) {}
                 msg = s;
                 

irc_commands.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

irc_im.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -73 +73 @@
                 {
                         char *s;
-                        for( s = bu->ic->acc->tag; g_ascii_isalnum( *s ); s ++ );
+                        for( s = bu->ic->acc->tag; isalnum( *s ); s ++ );
                         /* Only use the tag if we got to the end of the string.
                            (So allow alphanumerics only. Hopefully not too
@@ -316 +316 @@
            TODO(wilmer): Do the same with away msgs again! */
         for( s = iu->fullname; *s; s ++ )
-                if( g_ascii_isspace( *s ) ) *s = ' ';
+                if( isspace( *s ) ) *s = ' ';
         
         if( ( bu->ic->flags & OPT_LOGGED_IN ) && set_getbool( &bee->set, "display_namechanges" ) )

irc_send.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

irc_user.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

irc_util.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -42 +42 @@
         
         /* \d+ */
-        if( !g_ascii_isdigit( *s ) )
+        if( !isdigit( *s ) )
                 return SET_INVALID;
-        while( *s && g_ascii_isdigit( *s ) ) s ++;
+        while( *s && isdigit( *s ) ) s ++;
         
         /* EOS? */
@@ -56 +56 @@
         
         /* \d+ */
-        if( !g_ascii_isdigit( *s ) )
+        if( !isdigit( *s ) )
                 return SET_INVALID;
-        while( *s && g_ascii_isdigit( *s ) ) s ++;
+        while( *s && isdigit( *s ) ) s ++;
         
         /* EOS */

lib/events.h

@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

lib/events_glib.c

@@ -22 +22 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

lib/events_libevent.c

@@ -22 +22 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

lib/http_client.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -345 +345 @@
                 /* Might be a \r\n from the last chunk. */
                 s = chunk;
-                while( g_ascii_isspace( *s ) )
+                while( isspace( *s ) )
                         s ++;
                 /* Chunk length. Might be incomplete. */
                 if( s < eos && sscanf( s, "%x", &clen ) != 1 )
                         return CR_ERROR;
-                while( g_ascii_isxdigit( *s ) )
+                while( isxdigit( *s ) )
                         s ++;
                 

lib/http_client.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

lib/ini.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 #define BITLBEE_CORE
@@ -63 +63 @@
         char *e;
 
-        while( g_ascii_isspace( *in ) )
+        while( isspace( *in ) )
                 in++;
 
         e = in + strlen( in ) - 1;
-        while( e > in && g_ascii_isspace( *e ) )
+        while( e > in && isspace( *e ) )
                 e--;
         e[1] = 0;

lib/ini.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

lib/json.c

@@ -53 +53 @@
 static unsigned char hex_value (json_char c)
 {
-   if (g_ascii_isdigit(c))
+   if (isdigit(c))
       return c - '0';
 
@@ -609 +609 @@
                      default:
 
-                        if (g_ascii_isdigit (b) || b == '-')
+                        if (isdigit (b) || b == '-')
                         {
                            if (!new_value (&state, &top, &root, &alloc, json_integer))
@@ -616 +616 @@
                            if (!state.first_pass)
                            {
-                              while (g_ascii_isdigit (b) || b == '+' || b == '-'
+                              while (isdigit (b) || b == '+' || b == '-'
                                         || b == 'e' || b == 'E' || b == '.')
                               {
@@ -706 +706 @@
             case json_double:
 
-               if (g_ascii_isdigit (b))
+               if (isdigit (b))
                {
                   ++ num_digits;

lib/misc.c

@@ -27 +27 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -163 +163 @@
         while( *in )
         {
-                if( *in == '<' && ( g_ascii_isalpha( *(in+1) ) || *(in+1) == '/' ) )
+                if( *in == '<' && ( isalpha( *(in+1) ) || *(in+1) == '/' ) )
                 {
                         /* If in points at a < and in+1 points at a letter or a slash, this is probably
@@ -198 +198 @@
                 {
                         cs = ++in;
-                        while( *in && g_ascii_isalpha( *in ) )
+                        while( *in && isalpha( *in ) )
                                 in ++;
                         
@@ -314 +314 @@
         for( i = j = 0; t[i]; i ++, j ++ )
         {
-                /* Warning: g_ascii_isalnum() is locale-aware, so don't use it here! */
+                /* Warning: isalnum() is locale-aware, so don't use it here! */
                 if( ( t[i] >= 'A' && t[i] <= 'Z' ) ||
                     ( t[i] >= 'a' && t[i] <= 'z' ) ||
@@ -490 +490 @@
         
         while( *value )
-                if( !g_ascii_isdigit( *value ) )
+                if( !isdigit( *value ) )
                         return 0;
                 else

lib/misc.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

lib/proxy.c

@@ -17 +17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

lib/proxy.h

@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

lib/ssl_client.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

lib/ssl_gnutls.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -318 +318 @@
         gnutls_set_default_priority( conn->session );
         gnutls_credentials_set( conn->session, GNUTLS_CRD_CERTIFICATE, xcred );
-        if( conn->hostname && !g_ascii_isdigit( conn->hostname[0] ) )
+        if( conn->hostname && !isdigit( conn->hostname[0] ) )
                 gnutls_server_name_set( conn->session, GNUTLS_NAME_DNS,
                                         conn->hostname, strlen( conn->hostname ) );

lib/ssl_nss.c

@@ -22 +22 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

lib/ssl_openssl.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -159 +159 @@
         SSL_set_fd( conn->ssl, conn->fd );
         
-        if( conn->hostname && !g_ascii_isdigit( conn->hostname[0] ) )
+        if( conn->hostname && !isdigit( conn->hostname[0] ) )
                 SSL_set_tlsext_host_name( conn->ssl, conn->hostname );
         

lib/url.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

lib/url.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

log.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

log.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

nick.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -41 +41 @@
         do {
                 if (*orig != ' ')
-                        new[i++] = g_ascii_tolower( *orig );
+                        new[i++] = tolower( *orig );
         }
         while (*(orig++));
@@ -144 +144 @@
                                 fmt += 2;
                         }
-                        else if( g_ascii_isdigit( *fmt ) )
+                        else if( isdigit( *fmt ) )
                         {
                                 len = 0;
                                 /* Grab a number. */
-                                while( g_ascii_isdigit( *fmt ) )
+                                while( isdigit( *fmt ) )
                                         len = len * 10 + ( *(fmt++) - '0' );
                         }
@@ -331 +331 @@
                 }
         }
-        if( g_ascii_isdigit( nick[0] ) )
+        if( isdigit( nick[0] ) )
         {
                 char *orig;
@@ -351 +351 @@
         
         /* Empty/long nicks are not allowed, nor numbers at [0] */
-        if( !*nick || g_ascii_isdigit( nick[0] ) || strlen( nick ) > MAX_NICK_LENGTH )
+        if( !*nick || isdigit( nick[0] ) || strlen( nick ) > MAX_NICK_LENGTH )
                 return 0;
         

nick.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

otr.c

@@ -36 +36 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -1470 +1470 @@
 int hexval(char a)
 {
-        int x=g_ascii_tolower(a);
+        int x=tolower(a);
         
         if(x>='a' && x<='f')
@@ -1557 +1557 @@
         for(i=0; args[i]; i++) {
                 for(j=0; args[i][j]; j++) {
-                        char c = g_ascii_toupper(args[i][j]);
+                        char c = toupper(args[i][j]);
                         
                         if(n>=40) {
@@ -1621 +1621 @@
         for(i=0; args[i]; i++) {
                 for(j=0; args[i][j]; j++) {
-                        char c = g_ascii_toupper(args[i][j]);
+                        char c = toupper(args[i][j]);
                         
                         if(n>=40) {

otr.h

@@ -25 +25 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/account.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -81 +81 @@
         if( strcmp( prpl->name, "oscar" ) == 0 )
         {
-                if( g_ascii_isdigit( a->user[0] ) )
+                if( isdigit( a->user[0] ) )
                         strcpy( tag, "icq" );
                 else
@@ -417 +417 @@
         
         /* Format: /[0-9]+([*+][0-9]+(<[0-9+])?)?/ */
-        while( *value && g_ascii_isdigit( *value ) )
+        while( *value && isdigit( *value ) )
                 p->start = p->start * 10 + *value++ - '0';
         
@@ -433 +433 @@
         
         /* + or * the delay by this number every time. */
-        while( *value && g_ascii_isdigit( *value ) )
+        while( *value && isdigit( *value ) )
                 p->step = p->step * 10 + *value++ - '0';
         
@@ -444 +444 @@
         p->max = 0;
         value ++;
-        while( *value && g_ascii_isdigit( *value ) )
+        while( *value && isdigit( *value ) )
                 p->max = p->max * 10 + *value++ - '0';
         

protocols/account.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/bee.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/bee.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/bee_chat.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/bee_ft.c

@@ -18 +18 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/bee_user.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/ft.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/jabber/jabber_util.c

@@ -321 +321 @@
                         return FALSE;
                 }
-                if( g_ascii_tolower( jid1[i] ) != g_ascii_tolower( jid2[i] ) )
+                if( tolower( jid1[i] ) != tolower( jid2[i] ) )
                 {
                         return FALSE;
@@ -342 +342 @@
            it's Unicode but feck Unicode. :-P So stop once we see a slash. */
         for( i = 0; i < len && orig[i] != '/' ; i ++ )
-                new[i] = g_ascii_tolower( orig[i] );
+                new[i] = tolower( orig[i] );
         for( ; orig[i]; i ++ )
                 new[i] = orig[i];

protocols/jabber/sasl.c

@@ -187 +187 @@
         len = strlen( field );
         
-        while( g_ascii_isspace( *data ) || *data == ',' )
+        while( isspace( *data ) || *data == ',' )
                 data ++;
         
@@ -210 +210 @@
                         if( data[i] == ',' )
                         {
-                                while( g_ascii_isspace( data[i] ) || data[i] == ',' )
+                                while( isspace( data[i] ) || data[i] == ',' )
                                         i ++;
                                 

protocols/msn/invitation.c

@@ -21 +21 @@
  You should have received a copy of the GNU General Public License with
  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
- if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
- Fifth Floor, Boston, MA  02110-1301  USA
+ if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ Suite 330, Boston, MA  02111-1307  USA
  */
 

protocols/msn/invitation.h

@@ -20 +20 @@
  You should have received a copy of the GNU General Public License with
  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
- if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
- Fifth Floor, Boston, MA  02110-1301  USA
+ if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ Suite 330, Boston, MA  02111-1307  USA
  */
 

protocols/msn/msn.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -377 +377 @@
         g_tree_insert( md->domaintree, bu->handle, bu );
         
-        for( handle = bu->handle; g_ascii_isdigit( *handle ); handle ++ );
+        for( handle = bu->handle; isdigit( *handle ); handle ++ );
         if( *handle == ':' )
         {

protocols/msn/msn.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/msn/msn_util.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/msn/ns.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -581 +581 @@
                 ic->flags |= OPT_PONGED;
         }
-        else if( g_ascii_isdigit( cmd[0][0] ) )
+        else if( isdigit( cmd[0][0] ) )
         {
                 int num = atoi( cmd[0] );
@@ -997 +997 @@
         /* This might be a federated contact. Get its network number,
            prefixed to bu->handle with a colon. Default is 1. */
-        for( handle = bu->handle; g_ascii_isdigit( *handle ); handle ++ )
+        for( handle = bu->handle; isdigit( *handle ); handle ++ )
                 type = type * 10 + *handle - '0';
         if( *handle == ':' )

protocols/msn/sb.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -506 +506 @@
         else if( strcmp( cmd[0], "CAL" ) == 0 )
         {
-                if( num_parts < 4 || !g_ascii_isdigit( cmd[3][0] ) )
+                if( num_parts < 4 || !isdigit( cmd[3][0] ) )
                 {
                         msn_sb_destroy( sb );
@@ -645 +645 @@
                 }
         }
-        else if( g_ascii_isdigit( cmd[0][0] ) )
+        else if( isdigit( cmd[0][0] ) )
         {
                 int num = atoi( cmd[0] );

protocols/msn/soap.c

@@ -23 +23 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/msn/soap.h

@@ -23 +23 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/msn/tables.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/nogaim.c

@@ -28 +28 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/nogaim.h

@@ -32 +32 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

protocols/oscar/auth.c

@@ -125 +125 @@
                 return -EINVAL;
 
-        if (g_ascii_isdigit(sn[0]) && set_getbool(&ic->acc->set, "old_icq_auth"))
+        if (isdigit(sn[0]) && set_getbool(&ic->acc->set, "old_icq_auth"))
                 return goddamnicq(sess, conn, sn);
 

protocols/oscar/oscar.c

@@ -19 +19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
@@ -368 +368 @@
 {
         set_t *s;
-        gboolean icq = g_ascii_isdigit(acc->user[0]);
+        gboolean icq = isdigit(acc->user[0]);
         
         if (icq) {
@@ -394 +394 @@
         struct oscar_data *odata = ic->proto_data = g_new0(struct oscar_data, 1);
 
-        if (g_ascii_isdigit(acc->user[0]))
+        if (isdigit(acc->user[0]))
                 odata->icq = TRUE;
         else
@@ -2500 +2500 @@
         char * chatname, *s;
         
-        chatname = g_strdup_printf("%s%s%d", g_ascii_isdigit(*ic->acc->user) ? "icq" : "",
+        chatname = g_strdup_printf("%s%s%d", isdigit(*ic->acc->user) ? "icq" : "",
                                    ic->acc->user, chat_id++);
         
         for (s = chatname; *s; s ++)
-                if (!g_ascii_isalnum(*s))
+                if (!isalnum(*s))
                         *s = '0';
         

protocols/oscar/oscar_util.c

@@ -57 +57 @@
                                 curPtr2++;
                 } else {
-                        if ( g_ascii_toupper(*curPtr1) != g_ascii_toupper(*curPtr2))
+                        if ( toupper(*curPtr1) != toupper(*curPtr2))
                                 return 1;
                         curPtr1++;

protocols/purple/purple.c

@@ -61 +61 @@
                 while( *a == '_' ) a ++;
                 while( *b == '_' ) b ++;
-                if( g_ascii_tolower( *a ) != g_ascii_tolower( *b ) )
+                if( tolower( *a ) != tolower( *b ) )
                         return FALSE;
                 
@@ -1148 +1148 @@
                                 {
                                         n = strlen( value ) - 1;
-                                        while( g_ascii_isspace( value[n] ) )
+                                        while( isspace( value[n] ) )
                                                 n --;
                                         g_string_append_len( info, value, n + 1 );

protocols/skype/skype.c

@@ -16 +16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
@@ -514 +514 @@
                                 char *iptr = sd->info_sex;
                                 while (*iptr++)
-                                        *iptr = g_ascii_tolower(*iptr);
+                                        *iptr = tolower(*iptr);
                                 g_string_append_printf(st,
                                         "Gender: %s\n", sd->info_sex);

protocols/twitter/twitter.c

@@ -459 +459 @@
 
                         strcpy(pin, message);
-                        for (s = pin + sizeof(pin) - 2; s > pin && g_ascii_isspace(*s); s--)
+                        for (s = pin + sizeof(pin) - 2; s > pin && isspace(*s); s--)
                                 *s = '\0';
-                        for (s = pin; *s && g_ascii_isspace(*s); s++) {
+                        for (s = pin; *s && isspace(*s); s++) {
                         }
 

protocols/yahoo/libyahoo2.c

@@ -44 +44 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

protocols/yahoo/yahoo.c

@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

protocols/yahoo/yahoo2.h

@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

protocols/yahoo/yahoo2_callbacks.h

@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

protocols/yahoo/yahoo2_types.h

@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

protocols/yahoo/yahoo_debug.h

@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

protocols/yahoo/yahoo_httplib.c

@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
@@ -152 +152 @@
 static int isurlchar(unsigned char c)
 {
-        return (g_ascii_isalnum(c));
+        return (isalnum(c));
 }
 

protocols/yahoo/yahoo_httplib.h

@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

protocols/yahoo/yahoo_list.h

@@ -17 +17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

protocols/yahoo/yahoo_util.c

@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

protocols/yahoo/yahoo_util.h

@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

query.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

query.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

root_commands.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

set.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -226 +226 @@
         
         for( ; *s; s ++ )
-                if( !g_ascii_isdigit( *s ) )
+                if( !isdigit( *s ) )
                         return SET_INVALID;
         

set.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

storage.c

@@ -22 +22 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

storage.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

storage_xml.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */
 

unix.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
-  Fifth Floor, Boston, MA  02110-1301  USA
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
 */