Changeset 7869e48

COPYING

-                      rccc182c
+                      r7869e48
 the original authors' reputations.
   Finally, any free program is threatened constantly by software
 patents.  We wish to avoid the danger that companies distributing free
 …
 General Public License rather than by this special one.
                   GNU LIBRARY GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 …
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
 . You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 …
 and you may at your option offer warranty protection in exchange for a
 fee.
 . You may modify your copy or copies of the Library or any portion
 …
 these notices.
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 …
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
 . As an exception to the Sections above, you may also compile or
 …
 distribute.
 . You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 …
 You are not responsible for enforcing compliance by third parties to
 this License.
 . If, as a consequence of a court judgment or allegation of patent
 …
 the Free Software Foundation.
 . If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 …
                      END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Libraries
 …
   - "Package" refers to the collection of files distributed by the Copyright
     Holder, and derivatives of that collection of files created through
     textual modification.
+    textual modification.
   - "Standard Version" refers to such a Package if it has not been modified,
     or has been modified in accordance with the wishes of the Copyright
     Holder.
+    Holder.
   - "Copyright Holder" is whoever is named in the copyright or copyrights for
     the package.
+    the package.
   - "You" is you, if you're thinking about copying or distributing this Package.
   - "Reasonable copying fee" is whatever you can justify on the basis of media
     cost, duplication charges, time of people involved, and so on. (You will
     not be required to justify it to the Copyright Holder, but only to the
     computing community at large as a market that must bear the fee.)
+    computing community at large as a market that must bear the fee.)
   - "Freely Available" means that no fee is charged for the item itself, though
     there may be fees involved in handling the item. It also means that
     recipients of the item may redistribute it under the same conditions they
     received it.
+    received it.
 . You may make and give away verbatim copies of the source form of the

ChangeLog

-                      r65ff3f4
+                      r7869e48
      libncursesw. - asedeno
    * text entry:
     first pass at utf-8 text entry.
+    first pass at utf-8 text entry.
    * Change wcwidth() calls to mk_wcwidth() - asedeno
    * First pass at outbound zephyr -> iso-8859-1 sanitizing.
 …
 .1.12pre
         Don't crash when sending/logging outgoing
+        Don't crash when sending/logging outgoing
            AIM message and not logged in [BZ 90]
         Don't crash when senging to someone not on AIM buddy list [BZ 94]
            (patch from Alex Vandiver)
 .1.11
         Don't crash doing zlocate with bad tickets. [BZ 12]
 …
         A fix for certain resize crashes (partly from alexmv) [BZ 55]
         Turn off ISTRIP (gildea)
 .1.9
         Include /usr/include/kerberosIV if it's found
 .1.8
         Do OLC formatting for anything coming from olc.matisse
         Improvements to popup size algorithm (from gildea)
         Improved 'show colors' with non-colored labels
 .1.7
         The colorclass command is added, to make colorization easy
 …
         Do ntohs() when printing zephyr port in zephyr info
         Updated man page
 .1.6
         Fixed three bugs found by Valgrind.
 …
         Dropped first brace in muxevents functions for consistency
         Catch SIGHUP and SIGTERM and do a proper logout
 .1.5
         Added a licence
 …
           will also be logged if this is set to 'on'
         Added 'show license'
 .1.4
         Normalize and downcase AIM names for logging
 …
         Do the initial zephyr_buddy_check when pseduologin set to true.
         Updated man page
 .1.2
         removed unused filter_depth variable
         Fixed memory bug on receiving pings
 .1.1
         Filters of filters now work.
 …
         Don't print extra new lines in popless_file
         New zephyr_get_field function
 .0.14
         Fixed missing word in startup message
 …
         Current directory added to 'status' command
         Massive changes to libfaim and aim
 .0.13
         Changed startup message for new mailing list
         blist now prints AIM info even if .anyone is unreadable
         Catch SIGPIPE and print an error rather than crashing.
                 [It's possible that this may have some portability
                 issues under Solaris and we may need to add some
+                [It's possible that this may have some portability
+                issues under Solaris and we may need to add some
                 configure stuff around SA_SIGINFO...]
         Handle the case in aim_bstream_send where aim_send returns -1,
 …
         Un-word-wrap text when sending AIM messages.
         Replace the main loop continue in the keyboard handler with an else.
 .0.12
         Command history now doesn't allow the last entry
 …
         Print an error message if trying an invalid color for a filter
         Fixed bug causing > not to go to end of editwin every time
 .0.11
         Updated basic help
 …
         Zpunt now works with weird regex characters
         Smart filters now work with weird regex characters
 .0.10
         Allow 'hostname' in filters.
 …
         An admin message is displayed when you are logged out of AIM
         Print an error message and admin message if an AIM send fails
 .0.9
         Added the 'fancylines' variable.
 …
         Added command "show errors"
         Fixed bug removing newlines in backup files
 .0.8
         Increased size of screen name field in buddy listing
 …
         Add owl::login and owl::auth to legacy variables populated for format_msg.
         Additions to intro.txt and advanced.txt documents.  (Still in progress.)
         Add base methods for login_host and login_tty
+        Add base methods for login_host and login_tty
                 and others that return undef.
         New API for perl message formatting functions.
+        New API for perl message formatting functions.
                 Legacy variables are still supported for owl::format_msg
                 and owl::receive_msg, but these functions are now also
+                and owl::receive_msg, but these functions are now also
                 passed an owl::Message object which contains methods
                 for accessing the contents of the message.  See perlwrap.pm
+                for accessing the contents of the message.  See perlwrap.pm
                 (and docs TBD) for the available methods.
                 *** WARNING:  The exact API for owl::Message has
 …
         When perl throws an error, the message is put in the msgwin
                 if possible.
         Added perl functions for:
+        Added perl functions for:
                 owl::getcurmsg() -- returns an owl::Message object for
                                     the active message
 …
                 owl::zephyr_getrealm() -- returns the zephyr realm
                 owl::zephyr_getsender() -- returns the zephyr sender
         Made owl::COMMAND("foo"); be syntactic sugar for
+        Made owl::COMMAND("foo"); be syntactic sugar for
                 owl::command("COMMAND foo");
         Added perlwrap.pm to contain perl code to be compiled into
+        Added perlwrap.pm to contain perl code to be compiled into
                 the binary.  This is transformed into perlwrap.c by
                 encapsulate.pl.
 …
         Improved status command
         Fixed bug in buddy stuff
 .0.6
         aimlogin will now accept the screenname without a password and ask
 …
         Reformatted editwin.c and added capability of doing password-style
            echoing
 .0.5
         Fix in finding des for building zcrypt
 …
         Added hostname and tty name to LOGIN/LOGOUT zephyrs on oneline
           style
 .0.4
         Made command line option -n actually work
 …
         Translate &lt; &gt; &amp; &quot; &nbsp; &ensp, &emsp, &endash and
            &emdash
 .0.3
         Don't ring the terminal bell on mail messages.
 …
         Fixed a bug in fmtext
         Expanded the size of the hostname buffer
 .0.2
         Fixed bug in 'startup' command.
 …
         Disabled 'addbuddy' and 'delbuddy' for aim since it doesn't work yet
         Hacked the Perl build stuff not to link with iconv
 .2.8
         Class pings are displayed differently now
         Updated owlconf.simple example to format outgoing messages.
 .2.7
         Outgoing messages now go through the config for formatting
 …
         Started implementing zcrypt command
         More updates to the intro doc
 .2.6
         Started adding code for newmsgproc.  It doesn't fully work yet!
 …
         Implemented the dump command
         New startup message
 .2.5
         Patch to fix memory bug in replying to CC messages
 …
         Cast to an int for isspace, to make gcc -Wall quiet
         Added 'zlist' and 'l' to basic help.
 .2.4
         'zlog in' will now take an optional thrid argument to set the
 …
         Made daemon.webzephyr a special case for smartstrip
         Added 'out' as a default filter for outgoing messages
 .2.3
         Added filters "ping", "auto" and "login" by default.
 …
         Print the zsig used for outgoing messages
         The tty variable now controls the zephyr location tty name
 .2.2
         Added the 'search' command.
 …
              When switching from an empty view to one we've previously
              been in, the new current message position will attempt
              to be close to the current position from the last
+             to be close to the current position from the last
              time we visited that view.
         Fixed bug in readconfig.c that prevented building under perl 5.005.
 …
         New framework for command handling.
         New framework for keymap handling.
         Added commands for everything that is bound
+        Added commands for everything that is bound
              to a key (do 'show commands' to get the full list).
         Added 'multi' and '(' commands to allow multiple commands
              to be specified on a line.
+             to be specified on a line.
         Added user keybindings with bindkey command.
         Added command aliases (eg, "alias foo bar").
 …
         C-t will transpose characters
         Fix the scrolling bug where we would sometimes fail to scroll
              the screen down, leaving the current message off
+             the screen down, leaving the current message off
              the bottom of the screen.
         Refixed 'login or login' typo in help
 …
         Added owl_sprintf which returns the formatted string, or NULL.
                 The caller must free this string.
                 This will allocate enough memory and thus
+                This will allocate enough memory and thus
                 avoid potential some buffer overrun situations.
         Simple implementation of 'zwrite -m' (doesn't yet log an outgoing
                 message as having been sent.)
         The "Not logged in or subscribing to messages" error
+        The "Not logged in or subscribing to messages" error
                 now includes the name of the recipient.
         The "disable-ctrl-d" variable may also be set to "middle"
                 which will result in ctrl-d only sending at the
+                which will result in ctrl-d only sending at the
                 end of the message.  This is now the default.
                 This also added a command "editmulti:done-or-delete".
 …
                 The M-n and M-p keys will cycle through the history ring.
                 In particular, it is now possible to edit the command line
                 of a zephyr being composed:  C-c it and restart it
+                of a zephyr being composed:  C-c it and restart it
                 and then M-p to get the aborted composition back.
         Added owl::send_zwrite(command, message) to the perl glue
                 to allow for the direct sending of multi-line messages.
                 For example:  owl::send_zwrite("-c foo -i bar", "hello");
         Changed owl_fmtext_print_plain to return an alloc'd string to
+                For example:  owl::send_zwrite("-c foo -i bar", "hello");
+        Changed owl_fmtext_print_plain to return an alloc'd string to
                 avoid buffer overrun risks.
         Added owl::ztext_stylestrip("...") function to perlglue
+        Added owl::ztext_stylestrip("...") function to perlglue
                  which returns the ztext with formatting stripped out.
         Added colorztext variable which can be used to disable @color()
 …
         Added opera to the allowed options to the webbrowser variable.
         Fixed some buffer overruns in the "reply" command.
         When repying to "all" on a message that begins with "CC:" (eg, sent
+        When repying to "all" on a message that begins with "CC:" (eg, sent
                  with "zwrite -C", the reply line will be constructed
                  from the sender and the usernames on the CC: line
 …
         Added --no-move option to delete command.
                 In particular, delete-and-always-move-down may now
                 be implemented with
+                be implemented with
                 '( delete --no-move ; next --skip-deleted )'.
         Folded the nextmsg and prevmsg commands and functions together into
+        Folded the nextmsg and prevmsg commands and functions together into
                 one command which takes arguments.
                 Added '--filter <name>' option (eg, for next_personal),
                 '--skip-deleted' option, and
                 '--last-if-none'/'--first-if-none' options.
                 Help updated accordingly.
                 In particular, the 'personal' filter is now used
                 for 'next personal'.
                 Added --smart-filter and --smart-filter-instance options
+                Help updated accordingly.
+                In particular, the 'personal' filter is now used
+                for 'next personal'.
+                Added --smart-filter and --smart-filter-instance options
                 to the next and prev commands.
         Updated examples/owlconf.erik with the above.
         Made owl_function_fast*filt return a string and not do the
+        Made owl_function_fast*filt return a string and not do the
                 narrowing, to make it more general.
         Added a smartfilter command that creates a filter
                 based on the current message and returns the name
                 of the filter.
         Added M-C-n and M-C-p keybindings to "move to next message
                 matching current" and "move to previous message
+        Added M-C-n and M-C-p keybindings to "move to next message
+                matching current" and "move to previous message
                 matching current"
         Added variables edit:maxfillcols and edit:maxwrapcols which
+        Added variables edit:maxfillcols and edit:maxwrapcols which
                 will limit how wide editing paragraphs may get before
                 they get wrapped.  This is a max and may be narrower
 …
                 edit:maxfillcols and unlimited for edit:maxwrapcols.
         Added smartzpunt command with key binding of "C-x k".
                 This starts a zpunt command filled in with
+                This starts a zpunt command filled in with
                 the proposed zpunt.
         Fixed a memory reference bug in delete and undelete commands.
 …
                 call back into owl.  This allows perl to get the return
                 value of strings returned by owl commands.
         Added the getview command which returns the name of the current
                 view's filter.
+        Added the getview command which returns the name of the current
+                view's filter.
         Added the getvar command which returns the value of a variable.
         Added an example to examples/owlconf.erik which uses TAB to
                 narrow and restore the view.
         Added an example to examples/owlconf.erik which uses M-c to
+        Added an example to examples/owlconf.erik which uses TAB to
+                narrow and restore the view.
+        Added an example to examples/owlconf.erik which uses M-c to
                 color messages matching the current one green.
         Integrated change to fix problem with popup blinking on new zephyrs.
 …
                 and new show commands.
         Show with arguments produces help on show.
         Fix a bug in readconfig caught by efence (where we'd try to read before
+        Fix a bug in readconfig caught by efence (where we'd try to read before
                 the beginning of a string if it was empty).
         The perl command doesn't do makemsg directly, but instead
              returns the string and it will get printed if it
+             returns the string and it will get printed if it
              was run interactively.
 .1.3
         'show subs' and 'show subscriptions' are now the same as 'getsubs'
 …
         Include login/logout messages in auto user filters
         'V' changes to the home view ('all' by default)
 .1.1
         Fixed perl, aperl, and pperl commands to deal with quoting
+        Fixed perl, aperl, and pperl commands to deal with quoting
               and spaces in a saner manner.
         Removed all owl_get_* methods for booleans and switched
               cases where they were used to owl_is_*
+              cases where they were used to owl_is_*
         Changes to owlconf.erik to use some new features.
         Increased the size of the help buffer (as it
+        Increased the size of the help buffer (as it
               was overflowing and truncating the help message).
         Variables prefixed with a _ are not shown in help
               or by printallvars (and prefixed Not Yet Implemented
+              or by printallvars (and prefixed Not Yet Implemented
               variables with this).
         Fix typo in help
 …
         display admin message time in 'info' command
         fixed an editwin M-> last character bug
 .1
         reply is a normal function now
 …
         Fixed an arg checking bug in delete command
         Added owl::id to perl namespace with message id
         Fixed a memory corruption bug in readconfig.c (where right
+        Fixed a memory corruption bug in readconfig.c (where right
               after the strdup to "out", we'd strcat a \n onto the end.
               This would be triggered whenever owl::format_msg returned
               a string not ending in a newline
         Added 'X' keybinding which expunges and then switches to
               a view defined by the variable "view_home" which defaults
+        Added 'X' keybinding which expunges and then switches to
+              a view defined by the variable "view_home" which defaults
               to "all"
         Consolidated readconfig.c somewhat to remove duplication.
 …
               are generated from variable.c by stubgen.pl.
               The help.c messages for variables now calls into variable.c
               so all information about most variables is in one place.
+              so all information about most variables is in one place.
         Cleaned out code from global.c and command.c that was made obselete
               by variable overhaul.
         The set command now takes a -q option to not log a message.
         Fixed a bug where set and print with no arguments would
               print "Undefined variable" in addition
+              print "Undefined variable" in addition
               to running owl_function_printallvars.
         debug is now a variable that can be turned on and off.
         Fixed mail,inbox message parsing in examples/owlconf.erik
         Made zaway_msg and zaway_msg_default into variables
         Changed owl_function_makemsg and owl_function_debugmsg
+        Made zaway_msg and zaway_msg_default into variables
+        Changed owl_function_makemsg and owl_function_debugmsg
                to use varargs (ie, so they can now take a format
                string with args).
 …
         Added doc/code.txt which gives a brief overview of the code.
         Added tags makefile rule and added TAGS to distclean rule.
 .0.1
         fix frees in loadsubs and loadloginsubs
         don't return in owl_free
 .0
         'print' and 'set' with no arguments prints all variables
 …
         you can now reply to an admin message
         don't display an error about keypress on window resize
 .11
         fixed bug in viewing messages longer than the screen
 …
         change malloc, realloc, strdup and free to use owl hooks so that
            debugging can be added
 .10.1
         fixed a trailing space bug in the parser
 …
         fixed bug in reporting which M- key was pressed
         C-g will now cancel commands like C-c
 .10
         implemented owl_function_full_redisplay().
 …
         some build cleanup
 .9
         added owl_message_is_personal and have things use it
 …
         added smart bolding and userclue
         fixed a bug causing pings to beep even if rxping is off
 .8.1
         fixed bug in logging code
 .8
         implemented personal logging
 …
         fixed the backspace problem
         -v command line option prints the version number
 .7
         load-subs will report error opening file
 …
         added displayoutgoing variable
         temporarily removed error printing for zlog in / out
 .61
         fixed bug in "message sent to <foo>" for zwrite
 .6
         help updated
 …
         personal bell variable
         beta message now an admin message
 .5
         Added the debug command and flag

aim.c

-                      rf271129
+                      r7869e48
    * future.  It's still called by Owl.
    */
+}
 …
   aim_setdebuggingcb(sess, faimtest_debugcb);
   aim_tx_setenqueue(sess, AIM_TX_IMMEDIATE, NULL);
   /* this will leak, I know and just don't care right now */
   priv=g_new0(struct owlfaim_priv, 1);
 …
   */
   aim_conn_addhandler(sess, conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, faimtest_flapversion, 0);
   aim_conn_addhandler(sess, conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0);
 …
   /* aim_conn_addhandler(sess, conn, 0x0017, 0x0007, gaim_parse_login, 0); */
   /* aim_conn_addhandler(sess, conn, 0x0017, 0x0003, gaim_parse_auth_resp, 0); */
   /* start processing AIM events */
   owl_global_set_doaimevents(&g);
 …
   owl_function_debugmsg("owl_aim_search: doing search for %s", email);
   ret=aim_search_address(owl_global_get_aimsess(&g),
+  ret=aim_search_address(owl_global_get_aimsess(&g),
                          aim_getconn_type(owl_global_get_aimsess(&g), AIM_CONN_TYPE_BOS),
                          email);
 …
     len=499;
+  }
   aim_locate_setprofile(owl_global_get_aimsess(&g),
                         NULL, NULL, 0,
 …
   aim_bos_setprofile(owl_global_get_aimsess(&g),
                      owl_global_get_bosconn(&g),
                      NULL, NULL, 0, "us-ascii", msg,
+                     NULL, NULL, 0, "us-ascii", msg,
                      strlen(msg), 0);
   */
 …
                                aim_getconn_type(owl_global_get_aimsess(&g), AIM_CONN_TYPE_CHATNAV), name, exchange);
    ret=aim_chat_join(owl_global_get_aimsess(&g), owl_global_get_bosconn(&g), exchange, name, 0x0000);
+}
 …
   if (selstat == -1) {
     owl_aim_logged_out();
   } else if (selstat == 0) {
+  } else if (selstat == 0) {
     /* no events pending */
   } else if (selstat == 1) { /* outgoing data pending */
 …
   } else if (selstat == 2) { /* incoming data pending */
     /* printf("selstat == 2\n"); */
     if (aim_get_command(aimsess, waitingconn) >= 0) {
       aim_rxdispatch(aimsess);
 …
   struct owlfaim_priv *priv = sess->aux_data;
   struct client_info_s info = CLIENTINFO_AIM_KNOWNGOOD;
   const char *key;
   va_list ap;
 …
   aim_send_login(sess, fr->conn, priv->screenname, priv->password, &info, key);
   return(1);
+}
 …
   aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOK, 0x0003, faimtest_parse_searchreply, 0);
   */
   aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_ERROR,              faimtest_parse_msgerr, 0);
   aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_USERINFO,           faimtest_parse_userinfo, 0);
 …
   fu16_t code;
   const char *msg;
   va_start(ap, fr);
   code = va_arg(ap, int);
   msg = va_arg(ap, const char *);
   va_end(ap);
   owl_function_error("faimtest_parse_connerr: Code 0x%04x: %s\n", code, msg);
   aim_conn_kill(sess, &fr->conn); /* this will break the main loop */
   priv->connected = 0;
   return 1;
+}
 …
   int status;
   va_list ap;
   va_start(ap, fr);
   status = va_arg(ap, int); /* status code of confirmation request */
 …
   /* owl_function_debugmsg("faimtest_accountconfirm: Code 0x%04x: %s\n", code, msg); */
   owl_function_debugmsg("faimtest_accountconfirm: account confirmation returned status 0x%04x (%s)\n", status, (status==0x0000)?"email sent":"unknown");
   return 1;
+}
 …
   const char *val;
   va_list ap;
   va_start(ap, fr);
   change = va_arg(ap, int);
 …
   str = va_arg(ap, int);
   va_end(ap);
   owl_function_debugmsg("faimtest_infochange: info%s: perms = %d, type = %x, length = %d, val = %s", change?" change":"", perms, type, length, str?val:"(not string)");
   return(1);
+}
 …
   owl_function_debugmsg("faimtest_handledirect:");
   va_start(ap, fr);
   redir = va_arg(ap, struct aim_redirect_data *);
   if (redir->group == 0x0005) {  /* Adverts */
   } else if (redir->group == 0x0007) {  /* Authorizer */
     aim_conn_t *tstconn;
     owl_function_debugmsg("faimtest_handledirect: autorizer");
     tstconn = aim_newconn(sess, AIM_CONN_TYPE_AUTH, redir->ip);
     if (!tstconn || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) {
 …
   struct aim_icbmparameters *params;
   va_list ap;
   va_start(ap, fr);
   params = va_arg(ap, struct aim_icbmparameters *);
   va_end(ap);
   owl_function_debugmsg("faimtest_icbmparaminfo: ICBM Parameters: maxchannel = %d, default flags = 0x%08x, max msg len = %d, max sender evil = %f, max reciever evil = %f, min msg interval = %u",
                        params->maxchan, params->flags, params->maxmsglen, ((float)params->maxsenderwarn)/10.0, ((float)params->maxrecverwarn)/10.0, params->minmsginterval);
   /*
   * Set these to your taste, or client medium.  Setting minmsginterval
 …
   /* aim_seticbmparam(sess, params); */
   aim_im_setparams(sess, params);
   return 1;
+}
 …
   va_list ap;
   fu16_t maxbuddies, maxwatchers;
   va_start(ap, fr);
   maxbuddies = va_arg(ap, int);
   maxwatchers = va_arg(ap, int);
   va_end(ap);
   owl_function_debugmsg("faimtest_parse_buddyrights: Max buddies = %d / Max watchers = %d\n", maxbuddies, maxwatchers);
   /* aim_ssi_reqrights(sess, fr->conn); */
   aim_ssi_reqrights(sess);
   return 1;
+}
 …
   va_list ap;
   fu16_t maxpermits, maxdenies;
   va_start(ap, fr);
   maxpermits = va_arg(ap, int);
   maxdenies = va_arg(ap, int);
   va_end(ap);
   owl_function_debugmsg("faimtest_bosrights: Max permit = %d / Max deny = %d\n", maxpermits, maxdenies);
   aim_clientready(sess, fr->conn);
 …
   va_list ap;
   fu16_t maxsiglen;
   va_start(ap, fr);
   maxsiglen = va_arg(ap, int);
 …
   owl_function_debugmsg("faimtest_locrights: rights: max signature length = %d\n", maxsiglen);
   return(1);
+}
 …
   owl_function_debugmsg("faimtest_parse_motd: %s (%d / %s)\n", msg?msg:"nomsg", id, (id < codeslen)?codes[id]:"unknown");
   return 1;
+}
 …
   if (flags & AIM_FLAG_WIRELESS) printf("WIRELESS ");
   if (flags & AIM_FLAG_ACTIVEBUDDY) printf("ACTIVEBUDDY ");
   return;
+}
 …
 static int faimtest_parse_incoming_im_chan2(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args)
+{
   /*
+  /*
   printf("rendezvous: source sn = %s\n", userinfo->sn);
   printf("rendezvous: \twarnlevel = %f\n", aim_userinfo_warnlevel(userinfo));
 …
   printuserflags(userinfo->flags);
   printf("\n");
   printf("rendezvous: \tonlinesince = %lu\n", userinfo->onlinesince);
   printf("rendezvous: \tidletime = 0x%04x\n", userinfo->idletime);
   printf("rendezvous: message/description = %s\n", args->msg);
   printf("rendezvous: encoding = %s\n", args->encoding);
   printf("rendezvous: language = %s\n", args->language);
   */
   if (args->reqclass == AIM_CAPS_SENDFILE) {
     owl_function_debugmsg("faimtest_parse_incoming_im_chan2: send file!");
 …
   va_list ap;
   int ret = 0;
   va_start(ap, fr);
   channel = (fu16_t)va_arg(ap, unsigned int);
   userinfo = va_arg(ap, aim_userinfo_t *);
   if (channel == 1) {
     struct aim_incomingim_ch1_args *args;
 …
   nz_screenname=owl_aim_normalize_screenname(userinfo->sn);
   owl_buddylist_oncoming(owl_global_get_buddylist(&g), nz_screenname);
 …
     owl_function_debugmsg("parse_oncoming sn: %s away flag!", userinfo->sn);
+  }
   owl_function_debugmsg("parse_oncoming sn: %s idle: %i", userinfo->sn, userinfo->idletime);
   g_free(nz_screenname);
   /*
     printf("%ld  %s is now online (flags: %04x = %s%s%s%s%s%s%s%s) (caps = %s = 0x%08lx)\n",
 …
   char *nz_screenname;
   va_list ap;
   va_start(ap, fr);
   userinfo = va_arg(ap, aim_userinfo_t *);
 …
          userinfo->capabilities);
   */
   return 1;
+}
 …
   va_list ap;
   fu16_t reason;
   va_start(ap, fr);
   reason = (fu16_t)va_arg(ap, unsigned int);
   va_end(ap);
   /* printf("snac threw error (reason 0x%04x: %s)\n", reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
   if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
   return 1;
+}
 …
   const char *destsn;
   fu16_t reason;
   va_start(ap, fr);
   reason = (fu16_t)va_arg(ap, unsigned int);
   destsn = va_arg(ap, const char *);
   va_end(ap);
   /* printf("message to %s bounced (reason 0x%04x: %s)\n", destsn, reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
   if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
 …
     owl_function_adminmsg("", "Could not send AIM message, user not logged on");
+  }
   return 1;
+}
 …
   const char *destsn;
   fu16_t reason;
   va_start(ap, fr);
   reason = (fu16_t)va_arg(ap, unsigned int);
   destsn = va_arg(ap, const char *);
   va_end(ap);
   /* printf("user information for %s unavailable (reason 0x%04x: %s)\n", destsn, reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
   if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
   return 1;
+}
 …
   };
   static int missedreasonslen = 5;
   va_list ap;
   fu16_t chan, nummissed, reason;
   aim_userinfo_t *userinfo;
   va_start(ap, fr);
   chan = (fu16_t)va_arg(ap, unsigned int);
 …
   reason = (fu16_t)va_arg(ap, unsigned int);
   va_end(ap);
   owl_function_debugmsg("faimtest_parse_misses: missed %d messages from %s on channel %d (reason %d: %s)\n", nummissed, userinfo->sn, chan, reason, (reason<missedreasonslen)?missedreasons[reason]:"unknown");
   return 1;
+}
 …
   fu16_t type;
   const char *sn = NULL;
   va_start(ap, fr);
   type = (fu16_t)va_arg(ap, unsigned int);
   sn = va_arg(ap, const char *);
   va_end(ap);
   owl_function_debugmsg("faimtest_parse_msgack: 0x%04x / %s\n", type, sn);
   return 1;
+}
 …
   fu32_t windowsize, clear, alert, limit, disconnect;
   fu32_t currentavg, maxavg;
   va_start(ap, fr);
+  va_start(ap, fr);
   /* See code explanations below */
   code = (fu16_t)va_arg(ap, unsigned int);
   /*
    * See comments above aim_parse_ratechange_middle() in aim_rxhandlers.c.
    */
   rateclass = (fu16_t)va_arg(ap, unsigned int);
   /*
    * Not sure what this is exactly.  I think its the temporal
+  /*
+   * Not sure what this is exactly.  I think its the temporal
    * relation factor (ie, how to make the rest of the numbers
    * make sense in the real world).
+   * make sense in the real world).
    */
   windowsize = va_arg(ap, fu32_t);
   /* Explained below */
   clear = va_arg(ap, fu32_t);
 …
   currentavg = va_arg(ap, fu32_t);
   maxavg = va_arg(ap, fu32_t);
   va_end(ap);
+  va_end(ap);
   owl_function_debugmsg("faimtest_parse_ratechange: rate %s (rate class 0x%04x): curavg = %u, maxavg = %u, alert at %u, clear warning at %u, limit at %u, disconnect at %u (window size = %u)",
                         (code < 5)?codes[code]:"invalid",
 …
   fu16_t newevil;
   aim_userinfo_t *userinfo;
   va_start(ap, fr);
   newevil = (fu16_t)va_arg(ap, unsigned int);
   userinfo = va_arg(ap, aim_userinfo_t *);
   va_end(ap);
   /*
    * Evil Notifications that are lacking userinfo->sn are anon-warns
 …
    */
   owl_function_debugmsg("faimtest_parse_evilnotify: new value = %2.1f%% (caused by %s)\n", ((float)newevil)/10, (userinfo && strlen(userinfo->sn))?userinfo->sn:"anonymous");
   return 1;
+}
 …
   int num, i;
   GPtrArray *list;
   va_start(ap, fr);
   address = va_arg(ap, const char *);
 …
   list = g_ptr_array_new();
   owl_function_debugmsg("faimtest_parse_searchreply: E-Mail Search Results for %s: ", address);
   for (i=0; i<num; i++) {
 …
   va_list ap;
   const char *address;
   va_start(ap, fr);
   address = va_arg(ap, const char *);
 …
   owl_function_error("No results searching for %s", address);
   owl_function_debugmsg("faimtest_parse_searcherror: E-Mail Search Results for %s: No Results or Invalid Email\n", address);
   return(1);
+}
 …
   const char *msg, *url;
   fu16_t width, height, delay;
   va_start(ap, fr);
   msg = va_arg(ap, const char *);
 …
   delay = va_arg(ap, unsigned int);
   va_end(ap);
   owl_function_debugmsg("handlepopup: (%dx%x:%d) %s (%s)\n", width, height, delay, msg, url);
   return 1;
+}
 …
   const char *bosip;
   fu8_t *cookie;
   va_start(ap, fr);
   bosip = va_arg(ap, const char *);
   cookie = va_arg(ap, fu8_t *);
   va_end(ap);
   owl_function_debugmsg("migrate: migration in progress -- new BOS is %s -- disconnecting", bosip);
   aim_conn_kill(sess, &fr->conn);
   if (!(bosconn = aim_newconn(sess, AIM_CONN_TYPE_BOS, bosip))) {
     owl_function_debugmsg("migrate: could not connect to BOS: internal error");
     return 1;
   } else if (bosconn->status & AIM_CONN_STATUS_CONNERR) {
+  } else if (bosconn->status & AIM_CONN_STATUS_CONNERR) {
     owl_function_debugmsg("migrate: could not connect to BOS");
     aim_conn_kill(sess, &bosconn);
     return 1;
+  }
   /* Login will happen all over again. */
   addcb_bos(sess, bosconn);
 …
   /* aim_ssi_reqdata(sess, fr->conn, 0, 0x0000); */
   aim_ssi_reqdata(sess);
   return(1);
+}
 …
   struct aim_ssi_item *l;
   */
   va_start(ap, fr);
   fmtver = va_arg(ap, unsigned int);
 …
   list = va_arg(ap, struct aim_ssi_item *);
   va_end(ap);
   owl_function_debugmsg("ssiddata: got SSI data (0x%02x, %d items, %u)", fmtver, itemcount, stamp);
   /*
 …
   */
   aim_ssi_enable(sess);
   return 1;
+}
 …
   va_list ap;
   struct aim_icq_offlinemsg *msg;
   va_start(ap, fr);
   msg = va_arg(ap, struct aim_icq_offlinemsg *);
   va_end(ap);
   if (msg->type == 0x0001) {
     owl_function_debugmsg("offlinemsg: from %u at %d/%d/%d %02d:%02d : %s", msg->sender, msg->year, msg->month, msg->day, msg->hour, msg->minute, msg->msg);
 …
   int count;
   /* int i; */
   va_start(ap, fr);
   count = va_arg(ap, int);
 …
   /* int i; */
   va_start(ap, fr);
   count = va_arg(ap, int);
   userinfo = va_arg(ap, aim_userinfo_t *);
   va_end(ap);
   /*
     printf("chat: %s:  Some occupants have left:\n", aim_chat_getname(fr->conn));
     for (i = 0; i < count; i++)
     printf("chat: %s: \t%s\n", aim_chat_getname(fr->conn), userinfo[i].sn);
 …
   const char *croomname;
   /* int i; */
   croomname = aim_chat_getname(fr->conn);
   va_start(ap, fr);
   roominfo = va_arg(ap, struct aim_chat_roominfo *);
 …
   for (i = 0; i < usercount; i++)
     printf("chat: %s:  \t\t%s\n", croomname, userinfo[i].sn);
   owl_function_debugmsg("chat: %s:  \tRoom flags: 0x%04x (%s%s%s%s)\n",
+  owl_function_debugmsg("chat: %s:  \tRoom flags: 0x%04x (%s%s%s%s)\n",
          croomname, flags,
          (flags & AIM_CHATROOM_FLAG_EVILABLE) ? "Evilable, " : "",
 …
   printf("chat: %s:  \tMax visible message length: %d bytes\n", croomname, maxvisiblemsglen);
   */
   return(1);
+}
 …
   const char *msg;
   char tmpbuf[1152];
   va_start(ap, fr);
   userinfo = va_arg(ap, aim_userinfo_t *);
+  va_start(ap, fr);
+  userinfo = va_arg(ap, aim_userinfo_t *);
   msg = va_arg(ap, const char *);
   va_end(ap);
 …
   printf("chat: %s: incoming msg from %s: %s\n", aim_chat_getname(fr->conn), userinfo->sn, msg);
   */
   /*
    * Do an echo for testing purposes.  But not for ourselves ("oops!")
 …
     aim_chat_send_im(sess, fr->conn, 0, tmpbuf, strlen(tmpbuf));
+  }
   return 1;
+}
 …
   aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_ROOMINFOUPDATE, faimtest_chat_infoupdate, 0);
   aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_INCOMINGMSG, faimtest_chat_incomingmsg, 0);
   aim_clientready(sess, fr->conn);
   owl_function_debugmsg("Chat ready");
 …
   owl_function_debugmsg("in faimtest_chatnav_redirect");
   tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHATNAV, redir->ip);
   if (!tstconn || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) {
 …
     return;
+  }
   aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0);
   aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNINITDONE, conninitdone_chat, 0);
 …
   owl_function_debugmsg("in chat_redirect");
   tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHAT, redir->ip);
   if (!tstconn || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) {
     /* printf("unable to connect to chat server\n"); */
     if (tstconn) aim_conn_kill(sess, &tstconn);
     return;
+  }
+    return;
+  }
   /* printf("chat: connected to %s instance %d on exchange %d\n", redir->chat.room, redir->chat.instance, redir->chat.exchange); */
   /*
    * We must do this to attach the stored name to the connection!
 …
   aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNINITDONE, conninitdone_chat, 0);
   aim_sendcookie(sess, tstconn, redir->cookielen, redir->cookie);
   return;
+  return;
+}

buddylist.c

r3cdd6d2	r7869e48
12	12	owl_buddy *b;
13	13	b=g_new(owl_buddy, 1);
14
	14
15	15	owl_buddy_create(b, OWL_PROTOCOL_AIM, screenname);
16	16	g_ptr_array_add(bl->buddies, b);

cmd.c

-                      rf271129
+                      r7869e48
     owl_function_makemsg("Unbalanced quotes");
     return NULL;
+  }
+  }
   if (argc < 1) {
     g_strfreev(argv);
 …
+}
 int owl_cmd_is_context_valid(const owl_cmd *cmd, const owl_context *ctx) {
+int owl_cmd_is_context_valid(const owl_cmd *cmd, const owl_context *ctx) {
   if (owl_context_matches(ctx, cmd->validctx)) return 1;
   else return 0;
 …
       rv = owl_function_command(newcmd);
       g_free(newcmd);
+    }
+    }
     alias_recurse_depth--;
     return rv;
 …
   if (cmd->cmd_args_fn) {
     return cmd->cmd_args_fn(argc, argv, cmdbuff);
   } else if (cmd->cmd_v_fn) {
+  } else if (cmd->cmd_v_fn) {
     cmd->cmd_v_fn();
   } else if (cmd->cmd_i_fn) {
 …
   } else if (cmd->cmd_ctxargs_fn) {
     return cmd->cmd_ctxargs_fn(owl_context_get_data(ctx), argc, argv, cmdbuff);
   } else if (cmd->cmd_ctxv_fn) {
+  } else if (cmd->cmd_ctxv_fn) {
     cmd->cmd_ctxv_fn(owl_context_get_data(ctx));
   } else if (cmd->cmd_ctxi_fn) {
 …
+  }
   owl_fmtext_append_normal(fm, "\n\n");
+}
+  owl_fmtext_append_normal(fm, "\n\n");
+}

codelist.pl

r06adc25	r7869e48
29	29	print;
30	30	}
31
	31
32	32	}
33	33	close(FILE);

commands.c

-                      r39a531d
+                      r7869e48
               "",
               ""),
   OWLCMD_ARGS("start-command", owl_command_start_command, OWL_CTX_INTERACTIVE,
               "prompts the user to enter a command",
 …
               "send an AIM message",
               "aimwrite <user> [-m <message...>]",
               "Send an aim message to a user.\n\n"
+              "Send an aim message to a user.\n\n"
               "The following options are available:\n\n"
               "-m    Specifies a message to send without prompting.\n"),
 …
               "Behaves like zwrite but uses encryption.  Not for use with\n"
               "personal messages\n"),
   OWLCMD_ARGS("reply", owl_command_reply,  OWL_CTX_INTERACTIVE,
               "reply to the current message",
 …
   OWLCMD_VOID("unsuball", owl_command_unsuball, OWL_CTX_ANY,
               "unsubscribe from all zephyrs", "", ""),
   OWLCMD_VOID("getsubs", owl_command_getsubs, OWL_CTX_ANY,
               "print all current subscriptions",
 …
               "display detailed information about the current message",
               "", ""),
   OWLCMD_ARGS("help", owl_command_help, OWL_CTX_INTERACTIVE,
               "display help on using BarnOwl",
 …
               "scrolls receive window to specified position", "", ""),
   OWLCMD_VOID("recv:pagedown", owl_function_mainwin_pagedown,
+  OWLCMD_VOID("recv:pagedown", owl_function_mainwin_pagedown,
               OWL_CTX_INTERACTIVE,
               "scrolls down by a page", "", ""),
 …
   OWLCMD_INT ("recv:scroll", owl_function_page_curmsg, OWL_CTX_INTERACTIVE,
               "scrolls current message up or down",
               "recv:scroll <numlines>",
+              "scrolls current message up or down",
+              "recv:scroll <numlines>",
               "Scrolls the current message up or down by <numlines>.\n"
               "Scrolls up if <numlines> is negative, else scrolls down.\n"),
 …
   OWLCMD_VOID("last", owl_command_last, OWL_CTX_INTERACTIVE,
               "move the pointer to the last message", "",
+              "move the pointer to the last message", "",
               "Moves the pointer to the last message in the view.\n"
               "If we are already at the last message in the view,\n"
 …
   OWLCMD_VOID("status", owl_command_status, OWL_CTX_ANY,
               "print status information about the running BarnOwl", "", ""),
   OWLCMD_ARGS("zlocate", owl_command_zlocate, OWL_CTX_INTERACTIVE,
               "locate a user",
               "zlocate [-d] <user> ...",
+              "zlocate [-d] <user> ...",
               "Performs a zlocate on one ore more users and puts the result\n"
               "int a popwin.  If -d is specified, does not authenticate\n"
               "the lookup request.\n"),
   OWLCMD_ARGS("filter", owl_command_filter, OWL_CTX_ANY,
               "create a message filter",
 …
               "Show errors will show a list of errors encountered by BarnOwl.\n\n"
               "SEE ALSO: filter, view, alias, bindkey, help\n"),
   OWLCMD_ARGS("delete", owl_command_delete, OWL_CTX_INTERACTIVE,
               "mark a message for deletion",
 …
   /****************************************************************/
   OWLCMD_VOID_CTX("edit:move-next-word", owl_editwin_move_to_nextword,
+  OWLCMD_VOID_CTX("edit:move-next-word", owl_editwin_move_to_nextword,
                   OWL_CTX_EDIT,
                   "moves cursor forward a word",
                   "", ""),
   OWLCMD_VOID_CTX("edit:move-prev-word", owl_editwin_move_to_previousword,
+  OWLCMD_VOID_CTX("edit:move-prev-word", owl_editwin_move_to_previousword,
                   OWL_CTX_EDIT,
                   "moves cursor backwards a word",
 …
                   "", ""),
   OWLCMD_VOID_CTX("edit:move-to-buffer-end", owl_editwin_move_to_end,
+  OWLCMD_VOID_CTX("edit:move-to-buffer-end", owl_editwin_move_to_end,
                   OWL_CTX_EDIT,
                   "moves cursor to the bottom right (end) of the buffer",
                   "", ""),
   OWLCMD_VOID_CTX("edit:move-to-line-end", owl_editwin_move_to_line_end,
+  OWLCMD_VOID_CTX("edit:move-to-line-end", owl_editwin_move_to_line_end,
                   OWL_CTX_EDIT,
                   "moves cursor to the end of the line",
                   "", ""),
   OWLCMD_VOID_CTX("edit:move-to-line-start", owl_editwin_move_to_line_start,
+  OWLCMD_VOID_CTX("edit:move-to-line-start", owl_editwin_move_to_line_start,
                   OWL_CTX_EDIT,
                   "moves cursor to the beginning of the line",
                   "", ""),
   OWLCMD_VOID_CTX("edit:move-left", owl_editwin_key_left,
+  OWLCMD_VOID_CTX("edit:move-left", owl_editwin_key_left,
                   OWL_CTX_EDIT,
                   "moves the cursor left by a character",
 …
                   "", ""),
   OWLCMD_VOID_CTX("edit:delete-next-char", owl_editwin_delete_char,
+  OWLCMD_VOID_CTX("edit:delete-next-char", owl_editwin_delete_char,
                   OWL_CTX_EDIT,
                   "deletes the character to the right of the cursor",
 …
                   "", ""),
   OWLCMD_VOID_CTX("edit:delete-all", owl_editwin_clear,
+  OWLCMD_VOID_CTX("edit:delete-all", owl_editwin_clear,
                   OWL_CTX_EDIT,
                   "deletes all of the contents of the buffer",
 …
                   "", ""),
   OWLCMD_VOID_CTX("edit:fill-paragraph", owl_editwin_fill_paragraph,
+  OWLCMD_VOID_CTX("edit:fill-paragraph", owl_editwin_fill_paragraph,
                   OWL_CTX_EDIT,
                   "fills the current paragraph to line-wrap well",
                   "", ""),
   OWLCMD_VOID_CTX("edit:recenter", owl_editwin_recenter,
+  OWLCMD_VOID_CTX("edit:recenter", owl_editwin_recenter,
                   OWL_CTX_EDIT,
                   "recenters the buffer",
                   "", ""),
   OWLCMD_ARGS_CTX("edit:insert-text", owl_command_edit_insert_text,
+  OWLCMD_ARGS_CTX("edit:insert-text", owl_command_edit_insert_text,
                   OWL_CTX_EDIT,
                   "inserts text into the buffer",
                   "edit:insert-text <text>", ""),
   OWLCMD_VOID_CTX("edit:cancel", owl_command_edit_cancel,
+  OWLCMD_VOID_CTX("edit:cancel", owl_command_edit_cancel,
                   OWL_CTX_EDIT,
                   "cancels the current command",
                   "", ""),
   OWLCMD_VOID_CTX("edit:history-next", owl_command_edit_history_next,
+  OWLCMD_VOID_CTX("edit:history-next", owl_command_edit_history_next,
                   OWL_CTX_EDIT,
                   "replaces the text with the next history",
                   "", ""),
   OWLCMD_VOID_CTX("edit:history-prev", owl_command_edit_history_prev,
+  OWLCMD_VOID_CTX("edit:history-prev", owl_command_edit_history_prev,
                   OWL_CTX_EDIT,
                   "replaces the text with the previous history",
 …
   OWLCMD_ALIAS   ("editresponse:done", "edit:done"),
   OWLCMD_VOID_CTX("edit:move-up-line", owl_editwin_key_up,
+  OWLCMD_VOID_CTX("edit:move-up-line", owl_editwin_key_up,
                   OWL_CTX_EDITMULTI,
                   "moves the cursor up one line",
                   "", ""),
   OWLCMD_VOID_CTX("edit:move-down-line", owl_editwin_key_down,
+  OWLCMD_VOID_CTX("edit:move-down-line", owl_editwin_key_down,
                   OWL_CTX_EDITMULTI,
                   "moves the cursor down one line",
                   "", ""),
   OWLCMD_VOID_CTX("edit:done", owl_command_edit_done,
+  OWLCMD_VOID_CTX("edit:done", owl_command_edit_done,
                   OWL_CTX_EDIT,
                   "Finishes entering text in the editwin.",
                   "", ""),
   OWLCMD_VOID_CTX("edit:done-or-delete", owl_command_edit_done_or_delete,
+  OWLCMD_VOID_CTX("edit:done-or-delete", owl_command_edit_done_or_delete,
                   OWL_CTX_EDITMULTI,
                   "completes the command, but only if at end of message",
                   "",
+                  "",
                   "If only whitespace is to the right of the cursor,\n"
                   "runs 'edit:done'.\n"\
 …
   /****************************************************************/
   OWLCMD_VOID_CTX("popless:scroll-down-page", owl_viewwin_pagedown,
+  OWLCMD_VOID_CTX("popless:scroll-down-page", owl_viewwin_pagedown,
                   OWL_CTX_POPLESS,
                   "scrolls down one page",
                   "", ""),
   OWLCMD_VOID_CTX("popless:scroll-down-line", owl_viewwin_linedown,
+  OWLCMD_VOID_CTX("popless:scroll-down-line", owl_viewwin_linedown,
                   OWL_CTX_POPLESS,
                   "scrolls down one line",
                   "", ""),
   OWLCMD_VOID_CTX("popless:scroll-up-page", owl_viewwin_pageup,
+  OWLCMD_VOID_CTX("popless:scroll-up-page", owl_viewwin_pageup,
                   OWL_CTX_POPLESS,
                   "scrolls up one page",
                   "", ""),
   OWLCMD_VOID_CTX("popless:scroll-up-line", owl_viewwin_lineup,
+  OWLCMD_VOID_CTX("popless:scroll-up-line", owl_viewwin_lineup,
                   OWL_CTX_POPLESS,
                   "scrolls up one line",
                   "", ""),
   OWLCMD_VOID_CTX("popless:scroll-to-top", owl_viewwin_top,
+  OWLCMD_VOID_CTX("popless:scroll-to-top", owl_viewwin_top,
                   OWL_CTX_POPLESS,
                   "scrolls to the top of the buffer",
                   "", ""),
   OWLCMD_VOID_CTX("popless:scroll-to-bottom", owl_viewwin_bottom,
+  OWLCMD_VOID_CTX("popless:scroll-to-bottom", owl_viewwin_bottom,
                   OWL_CTX_POPLESS,
                   "scrolls to the bottom of the buffer",
                   "", ""),
   OWLCMD_INT_CTX ("popless:scroll-right", owl_viewwin_right,
+  OWLCMD_INT_CTX ("popless:scroll-right", owl_viewwin_right,
                   OWL_CTX_POPLESS,
                   "scrolls right in the buffer",
                   "popless:scroll-right <num-chars>", ""),
   OWLCMD_INT_CTX ("popless:scroll-left", owl_viewwin_left,
+  OWLCMD_INT_CTX ("popless:scroll-left", owl_viewwin_left,
                   OWL_CTX_POPLESS,
                   "scrolls left in the buffer",
                   "popless:scroll-left <num-chars>", ""),
   OWLCMD_VOID_CTX("popless:quit", owl_command_popless_quit,
+  OWLCMD_VOID_CTX("popless:quit", owl_command_popless_quit,
                   OWL_CTX_POPLESS,
                   "exits the popless window",
 …
     return NULL;
+  }
   owl_function_help_for_command(argv[1]);
   return NULL;
 …
+{
   char *filename;
   if (argc!=2) {
     owl_function_makemsg("usage: dump <filename>");
 …
     if (argc>=1 && !strcmp(argv[1], "--skip-deleted")) {
       skip_deleted=1;
       argc-=1; argv+=1;
+      argc-=1; argv+=1;
     } else if (argc>=1 && !strcmp(argv[1], "--last-if-none")) {
       last_if_none=1;
       argc-=1; argv+=1;
+      argc-=1; argv+=1;
     } else if (argc>=2 && !strcmp(argv[1], "--filter")) {
       filter = g_strdup(argv[2]);
       argc-=2; argv+=2;
+      argc-=2; argv+=2;
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter")) {
       filter = owl_function_smartfilter(0, 0);
       argc-=2; argv+=2;
+      argc-=2; argv+=2;
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter-instance")) {
       filter = owl_function_smartfilter(1, 0);
       argc-=2; argv+=2;
+      argc-=2; argv+=2;
     } else {
       owl_function_makemsg("Invalid arguments to command 'next'.");
 …
     if (argc>=1 && !strcmp(argv[1], "--skip-deleted")) {
       skip_deleted=1;
       argc-=1; argv+=1;
+      argc-=1; argv+=1;
     } else if (argc>=1 && !strcmp(argv[1], "--first-if-none")) {
       first_if_none=1;
       argc-=1; argv+=1;
+      argc-=1; argv+=1;
     } else if (argc>=2 && !strcmp(argv[1], "--filter")) {
       filter = g_strdup(argv[2]);
       argc-=2; argv+=2;
+      argc-=2; argv+=2;
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter")) {
       filter = owl_function_smartfilter(0, 0);
       argc-=2; argv+=2;
+      argc-=2; argv+=2;
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter-instance")) {
       filter = owl_function_smartfilter(1, 0);
       argc-=2; argv+=2;
+      argc-=2; argv+=2;
    } else {
       owl_function_makemsg("Invalid arguments to command 'prev'.");
 …
     filtname = owl_function_smartfilter(1, 0);
   } else {
     owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
+    owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
+  }
   return filtname;
 …
     owl_function_printallvars();
     return NULL;
+  }
+  }
   if (argc > 1 && !strcmp("-q",argv[1])) {
 …
   var=argv[1];
   v = owl_variable_get_var(owl_global_get_vardict(&g), var);
   if (v) {
 …
   int  i;
   if (argc < 2) {
     owl_function_makemsg("Invalid arguments to 'multi' command.");
+    owl_function_makemsg("Invalid arguments to 'multi' command.");
     return NULL;
+  }
 …
         break;
       } else if (newbuff[i] != ' ') {
         owl_function_makemsg("Invalid arguments to 'multi' command.");
+        owl_function_makemsg("Invalid arguments to 'multi' command.");
         g_free(newbuff);
         return NULL;
 …
   const char *const *myargv;
   int myargc;
   if (!owl_global_is_aimloggedin(&g)) {
     owl_function_error("You are not logged in to AIM.");
 …
+{
   int edit=0;
   if (argc>=2 && !strcmp("-e", argv[1])) {
     edit=1;
 …
+  }
   if ((argc==1) || (argc==2 && !strcmp(argv[1], "all"))) {
+  if ((argc==1) || (argc==2 && !strcmp(argv[1], "all"))) {
     owl_function_reply(0, !edit);
   } else if (argc==2 && !strcmp(argv[1], "sender")) {
 …
     const owl_message *m;
     const owl_view    *v;
     v = owl_global_get_current_view(&g);
+    v = owl_global_get_current_view(&g);
     m = owl_view_get_element(v, owl_global_get_curmsg(&g));
     if (m) owl_zephyr_zaway(m);
 …
+{
   int auth;
   if (argc<2) {
     owl_function_makemsg("Too few arguments for zlocate command");
 …
       return(NULL);
+    }
+  }
   return(NULL);
 …
       owl_function_show_filter(argv[2]);
+    }
   } else if (argc==2
+  } else if (argc==2
              && (!strcmp(argv[1], "zpunts") || !strcmp(argv[1], "zpunted"))) {
     owl_function_show_zpunts();
 …
   } else if (!strcmp(argv[1], "startup")) {
     const char *filename;
     filename=owl_global_get_startupfile(&g);
     owl_function_popless_file(filename);
 …
   if (argc>1 && !strcmp(argv[1], "--no-move")) {
     move_after = 0;
     argc--;
+    argc--;
     argv++;
+  }
 …
   if (argc>1 && !strcmp(argv[1], "--no-move")) {
     move_after = 0;
     argc--;
+    argc--;
     argv++;
+  }
 …
+{
   char *filtname;
   if (argc < 3 || argc > 4) {
     owl_function_makemsg("Wrong number of arguments to colorclass command");
 …
     owl_function_smartzpunt(1);
   } else {
     owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
+    owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
+  }
   return NULL;
 …
     buffstart=skiptokens(buff, 2);
+  }
   if (argc==1 || (argc==2 && !strcmp(argv[1], "-r"))) {
     /* When continuing a search, don't consider the current message. */
 …
     owl_function_search_helper(true, direction);
+  }
   return(NULL);
+}
 …
   buffstart=skiptokens(buff, 1);
   owl_function_set_search(*buffstart ? buffstart : NULL);
   return(NULL);
+}

context.c

-                      rf271129
+                      r7869e48
   if ((((ctx->mode&OWL_CTX_MODE_BITS) & test)
        || !(test&OWL_CTX_MODE_BITS))
       &&
       (((ctx->mode&OWL_CTX_ACTIVE_BITS) & test)
+      &&
+      (((ctx->mode&OWL_CTX_ACTIVE_BITS) & test)
        || !(test&OWL_CTX_ACTIVE_BITS))) {
     return 1;

dict.c

-                      rf271129
+                      r7869e48
 /* Dictionary data abstraction.
+/* Dictionary data abstraction.
  * Maps from strings to pointers.
  * Stores as a sorted list of key/value pairs.
 …
+}
 /* Returns 0 on success.  Will copy the key but make
    a reference to the value.  Will clobber an existing
+/* Returns 0 on success.  Will copy the key but make
+   a reference to the value.  Will clobber an existing
    entry with the same key iff delete_on_replace!=NULL,
    and will run delete_on_replace on the old element.
 …
     if (pos!=d->size) {
       /* shift forward to leave us a slot */
       memmove(d->els+pos+1, d->els+pos,
+      memmove(d->els+pos+1, d->els+pos,
               sizeof(owl_dict_el)*(d->size-pos));
+    }
     d->size++;
     d->els[pos].k = g_strdup(k);
     d->els[pos].v = v;
+    d->els[pos].v = v;
     return(0);
+  }

doc/advanced.txt

-                      rc82b055
+                      r7869e48
      type          message type ('zephyr', 'aim', 'admin')
      direction     either 'in' 'out' or 'none'\n"
      login         either 'login' 'logout' or 'none'\n"
+     login         either 'login' 'logout' or 'none'\n"
 You can also use the operators 'and' 'or' and 'not' as well as the
 …
 *** WARNING: This interface is still evolving and may change over time ***
 The ~/.owlconf file is interpreted by the perl interpreter.
+The ~/.owlconf file is interpreted by the perl interpreter.
 You may specify an alternate file by running owl with "owl -c <configfile>".
 …
     owl::format_msg()  run to format messages when using the perl style.
                        The return value is used to display the message on the
                        screen.
+                       screen.
     owl::receive_msg() run when a message is received, and after
                        it has been added to the message list
 …
      owl::command('set zsigproc "/mit/kretch/bin/getzsig foo"');
 will set the owl variable zsigproc to
+will set the owl variable zsigproc to
 the value "/mit/kretch/bin/getzsig foo".
 Note that you will need to watch out for perl quoting issues.
 …
 Both owl::format_msg and owl::receive_msg are passed perl owl::Message
 objects which have methods for accessing the attributes of the message.
+objects which have methods for accessing the attributes of the message.
 (Caveat: Note that these owl::Message objects are currently only
 …
+    }
 In the above, $m is the owl::Message object and
+In the above, $m is the owl::Message object and
 its methods are called with $m->METHODNAME.
 An example receiver function that tags all zephyr pings for
+An example receiver function that tags all zephyr pings for
 deletion would be:
 …
 If you use pperl instead of perl, the return value
 of the perl command will be displayed in a pop-up window.
 This is particularly useful within key bindings
+This is particularly useful within key bindings
 and aliases.  For example:
 …
 Will cause the "finger" command to be used to finger at the host
 where the current message came from.  You can then bind this
+where the current message came from.  You can then bind this
 to the "f" key with:

doc/barnowl.1

-                      r8135737
+                      r7869e48
 \fB\-c\fP, \fB\-\-config\-file\fP=\fIFILE\fP
 Specify an alternate config file for \fBBarnOwl\fP to use.  The config file is
 an arbitrary Perl script evaluated in the \fImain\fP package, and if it
 overrides the \fIBarnOwl::startup\fP method that is run when \fBBarnOwl\fP
 starts.  (Compare \fI~/.owl/startup\fP, which contains \fBBarnOwl\fP commands
+an arbitrary Perl script evaluated in the \fImain\fP package, and if it
+overrides the \fIBarnOwl::startup\fP method that is run when \fBBarnOwl\fP
+starts.  (Compare \fI~/.owl/startup\fP, which contains \fBBarnOwl\fP commands
 that are run at startup after the config file is loaded.)
 By default, \fBBarnOwl\fP uses the first of \fI~/.owl/init.pl\fP,
+By default, \fBBarnOwl\fP uses the first of \fI~/.owl/init.pl\fP,
 \fI~/.barnowlconf\fP, or \fI~/.owlconf\fP that exists.

doc/code.txt

-                      rd40ad8b
+                      r7869e48
              is owl_function_command("foo");
              Commands are only active within specific contexts,
              and attempts to call them from invalid contexts will fail.
+             and attempts to call them from invalid contexts will fail.
 context:     A context specifies the current state of owl, in terms
+context:     A context specifies the current state of owl, in terms
              of which modal window is active and which point
              in its life owl is in (eg, in startup, or running).
              This is implemented as a bitmask and there is
+             This is implemented as a bitmask and there is
              some hierarchy.  Commands may restrict themselves
              to only running in a limited number of contexts
 …
              Sometimes also referred to as typewin.
 filter:      Patterns which match messages.  These may
              contain multiple filterelements which may be
+filter:      Patterns which match messages.  These may
+             contain multiple filterelements which may be
              combined together (eg, by "and" and "or").
 filterelement: An element of a filter which matches on some
+filterelement: An element of a filter which matches on some
                attribute of a message.
 …
              These are particularly useful for building up
              text regions that are to be rendered on-screen,
              as they resize memory as needed, and they have
+             as they resize memory as needed, and they have
              routines for cropping as needed.
 …
              owl.h defines "g" as a singleton instance of owl_global.
              Where possible/appropriate, most accesses to global data should
              be from a limited number of files (eg, from owl.c and
+             be from a limited number of files (eg, from owl.c and
              functions.c).  Consider whether you really need to before
              adding in uses of global.
 …
              Also contains the main loop, which is roughly:
              - handle scheduled resizes, and anything that might result
              - while zephyrs are pending, grab incoming zephyrs
+             - while zephyrs are pending, grab incoming zephyrs
                and handle them (which includes formatting them
                with either perl extension or default formatter
 …
              - updates mainwin display if there are new zephyrs
              - displays and updates popwins and the terminal as necessary
              - sends characters to the popwin, recwin/mainwin,
+             - sends characters to the popwin, recwin/mainwin,
                or typewin/editwin
 …
                    Created by codelist.pl.
 popwin:      Modal pop-up window container.
+popwin:      Modal pop-up window container.
              Usually contains a viewwin for read-only scrolling text.
 …
 util:        Misc utility functions that don't fit anywhere yet:
              - sepbar rendering
+             - sepbar rendering
              - tokenizing and parsing utilities
              - downstr
 …
         something, and this should be the exception to the rule.
         Owl should be generally useful out-of-the-box without
         extensive configuration, for most people's needs.
+        Owl should be generally useful out-of-the-box without
+        extensive configuration, for most people's needs.
         People shouldn't have to spend days tweaking
         with config files before being happy switching to it.

doc/intro.txt

-                      rd7cc50b
+                      r7869e48
 variable.  For example:
      set personalbell on
+     set personalbell on
 will set the value of the variable 'personalbell' to 'on'.  The
 …
     owl::format_msg()  run to format messages when using the perl style.
                        The return value is used to display the message on the
                        screen.
+                       screen.
     owl::receive_msg() run when a message is received, and after
                        it has been added to the message list
 …
 For example:
    bindkey recv C-k command delete
 will bind Control-k to the delete command, but only in the
+   bindkey recv C-k command delete
+will bind Control-k to the delete command, but only in the
 recv window context.
 Some keymaps inherit their bindings from more
+Some keymaps inherit their bindings from more
 general keymaps.  The valid keymaps are:
 …
     |  |-editresponse - single-line responses to questions
     |-popless         - scrolling pop-up windows
     |-recv            - the main message list window
+    |-recv            - the main message list window
                         where received messages are displayed
 …
 Note that not all commands may be used in all contexts.
 Key sequences may be surrounded by quotes and include
+Key sequences may be surrounded by quotes and include
 a sequence of keys that must be pressed in order
 to execute the command.  For example:

editwin.c

-                      r7803326
+                      r7869e48
   const char *p;
   int width = offset;
   for(p = e->buff + start;
       p < e->buff + end;
 …
+{
   char *p;
   p = g_new(char, end - start + 1);
   memcpy(p, e->buff + start, end - start);
 …
   if (e->win) owl_window_dirty(e->win);
+}

examples/owlconf.erik

-                      rd7cc50b
+                      r7869e48
 ### The owlconf config file   -*- perl -*-
+### The owlconf config file   -*- perl -*-
 ###
 ### !!!!!WARNING!!!!! !!!!!WARNING!!!!! !!!!!WARNING!!!!! !!!!!WARNING!!!!!
 ### This is an example file intended to demonstrate how to use
+### This is an example file intended to demonstrate how to use
 ### various features of owl.  Some of the key bindings, in particular,
 ### are more for examples than things you may actually want to use.
 …
 ### The message attributes may be dereferenced with $m->attribute
 ###
 ###
+###
 # tokens for sepbar are:
 …
+}
 # Load in things which don't belong in an owlconf
+# Load in things which don't belong in an owlconf
 # that people might use as an example...
 sub personal_startup {
 …
             sepbartokens_add("<$sender");
             sepbartokens_trim(">$sender");
+        }
+        }
     } elsif ($m->is_mail) {
         mail_add_message($m);
 …
     my ($b) = @_;
     $b=~s/^/    /g;
     $b=~s/\n/\n    /g;
+    $b=~s/\n/\n    /g;
     return $b;
+}
 …
+    }
     if (!$m->is_zephyr && !$m->is_aim) {
+    if (!$m->is_zephyr && !$m->is_aim) {
         return "Unknown message type: ".$m->type."\n";
+    }
 …
     if ($m->is_zephyr) {
         $out = sprintf "[mit,%s,%s] / %s / %s", lc($m->class),
+        $out = sprintf "[mit,%s,%s] / %s / %s", lc($m->class),
         lc($m->instance), $m->time, lc($m->host);
         if ($m->opcode ne "") {$out.=" op:".$m->opcode;}
 …
+            }
+        }
         $out.="\n";
+        $out.="\n";
     } else {
         $out = sprintf "[%s] / %s\n", lc($m->type), $m->time;
         $out.= "  \@bold($sender)> ";
         $out.="\n";
+        $out.="\n";
+    }
 …
+    }
     if (!$m->is_zephyr && !$m->is_aim) {
+    if (!$m->is_zephyr && !$m->is_aim) {
         return "Unknown message type: ".$m->type."\n";
+    }
 …
+        }
         return "$out\n";
     } elsif ($m->is_zephyr && $m->is_mail) {
         my $body = $m->body;
 …
     my $channel = "";
     my $body = $m->body;
     if ($m->is_zephyr) {
         my $inst = $m->instance;
 …
+    }
     for my $w (@words) {
         if (($outline ne "")
+        if (($outline ne "")
             && (length($outline)+length($w) > $width-$unindent)) {
             $out .= $outline."\n";
 …
         $outline .= $w;
+    }
     $out .= $outline . "\n";
+}
+    $out .= $outline . "\n";
+}

examples/owlconf.simple

-                      rd7cc50b
+                      r7869e48
 ### The owlconf config file   -*- perl -*-
+### The owlconf config file   -*- perl -*-
 ### !!!!!WARNING!!!!! !!!!!WARNING!!!!! !!!!!WARNING!!!!! !!!!!WARNING!!!!!
 ### This is an example file intended to demonstrate how to use
+### This is an example file intended to demonstrate how to use
 ### various features of owl.  Some of the key bindings, in particular,
 ### are more for examples than things you may actually want to use.
 …
 ###     $owl::sender, $owl::opcode, $owl::zsig,
 ###     $owl::msg, $owl::time, $owl::host, @owl::fields, $owl::id
 ###
+###
 # NOTE: Lines beginning with a "#" are perl comments.
 …
     ## Doing "help" will show you more about each variable.
     ## These lines will set things to the default.
     ## You can uncomment them and then change the value to get
+    ## You can uncomment them and then change the value to get
     ## a different behavior (remove the "#" to an alternate value).
     ################################################################
 …
     ## Set this to on to enable logging of personal zephyrs
     # owl::command('set -q logging off');
+    # owl::command('set -q logging off');
     ## This directory must exist and is where personal zephyrs are logged.
 …
     ## Set this to on to enable logging of classes
     # owl::command('set -q classlogging off');
+    # owl::command('set -q classlogging off');
     ## This directory must exist and is where class zephyrs are logged.
 …
     ################################################################
     ## The following create filters.  Filters can be used to select
     ## on multiple zephyrs for operations.  With 'views' you can
+    ## on multiple zephyrs for operations.  With 'views' you can
     ## look at only the zephyrs matching a particular filter.
     ## Use the 'view <filtername>' command or the 'v' key to switch views.
 …
     ## The filter command creates a filter with the specified name,
     ## or if one already exists it is replaced.  Example filter
     ## syntax would be:
+    ## syntax would be:
     ##
     ##    filter myfilter -c red ( class ^foobar$ ) or ( class ^quux$ and instance ^bar$ )
 …
     ## is used it specifies the color that messages matching this filter
     ## should be displayed in.  Do 'show colors' to see the available colors.
     ##
+    ##
     ################################################################
 …
     ## The 'trash' filter is used when you press 'T' to mark things
     ## for autodeletion.
     # owl::command('filter trash class ^mail$ or opcode ^ping$ or type ^admin$ or class ^login$');
+    # owl::command('filter trash class ^mail$ or opcode ^ping$ or type ^admin$ or class ^login$');
+}
 …
     ## Note that:
     ##   $out .= "foo";  appends "foo" to the end of the variable $out.
     ##   lc(bar) will convert bar to lowercase.
+    ##   lc(bar) will convert bar to lowercase.
     ##   "ne" does "not equal" for string comparison.
     ##   sprintf fills in the %s's with the arguments later on the line.
 …
         # Incoming messages
         $out .= sprintf "[mit,%s,%s] / %s / %s", lc($owl::class),
+        $out .= sprintf "[mit,%s,%s] / %s / %s", lc($owl::class),
                         lc($owl::instance), $owl::time, lc($owl::host);
         if ($owl::opcode ne "") {$out.=" op:$owl::opcode";}
 …
+        }
+    }
     $out.="\n";
+    $out.="\n";
     # This indents the body of the message and then appends it on.
 …
 ## In most cases you won't need anything here.
 sub owl::receive_msg() {
     ## If this is uncommented, it would mark all messages
     ## with opcode "PING" for immediate deletion:

examples/owlconf.vtformat

-                      rd7cc50b
+                      r7869e48
 ### The owlconf config file   -*- perl -*-
+### The owlconf config file   -*- perl -*-
 ###
 ### This file is interpreted by the perl interpreter.
 …
 ###     $owl::sender, $owl::opcode, $owl::zsig,
 ###     $owl::msg, $owl::time, $owl::host, @owl::fields
 ###
+###
 # classes will be appreviated this way
 …
+    }
     for my $w (@words) {
         if (($outline ne "")
+        if (($outline ne "")
             && (length($outline)+length($w) > $width-$unindent)) {
             $out .= $outline."\n";
 …
         $outline .= $w;
+    }
     $out .= $outline . "\n";
+    $out .= $outline . "\n";
+}

filterelement.c

r7756dde	r7869e48
75	75	*/
76	76	return 0;
77		}
	77	}
78	78	return owl_filter_message_match(subfilter, m);
79	79	}

fmtext.c

-                      rf271129
+                      r7869e48
+{
   int a = 0, fg = 0, bg = 0;
   if (attr != OWL_FMTEXT_ATTR_NONE) a=1;
   if (fgcolor != OWL_COLOR_DEFAULT) fg=1;
 …
     p = strchr(p+1, OWL_FMTEXT_UC_STARTBYTE_UTF8);
+  }
+}
+}
 /* Internal function.  Append text from 'in' between index 'start'
 …
   char attr;
   short fg, bg, pair = 0;
   if (w==NULL) {
     owl_function_debugmsg("Hit a null window in owl_fmtext_curs_waddstr.");
 …
       /* Deal with all text from last insert to here. */
       char tmp;
       tmp = p[0];
       p[0] = '\0';
 …
           _owl_fmtext_wattrset(w, attr ^ OWL_FMTEXT_ATTR_REVERSE);
           _owl_fmtext_wcolor_set(w, pair);
           waddnstr(w, s + start, end - start);
 …
   const char *ptr1, *ptr2;
   int i, offset;
   /* find the starting line */
   ptr1 = in->buff->str;
 …
     ptr1++;
+  }
   /* ptr1 now holds the starting point */
 …
       break;
+    }
     if (ptr_e == ptr_s) {
       owl_fmtext_append_normal(out, "\n");
 …
         chwidth = mk_wcwidth(c);
         if (col + chwidth > bcol) break;
         if (col >= acol) {
           if (st == 0) {
 …
         continue;
+      }
       /* if there's no opener, print the @ and continue */
       tmpptr=strpbrk(txtptr, "(<[{ ");
 …
         /* if it's a color read the color, set the current color and
            continue */
       } else if (!strcasecmp(buff, "@color")
+      } else if (!strcasecmp(buff, "@color")
                  && owl_global_is_colorztext(&g)) {
         g_free(buff);
 …
 /* requires that the list values are strings or NULL.
  * joins the elements together with join_with.
+ * joins the elements together with join_with.
  * If format_fn is specified, passes it the list element value
  * and it will return a string which this needs to free. */
 …
   if (fg > COLORS || fg < OWL_COLOR_DEFAULT) fg = OWL_COLOR_DEFAULT;
   if (bg > COLORS || bg < OWL_COLOR_DEFAULT) bg = OWL_COLOR_DEFAULT;
 #ifdef HAVE_USE_DEFAULT_COLORS
   if (fg == OWL_COLOR_DEFAULT) fg = -1;

functions.c

-                      r06470d7
+                      r7869e48
+{
   owl_function_debugmsg("executing command: %s", cmdbuff);
   return owl_cmddict_execute(owl_global_get_cmddict(&g),
+  return owl_cmddict_execute(owl_global_get_cmddict(&g),
                              owl_global_get_context(&g), cmdbuff);
+}
 …
   m=g_new(owl_message, 1);
   owl_message_create_admin(m, header, body);
   /* add it to the global list and current view */
   owl_messagelist_append_element(owl_global_get_msglist(&g), m);
 …
   /* error if we're not logged into aim */
   if (!owl_global_is_aimloggedin(&g)) return(NULL);
   m=g_new(owl_message, 1);
   owl_message_create_aim(m,
 …
   if (unwrap)
     owl_text_wordunwrap(format_msg);
   /* send the message */
   ret=owl_aim_send_im(to, format_msg);
 …
   format_msg=g_strdup(msg);
   owl_text_wordunwrap(format_msg);
   /* send the message */
   ret=owl_aim_send_awaymsg(to, format_msg);
 …
 /* If filter is non-null, looks for the next message matching
  * that filter.  If skip_deleted, skips any deleted messages.
+ * that filter.  If skip_deleted, skips any deleted messages.
  * If last_if_none, will stop at the last message in the view
  * if no matching messages are found.  */
 …
   if (move_after) {
     /* move the poiner in the appropriate direction
+    /* move the poiner in the appropriate direction
      * to the next undeleted msg */
     if (owl_global_get_direction(&g)==OWL_DIRECTION_UPWARDS) {
 …
   v=owl_global_get_current_view(&g);
   if (owl_view_get_size(v) < 1) {
     owl_function_error("No current message to undelete");
 …
   owl_function_redisplay_to_nearest(lastmsgid, v);
   owl_function_makemsg("Messages expunged");
+}
 …
   v=owl_global_get_current_view(&g);
   oldcurmsg=owl_global_get_curmsg(&g);
   curmsg=owl_view_get_size(v)-1;
+  curmsg=owl_view_get_size(v)-1;
   if (curmsg<0) curmsg=0;
   owl_global_set_curmsg(&g, curmsg);
 …
     owl_global_set_topmsg(&g, curmsg+1);
     owl_global_set_curmsg(&g, curmsg+1);
+  }
+  }
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
   owl_global_set_direction_downwards(&g);
 …
+{
   char *ret;
   /* zlog out if we need to */
   if (owl_global_is_havezephyr(&g) &&
 …
     kill(owl_global_get_newmsgproc_pid(&g), SIGHUP);
+  }
   /* Quit AIM */
   if (owl_global_is_aimloggedin(&g)) {
 …
+}
 /* Returns what the new topmsg should be.
  * Passed the last direction of movement,
+/* Returns what the new topmsg should be.
+ * Passed the last direction of movement,
  * the current view,
  * the current message number in the view,
 …
 int owl_function_calculate_topmsg_neartop(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
+{
   if (curmsg>0
+  if (curmsg>0
       && (owl_message_get_numlines(owl_view_get_element(v, curmsg-1))
           <  recwinlines/2)) {
 …
+  }
+}
 int owl_function_calculate_topmsg_center(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
+{
 …
   return(last);
+}
 int owl_function_calculate_topmsg_paged(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines, int center_on_page)
+{
   int i, last, lines, savey;
   /* If we're off the top of the screen, scroll up such that the
+  /* If we're off the top of the screen, scroll up such that the
    * curmsg is near the botton of the screen. */
   if (curmsg < topmsg) {
 …
   if (curmsg<0) return(topmsg);
   /* If we're off the top of the screen then center */
   if (curmsg<topmsg) {
 …
     direction=OWL_DIRECTION_UPWARDS;
+  }
   /* If our bottom line is less than 1/4 down the screen then scroll up */
   if (direction == OWL_DIRECTION_UPWARDS || direction == OWL_DIRECTION_NONE) {
 …
   owl_fmtext_init_null(&fm);
   v=owl_global_get_current_view(&g);
   m=owl_view_get_element(v, owl_global_get_curmsg(&g));
 …
   if (owl_message_is_type_zephyr(m)) {
     owl_fmtext_append_bold(&fm, "\nZephyr Specific Information:\n");
     owl_fmtext_appendf_normal(&fm, "  Class     : %s\n", owl_message_get_class(m));
     owl_fmtext_appendf_normal(&fm, "  Instance  : %s\n", owl_message_get_instance(m));
 …
   owl_message_attributes_tofmtext(m, &attrfm);
   owl_fmtext_append_fmtext(&fm, &attrfm);
   owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
 …
       return;
+    }
     /* Bail if we're not truncated */
     if (!owl_mainwin_is_curmsg_truncated(owl_global_get_mainwin(&g))) {
 …
+    }
+  }
   /* don't scroll past the last line */
   if (step>0) {
 …
+    }
+  }
   /* redisplay */
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
 …
     owl_function_popless_text("Error getting subscriptions");
+  }
   g_free(buff);
+}
 …
   const owl_variable *v;
   GPtrArray *varnames;
   owl_fmtext fm;
+  owl_fmtext fm;
   int i;
   const char *varname;
   owl_fmtext_init_null(&fm);
   owl_fmtext_append_bold(&fm,
+  owl_fmtext_append_bold(&fm,
       "Variables: (use 'show variable <name>' for details)\n");
   varnames = owl_variable_dict_get_names(owl_global_get_vardict(&g));
 …
+{
   const owl_variable *v;
   owl_fmtext fm;
+  owl_fmtext fm;
   owl_fmtext_init_null(&fm);
 …
   owl_fmtext_append_normal(&fm, "no\n");
 #endif
   owl_fmtext_append_normal(&fm, "\nAIM Status:\n");
 …
   const owl_message *m;
   const owl_filter *f;
   if (owl_view_get_size(owl_global_get_current_view(&g))==0) {
     owl_function_error("No message selected");
   } else {
     char *cmd;
     m=owl_view_get_element(owl_global_get_current_view(&g), owl_global_get_curmsg(&g));
     if (!m) {
 …
 #if OWL_STDERR_REDIR
   redirect = " < /dev/null";
 #endif
+#endif
   if (argc<2) {
 …
     out = owl_slurp(p);
     pclose(p);
     if (type == OWL_OUTPUT_RETURN) {
       g_free(newbuff);
 …
   perlout = owl_perlconfig_execute(buff);
   if (perlout) {
+  if (perlout) {
     if (type == OWL_OUTPUT_POPUP) {
       owl_function_popless_text(perlout);
 …
   /* Figure out what to set the current message to.
    * - If the view we're leaving has messages in it, go to the closest message
    *   to the last message pointed to in that view.
+   *   to the last message pointed to in that view.
    * - If the view we're leaving is empty, try to restore the position
    *   from the last time we were in the new view.  */
 …
   owl_function_debugmsg("owl_function_create_negative_filter");
   if (!strncmp(filtername, "not-", 4)) {
     newname=g_strdup(filtername+4);
 …
  * If 'related' is nonzero, encompass unclasses and .d classes as well.
  */
 CALLER_OWN char *owl_function_classinstfilt(const char *c, const char *i, int related)
+CALLER_OWN char *owl_function_classinstfilt(const char *c, const char *i, int related)
+{
   owl_filter *f;
 …
+    }
+  }
   /* if it already exists then go with it.  This lets users override */
   if (owl_global_get_filter(&g, filtname)) {
 …
   owl_function_makemsg("%i messages marked for %sdeletion", j, flag?"":"un");
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+}
 …
  * If the curmsg is a zephyr class message, instance foo, recip *,
  *    return a filter name to the class, inst.
  * If the curmsg is a zephyr class message and type==0 then
+ * If the curmsg is a zephyr class message and type==0 then
  *    return a filter name for just the class.
  * If the curmsg is a zephyr class message and type==1 then
+ * If the curmsg is a zephyr class message and type==1 then
  *    return a filter name for the class and instance.
  * If the curmsg is a personal AIM message returna  filter
  *    name to the AIM conversation with that user
+ *    name to the AIM conversation with that user
  */
 CALLER_OWN char *owl_function_smartfilter(int type, int invert_related)
 …
 void owl_function_smartzpunt(int type)
+{
   /* Starts a zpunt command based on the current class,instance pair.
+  /* Starts a zpunt command based on the current class,instance pair.
    * If type=0, uses just class.  If type=1, uses instance as well. */
   const owl_view *v;
 …
   const char *mclass, *minst;
   GString *buf;
   v=owl_global_get_current_view(&g);
   m=owl_view_get_element(v, owl_global_get_curmsg(&g));
 …
+  }
   owl_filter_set_fgcolor(f, owl_util_string_to_color(fgcolor));
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
   return(0);
 …
+{
   owl_fmtext fm;
   int i;
+  int i;
   owl_fmtext_init_null(&fm);
   owl_fmtext_append_normal(&fm,"default:  ");
 …
      g_free(str2);
+  }
   owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
 …
+  }
   owl_fmtext_append_normal(&fm, "\n");
   owl_function_popless_fmtext(&fm);
   owl_ptr_array_free(l, g_free);
 …
 CALLER_OWN char *owl_function_keymap_summary(const char *name)
+{
   const owl_keymap *km
+  const owl_keymap *km
     = owl_keyhandler_get_keymap(owl_global_get_keyhandler(&g), name);
   if (km) return owl_keymap_summary(km);
 …
   } else {
     owl_fmtext_append_normal(&fm, "No such keymap...\n");
+  }
+  }
   owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
 …
   owl_fmtext_init_null(&fm);
   owl_cmd_get_help(owl_global_get_cmddict(&g), cmdname, &fm);
   owl_function_popless_fmtext(&fm);
+  owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
+}
 …
   viewsize=owl_view_get_size(v);
   curmsg=owl_global_get_curmsg(&g);
   if (viewsize==0) {
     owl_function_makemsg("No messages present");
 …
+}
 /* strips formatting from ztext and returns the unformatted text.
+/* strips formatting from ztext and returns the unformatted text.
  * caller is responsible for freeing. */
 CALLER_OWN char *owl_function_ztext_stylestrip(const char *zt)
 …
 /* Dump messages in the current view to the file 'filename'. */
 void owl_function_dump(const char *filename)
+void owl_function_dump(const char *filename)
+{
   int i, j;
 …
+      }
+    }
     /* if it exited, spawn a new one */
     if (owl_global_get_newmsgproc_pid(&g)==0) {

global.c

-                      r0792d99
+                      r7869e48
   g->lastinputtime=g->starttime;
   g->newmsgproc_pid=0;
   owl_global_set_config_format(g, 0);
   owl_global_set_no_have_config(g);
 …
 int owl_global_should_followlast(owl_global *g) {
   const owl_view *v;
   if (!owl_global_is__followlast(g)) return(0);
   v=owl_global_get_current_view(g);
   if (owl_global_get_curmsg(g)==owl_view_get_size(v)-1) return(1);
   return(0);
 …
   return(&(g->buddylist));
+}
 /* style */

help.c

-                      rd6b8b50
+                      r7869e48
   owl_fmtext_init_null(&fm);
   owl_fmtext_append_bold
     (&fm,
+    (&fm,
      "OWL HELP\n\n");
   owl_fmtext_append_normal
     (&fm,
+    (&fm,
      "  If you're new to BarnOwl, the first thing you should type is\n\n"
      "    :show quickstart\n\n"
 …
   owl_fmtext_append_bold
     (&fm,
+    (&fm,
      "  Basic Keys:\n"
      );
   owl_fmtext_append_normal
     (&fm,
+    (&fm,
      "    n             Move to next non-deleted message\n"
      "    p             Move to previous non-deleted message\n"
 …
      );
   owl_fmtext_append_bold
     (&fm,
+    (&fm,
      "  Basic Commands:\n"
      );
   owl_fmtext_append_normal
     (&fm,
+    (&fm,
      "    quit, exit    Exit BarnOwl\n"
      "    help          Get help about commands\n"
 …
      "    version       Print the version number of BarnOwl\n"
      "\n");
   /* help for variables */
   owl_fmtext_append_bold(&fm,
+  owl_fmtext_append_bold(&fm,
                          "Variables:\n");
   varnames = owl_variable_dict_get_names(owl_global_get_vardict(&g));

keybinding.c

-                      rf271129
+                      r7869e48
 /*
  * TODO: Idea for allowing functions to be user-specified ---
  *      Have function have a context bitmask that says where it
+ * TODO: Idea for allowing functions to be user-specified ---
+ *      Have function have a context bitmask that says where it
  *      can be used, and have keymaps also have one, and compare
  *      the two when setting.
+ *
+ *
  */

keymap.c

-                      rf271129
+                      r7869e48
     return -1;
   /* see if another matching binding, and if so remove it.
    * otherwise just add this one.
+   * otherwise just add this one.
    */
   for (i = km->bindings->len-1; i >= 0; i--) {
 …
     owl_fmtext_append_normal(fm, "\n");
   if (km->default_fn) {
     owl_fmtext_append_normal(fm, OWL_TABSTR
+    owl_fmtext_append_normal(fm, OWL_TABSTR
      "Has a default keypress handler (default_fn).\n");
+  }
 …
+  }
   if (km->postalways_fn) {
     owl_fmtext_append_normal(fm, OWL_TABSTR
+    owl_fmtext_append_normal(fm, OWL_TABSTR
      "Executes a function (postalways_fn) after handling every keypress.\n");
+  }
   owl_fmtext_append_bold(fm, "\nKey bindings:\n\n");
+  owl_fmtext_append_bold(fm, "\nKey bindings:\n\n");
   if (recurse) {
     _owl_keymap_format_with_parents(km, fm);
 …
   int i;
   const owl_keybinding *kb;
   for (i = 0; i < km->bindings->len; i++) {
     char *kbstr;
 …
       owl_fmtext_append_normal(fm, kb->command);
       owl_fmtext_append_normal(fm, "]");
+    }
+    }
     owl_fmtext_append_normal(fm, "\n");
+  }
 …
     kh->in_esc = 0;
+  }
   kh->kpstack[++(kh->kpstackpos)] = j.ch;
   if (kh->kpstackpos >= OWL_KEYMAP_MAXSTACK) {
 …
   owl_keyhandler_invalidkey(kh);
   /* unable to handle */
   return(1);
+  return(1);
+}

keypress.c

-                      rf271129
+                      r7869e48
 } specialmap[] = {
 #ifdef KEY_CODE_YES
    { KEY_CODE_YES,      "CODE_YES" },
+   { KEY_CODE_YES,      "CODE_YES" },
 #endif
    { KEY_MIN,           "MIN" },
    { KEY_BREAK,         "BREAK" },
    { KEY_DOWN,          "DOWN" },
    { KEY_UP,            "UP" },
    { KEY_LEFT,          "LEFT" },
    { KEY_RIGHT,         "RIGHT" },
    { KEY_HOME,          "HOME" },
    { KEY_BACKSPACE,     "BACKSPACE" },
    { KEY_F0,            "F0" },
    { KEY_F(1),          "F1" },
    { KEY_F(2),          "F2" },
    { KEY_F(3),          "F3" },
    { KEY_F(4),          "F4" },
    { KEY_F(5),          "F5" },
    { KEY_F(6),          "F6" },
    { KEY_F(7),          "F7" },
    { KEY_F(8),          "F8" },
    { KEY_F(9),          "F9" },
    { KEY_F(10),         "F10" },
    { KEY_F(11),         "F11" },
    { KEY_F(12),         "F12" },
    { KEY_DL,            "DL" },
    { KEY_IL,            "IL" },
    { KEY_DC,            "DC" },
    { KEY_IC,            "IC" },
    { KEY_EIC,           "EIC" },
    { KEY_CLEAR,         "CLEAR" },
    { KEY_EOS,           "EOS" },
    { KEY_EOL,           "EOL" },
    { KEY_SF,            "SF" },
    { KEY_SR,            "SR" },
    { KEY_NPAGE,         "NPAGE" },
    { KEY_PPAGE,         "PPAGE" },
    { KEY_STAB,          "STAB" },
    { KEY_CTAB,          "CTAB" },
    { KEY_CATAB,         "CATAB" },
    { KEY_ENTER,         "ENTER" },
    { KEY_SRESET,        "SRESET" },
    { KEY_RESET,         "RESET" },
    { KEY_PRINT,         "PRINT" },
    { KEY_LL,            "LL" },
    { KEY_A1,            "A1" },
    { KEY_A3,            "A3" },
    { KEY_B2,            "B2" },
    { KEY_C1,            "C1" },
    { KEY_C3,            "C3" },
    { KEY_BTAB,          "BTAB" },
    { KEY_BEG,           "BEG" },
    { KEY_CANCEL,        "CANCEL" },
    { KEY_CLOSE,         "CLOSE" },
    { KEY_COMMAND,       "COMMAND" },
    { KEY_COPY,          "COPY" },
    { KEY_CREATE,        "CREATE" },
    { KEY_END,           "END" },
    { KEY_EXIT,          "EXIT" },
    { KEY_FIND,          "FIND" },
    { KEY_HELP,          "HELP" },
    { KEY_MARK,          "MARK" },
    { KEY_MESSAGE,       "MESSAGE" },
    { KEY_MOVE,          "MOVE" },
    { KEY_NEXT,          "NEXT" },
    { KEY_OPEN,          "OPEN" },
    { KEY_OPTIONS,       "OPTIONS" },
    { KEY_PREVIOUS,      "PREVIOUS" },
    { KEY_REDO,          "REDO" },
    { KEY_REFERENCE,     "REFERENCE" },
    { KEY_REFRESH,       "REFRESH" },
    { KEY_REPLACE,       "REPLACE" },
    { KEY_RESTART,       "RESTART" },
    { KEY_RESUME,        "RESUME" },
    { KEY_SAVE,          "SAVE" },
    { KEY_SBEG,          "SBEG" },
    { KEY_SCANCEL,       "SCANCEL" },
    { KEY_SCOMMAND,      "SCOMMAND" },
    { KEY_SCOPY,         "SCOPY" },
    { KEY_SCREATE,       "SCREATE" },
    { KEY_SDC,           "SDC" },
    { KEY_SDL,           "SDL" },
    { KEY_SELECT,        "SELECT" },
    { KEY_SEND,          "SEND" },
    { KEY_SEOL,          "SEOL" },
    { KEY_SEXIT,         "SEXIT" },
    { KEY_SFIND,         "SFIND" },
    { KEY_SHELP,         "SHELP" },
    { KEY_SHOME,         "SHOME" },
    { KEY_SIC,           "SIC" },
    { KEY_SLEFT,         "SLEFT" },
    { KEY_SMESSAGE,      "SMESSAGE" },
    { KEY_SMOVE,         "SMOVE" },
    { KEY_SNEXT,         "SNEXT" },
    { KEY_SOPTIONS,      "SOPTIONS" },
    { KEY_SPREVIOUS,     "SPREVIOUS" },
    { KEY_SPRINT,        "SPRINT" },
    { KEY_SREDO,         "SREDO" },
    { KEY_SREPLACE,      "SREPLACE" },
    { KEY_SRIGHT,        "SRIGHT" },
    { KEY_SRSUME,        "SRSUME" },
    { KEY_SSAVE,         "SSAVE" },
    { KEY_SSUSPEND,      "SSUSPEND" },
    { KEY_SUNDO,         "SUNDO" },
    { KEY_SUSPEND,       "SUSPEND" },
    { KEY_UNDO,          "UNDO" },
    { KEY_MOUSE,         "MOUSE" },
+   { KEY_MIN,           "MIN" },
+   { KEY_BREAK,         "BREAK" },
+   { KEY_DOWN,          "DOWN" },
+   { KEY_UP,            "UP" },
+   { KEY_LEFT,          "LEFT" },
+   { KEY_RIGHT,         "RIGHT" },
+   { KEY_HOME,          "HOME" },
+   { KEY_BACKSPACE,     "BACKSPACE" },
+   { KEY_F0,            "F0" },
+   { KEY_F(1),          "F1" },
+   { KEY_F(2),          "F2" },
+   { KEY_F(3),          "F3" },
+   { KEY_F(4),          "F4" },
+   { KEY_F(5),          "F5" },
+   { KEY_F(6),          "F6" },
+   { KEY_F(7),          "F7" },
+   { KEY_F(8),          "F8" },
+   { KEY_F(9),          "F9" },
+   { KEY_F(10),         "F10" },
+   { KEY_F(11),         "F11" },
+   { KEY_F(12),         "F12" },
+   { KEY_DL,            "DL" },
+   { KEY_IL,            "IL" },
+   { KEY_DC,            "DC" },
+   { KEY_IC,            "IC" },
+   { KEY_EIC,           "EIC" },
+   { KEY_CLEAR,         "CLEAR" },
+   { KEY_EOS,           "EOS" },
+   { KEY_EOL,           "EOL" },
+   { KEY_SF,            "SF" },
+   { KEY_SR,            "SR" },
+   { KEY_NPAGE,         "NPAGE" },
+   { KEY_PPAGE,         "PPAGE" },
+   { KEY_STAB,          "STAB" },
+   { KEY_CTAB,          "CTAB" },
+   { KEY_CATAB,         "CATAB" },
+   { KEY_ENTER,         "ENTER" },
+   { KEY_SRESET,        "SRESET" },
+   { KEY_RESET,         "RESET" },
+   { KEY_PRINT,         "PRINT" },
+   { KEY_LL,            "LL" },
+   { KEY_A1,            "A1" },
+   { KEY_A3,            "A3" },
+   { KEY_B2,            "B2" },
+   { KEY_C1,            "C1" },
+   { KEY_C3,            "C3" },
+   { KEY_BTAB,          "BTAB" },
+   { KEY_BEG,           "BEG" },
+   { KEY_CANCEL,        "CANCEL" },
+   { KEY_CLOSE,         "CLOSE" },
+   { KEY_COMMAND,       "COMMAND" },
+   { KEY_COPY,          "COPY" },
+   { KEY_CREATE,        "CREATE" },
+   { KEY_END,           "END" },
+   { KEY_EXIT,          "EXIT" },
+   { KEY_FIND,          "FIND" },
+   { KEY_HELP,          "HELP" },
+   { KEY_MARK,          "MARK" },
+   { KEY_MESSAGE,       "MESSAGE" },
+   { KEY_MOVE,          "MOVE" },
+   { KEY_NEXT,          "NEXT" },
+   { KEY_OPEN,          "OPEN" },
+   { KEY_OPTIONS,       "OPTIONS" },
+   { KEY_PREVIOUS,      "PREVIOUS" },
+   { KEY_REDO,          "REDO" },
+   { KEY_REFERENCE,     "REFERENCE" },
+   { KEY_REFRESH,       "REFRESH" },
+   { KEY_REPLACE,       "REPLACE" },
+   { KEY_RESTART,       "RESTART" },
+   { KEY_RESUME,        "RESUME" },
+   { KEY_SAVE,          "SAVE" },
+   { KEY_SBEG,          "SBEG" },
+   { KEY_SCANCEL,       "SCANCEL" },
+   { KEY_SCOMMAND,      "SCOMMAND" },
+   { KEY_SCOPY,         "SCOPY" },
+   { KEY_SCREATE,       "SCREATE" },
+   { KEY_SDC,           "SDC" },
+   { KEY_SDL,           "SDL" },
+   { KEY_SELECT,        "SELECT" },
+   { KEY_SEND,          "SEND" },
+   { KEY_SEOL,          "SEOL" },
+   { KEY_SEXIT,         "SEXIT" },
+   { KEY_SFIND,         "SFIND" },
+   { KEY_SHELP,         "SHELP" },
+   { KEY_SHOME,         "SHOME" },
+   { KEY_SIC,           "SIC" },
+   { KEY_SLEFT,         "SLEFT" },
+   { KEY_SMESSAGE,      "SMESSAGE" },
+   { KEY_SMOVE,         "SMOVE" },
+   { KEY_SNEXT,         "SNEXT" },
+   { KEY_SOPTIONS,      "SOPTIONS" },
+   { KEY_SPREVIOUS,     "SPREVIOUS" },
+   { KEY_SPRINT,        "SPRINT" },
+   { KEY_SREDO,         "SREDO" },
+   { KEY_SREPLACE,      "SREPLACE" },
+   { KEY_SRIGHT,        "SRIGHT" },
+   { KEY_SRSUME,        "SRSUME" },
+   { KEY_SSAVE,         "SSAVE" },
+   { KEY_SSUSPEND,      "SSUSPEND" },
+   { KEY_SUNDO,         "SUNDO" },
+   { KEY_SUSPEND,       "SUSPEND" },
+   { KEY_UNDO,          "UNDO" },
+   { KEY_MOUSE,         "MOUSE" },
 #ifdef KEY_RESIZE
    { KEY_RESIZE,        "RESIZE" },
+   { KEY_RESIZE,        "RESIZE" },
 #endif
    { KEY_MAX,           "MAX" },
    { ' ',               "SPACE" },
    { 27,                "ESCAPE" },
    { 127,               "DELETE" },
    { '\r',              "CR" },
+   { KEY_MAX,           "MAX" },
+   { ' ',               "SPACE" },
+   { 27,                "ESCAPE" },
+   { 127,               "DELETE" },
+   { '\r',              "CR" },
    { '\n',              "LF" },
    { '\t',              "TAB" },
+   { '\t',              "TAB" },
    { 0,                 NULL }
 };
 …
       g_string_append_c(kb, j);
+    }
+  }
+  }
   if (!kb->str[0]) {
     /* not a valid key */

keys.c

-                      rdcd48ad
+                      r7869e48
     *km_ew_multi, *km_ew_onel, *km_viewwin;
   /****************************************************************/
   /*************************** GLOBAL *****************************/
 …
   km_global = km = owl_keyhandler_create_and_add_keymap(kh, "global",
        "System-wide default key bindings",
+       "System-wide default key bindings",
        owl_keys_default_invalid, NULL, NULL);
   BIND_CMD("C-z",      "message Use :suspend to suspend.", "");
 …
   km_editwin = km = owl_keyhandler_create_and_add_keymap(kh, "edit",
        "Text editing and command window",
+       "Text editing and command window",
        owl_keys_editwin_default, NULL, owl_keys_editwin_postalways);
   owl_keymap_set_parent(km_editwin, km_global);
 …
   km_ew_multi = km = owl_keyhandler_create_and_add_keymap(kh, "editmulti",
        "Multi-line text editing",
+       "Multi-line text editing",
        owl_keys_editwin_default, NULL, owl_keys_editwin_postalways);
   owl_keymap_set_parent(km_ew_multi, km_editwin);
 …
   BIND_CMD("M-n",         "edit:history-next", "");
   /* note that changing "disable-ctrl-d" to "on" will change this to
+  /* note that changing "disable-ctrl-d" to "on" will change this to
    * edit:delete-next-char */
   BIND_CMD("C-d",     "edit:done-or-delete", "sends the zephyr if at the end of the message");
 …
   km_ew_onel = km = owl_keyhandler_create_and_add_keymap(kh, "editline",
        "Single-line text editing",
+       "Single-line text editing",
        owl_keys_editwin_default, NULL, owl_keys_editwin_postalways);
   owl_keymap_set_parent(km_ew_onel, km_editwin);
 …
   BIND_CMD("CR",          "editline:done", "executes the command");
   /****************************************************************/
   /**************************** EDITRESPONSE **********************/
 …
   km_ew_onel = km = owl_keyhandler_create_and_add_keymap(kh, "editresponse",
        "Single-line response to question",
+       "Single-line response to question",
        owl_keys_editwin_default, NULL, owl_keys_editwin_postalways);
   owl_keymap_set_parent(km_ew_onel, km_editwin);
 …
   km_viewwin = km = owl_keyhandler_create_and_add_keymap(kh, "popless",
        "Pop-up window (eg, help)",
+       "Pop-up window (eg, help)",
        owl_keys_default_invalid, NULL, owl_keys_popless_postalways);
   owl_keymap_set_parent(km_viewwin, km_global);
 …
   BIND_CMD("M-M", "smartnarrow -ri",  "like M-N but with 'narrow-related' temporarily flipped.");
   BIND_CMD("M-p", "view personal", "");
   BIND_CMD("/",   "start-command search ", "start a search command");
   BIND_CMD("?",   "start-command search -r ", "start a reverse search command");
 …
   BIND_CMD("C-n",    "recv:next",      "");
   BIND_CMD("M-[ B",  "recv:next",      "");
   BIND_CMD("M-C-n",  "recv:next --smart-filter", "move to next message matching the current one");
+  BIND_CMD("M-C-n",  "recv:next --smart-filter", "move to next message matching the current one");
   BIND_CMD("UP",     "recv:prev",      "");
   BIND_CMD("M-[ A",  "recv:prev",      "");

libfaim/admin.c

-                      rcf02dd6
+                      r7869e48
  * Family 0x0007 - Account Administration.
+ *
  * Used for stuff like changing the formating of your screen name, changing your
  * email address, requesting an account confirmation email, getting account info,
+ * Used for stuff like changing the formating of your screen name, changing your
+ * email address, requesting an account confirmation email, getting account info,
+ *
  */
 …
  * 0x0013 - Unknown
+ *
  */
+ */
 faim_export int aim_admin_getinfo(aim_session_t *sess, aim_conn_t *conn, fu16_t info)
+{
 …
  * Subtypes 0x0003 and 0x0005 - Parse account info.
+ *
  * Called in reply to both an information request (subtype 0x0002) and
+ * Called in reply to both an information request (subtype 0x0002) and
  * an information change (subtype 0x0004).
+ *
 …
         aim_tlvlist_add_raw(&tl, 0x0001, strlen(newnick), newnick);
         aim_tlvlist_write(&fr->data, &tl);
         aim_tlvlist_free(&tl);
         aim_tx_enqueue(sess, fr);
 …
         aim_tlvlist_add_raw(&tl, 0x0011, strlen(newemail), newemail);
         aim_tlvlist_write(&fr->data, &tl);
         aim_tlvlist_free(&tl);
         aim_tx_enqueue(sess, fr);

libfaim/aim.h

-                      rfe73d0c
+                      r7869e48
 /*
+/*
  * Main libfaim header.  Must be included in client for prototypes/macros.
+ *
 …
 #if defined(mach) && defined(__APPLE__)
 #define gethostbyname(x) gethostbyname2(x, AF_INET)
+#define gethostbyname(x) gethostbyname2(x, AF_INET)
 #endif
 …
 /*
  * For a win32 DLL, we define WIN32_INDLL if this file
  * is included while compiling the DLL. If its not
+ * is included while compiling the DLL. If its not
  * defined (its included in a client app), the symbols
  * will be imported instead of exported.
 …
 #ifdef WIN32_INDLL
 #define faim_export __declspec(dllexport)
 #else
+#else
 #define faim_export __declspec(dllimport)
 #endif /* WIN32_INDLL */
 …
 #endif
 /*
  * Current Maximum Length for Screen Names (not including NULL)
+/*
+ * Current Maximum Length for Screen Names (not including NULL)
+ *
  * Currently only names up to 16 characters can be registered
 …
+ *
  * XXX: the real limit is the total SNAC size at 8192. Fix this.
+ *
+ *
  */
 #define MAXMSGLEN 7987
 …
+ *
  * This is actually defined by the protocol to be
  * dynamic, but I have yet to see due cause to
+ * dynamic, but I have yet to see due cause to
  * define it dynamically here.  Maybe later.
+ *
 …
 /*
  * Client info.  Filled in by the client and passed in to
+ * Client info.  Filled in by the client and passed in to
  * aim_send_login().  The information ends up getting passed to OSCAR
  * through the initial login command.
 …
 #define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQ_5_45_3777
 /*
  * These could be arbitrary, but its easier to use the actual AIM values
+/*
+ * These could be arbitrary, but its easier to use the actual AIM values
  */
 #define AIM_CONN_TYPE_BOS               0x0002
 …
         void *internal; /* internal conn-specific libfaim data */
         time_t lastactivity; /* time of last transmit */
         int forcedlatency;
+        int forcedlatency;
         void *handlerlist;
         void *sessv; /* pointer to parent session */
 …
         fu8_t hdrtype; /* defines which piece of the union to use */
         union {
                 struct {
+                struct {
                         fu8_t type;
                         flap_seqnum_t seqnum;
+                        flap_seqnum_t seqnum;
                 } flap;
                 struct {
 …
 /*
  * AIM Session: The main client-data interface.
+ * AIM Session: The main client-data interface.
+ *
  */
 …
         /*
          * Pointer to anything the client wants to
+         * Pointer to anything the client wants to
          * explicitly associate with this session.
+         *
 …
          * I/O.  I don't suggest that you use libfaim's internal I/O.
          * Its really bad and the API/event model is quirky at best.
+         *
+         *
          */
         aim_frame_t *queue_outgoing;
         aim_frame_t *queue_incoming;
+        aim_frame_t *queue_outgoing;
+        aim_frame_t *queue_incoming;
         /*
 …
         /*
          * Outstanding snac handling
+         * Outstanding snac handling
+         *
          * XXX: Should these be per-connection? -mid
 …
 /*
  * This information is provided in the Incoming ICBM callback for
  * Channel 1 ICBM's.
+ * Channel 1 ICBM's.
+ *
  * Note that although CUSTOMFEATURES and CUSTOMCHARSET say they
 …
         aim_mpmsg_t mpmsg;
         fu32_t icbmflags; /* some flags apply only to ->msg, not all mpmsg */
         /* Only provided if message has a human-readable section */
         char *msg;

libfaim/aim_cbtypes.h

-                      rcf02dd6
+                      r7869e48
 /*
  * SNAC Family: Ack.
+ *
+ *
  * Not really a family, but treating it as one really
  * helps it fit into the libfaim callback structure better.
 …
 /*
  * SNAC Family: General.
  */
+ */
 #define AIM_CB_GEN_ERROR 0x0001
 #define AIM_CB_GEN_CLIENTREADY 0x0002
 …
 /*
  * SNAC Family: Location Services.
  */
+ */
 #define AIM_CB_LOC_ERROR 0x0001
 #define AIM_CB_LOC_REQRIGHTS 0x0002
 …
 /*
  * SNAC Family: Buddy List Management Services.
  */
+ */
 #define AIM_CB_BUD_ERROR 0x0001
 #define AIM_CB_BUD_REQRIGHTS 0x0002
 …
 /*
  * SNAC Family: Messeging Services.
  */
+ */
 #define AIM_CB_MSG_ERROR 0x0001
 #define AIM_CB_MSG_PARAMINFO 0x0005
 …
 /*
  * SNAC Family: Advertisement Services
  */
+ */
 #define AIM_CB_ADS_ERROR 0x0001
 #define AIM_CB_ADS_DEFAULT 0xffff
 …
 /*
  * SNAC Family: Invitation Services.
  */
+ */
 #define AIM_CB_INV_ERROR 0x0001
 #define AIM_CB_INV_DEFAULT 0xffff
 …
 /*
  * SNAC Family: Administrative Services.
  */
+ */
 #define AIM_CB_ADM_ERROR 0x0001
 #define AIM_CB_ADM_INFOCHANGE_REPLY 0x0005
 …
 /*
  * SNAC Family: Popup Messages
  */
+ */
 #define AIM_CB_POP_ERROR 0x0001
 #define AIM_CB_POP_DEFAULT 0xffff
 …
 /*
  * SNAC Family: Misc BOS Services.
  */
+ */
 #define AIM_CB_BOS_ERROR 0x0001
 #define AIM_CB_BOS_RIGHTSQUERY 0x0002
 …
 /*
  * SNAC Family: User Lookup Services
  */
+ */
 #define AIM_CB_LOK_ERROR 0x0001
 #define AIM_CB_LOK_DEFAULT 0xffff
 …
 /*
  * SNAC Family: User Status Services
  */
+ */
 #define AIM_CB_STS_ERROR 0x0001
 #define AIM_CB_STS_SETREPORTINTERVAL 0x0002
 …
 /*
  * SNAC Family: Translation Services
  */
+ */
 #define AIM_CB_TRN_ERROR 0x0001
 #define AIM_CB_TRN_DEFAULT 0xffff
 …
 /*
  * SNAC Family: Chat Navigation Services
  */
+ */
 #define AIM_CB_CTN_ERROR 0x0001
 #define AIM_CB_CTN_CREATE 0x0008
 …
 /*
  * SNAC Family: Chat Services
  */
+ */
 #define AIM_CB_CHT_ERROR 0x0001
 #define AIM_CB_CHT_ROOMINFOUPDATE 0x0002
 …
 /*
  * SNAC Family: "New" Search
  */
+ */
 #define AIM_CB_SCH_ERROR 0x0001
 #define AIM_CB_SCH_SEARCH 0x0002
 …
 /*
  * SNAC Family: Buddy icons
  */
+ */
 #define AIM_CB_ICO_ERROR 0x0001
 #define AIM_CB_ICO_REQUEST 0x0004
 …
+ *
  * Most of these are actually special.
  */
+ */
 #define AIM_CB_ICQ_ERROR 0x0001
 #define AIM_CB_ICQ_OFFLINEMSG 0x00f0
 …
  * OFT Services
+ *
  * For all of the above #defines, the number is the subtype
  * of the SNAC.  For OFT #defines, the number is the
  * "hdrtype" which comes after the magic string and OFT
+ * For all of the above #defines, the number is the subtype
+ * of the SNAC.  For OFT #defines, the number is the
+ * "hdrtype" which comes after the magic string and OFT
  * packet length.
+ *
  * I'm pretty sure the ODC ones are arbitrary right now,
+ * I'm pretty sure the ODC ones are arbitrary right now,
  * that should be changed.
  */
 …
  * the SNAC-centered libfaim callback structure.
+ *
  */
+ */
 #define AIM_CB_SPECIAL_AUTHSUCCESS 0x0001
 #define AIM_CB_SPECIAL_AUTHOTHER 0x0002

libfaim/aim_internal.h

-                      rcf02dd6
+                      r7869e48
 };
 /*
+/*
  * In SNACland, the terms 'family' and 'group' are synonymous -- the former
  * is my term, the latter is AOL's.
 …
  * This is inside every connection.  But it is a void * to anything
  * outside of libfaim.  It should remain that way.  It's called data
  * abstraction.  Maybe you've heard of it.  (Probably not if you're a
+ * abstraction.  Maybe you've heard of it.  (Probably not if you're a
  * libfaim user.)
+ *
+ *
  */
 typedef struct aim_conn_inside_s {

libfaim/auth.c

-                      rcf02dd6
+                      r7869e48
  * Family 0x0017 - Authentication.
+ *
  * Deals with the authorizer for SNAC-based login, and also old-style
+ * Deals with the authorizer for SNAC-based login, and also old-style
  * non-SNAC login.
+ *
 …
+ *
  * The encoding_table seems to be a fixed set of values.  We'll
  * hope it doesn't change over time!
+ * hope it doesn't change over time!
+ *
  * This is only used for the XOR method, not the better MD5 method.
 …
         md5_state_t state;
         md5_init(&state);
+        md5_init(&state);
         md5_append(&state, (const md5_byte_t *)key, strlen(key));
         md5_append(&state, (const md5_byte_t *)password, strlen(password));
 …
         md5_finish(&state, (md5_byte_t *)&passdigest);
         md5_init(&state);
+        md5_init(&state);
         md5_append(&state, (const md5_byte_t *)key, strlen(key));
         md5_append(&state, (const md5_byte_t *)&passdigest, 16);
 …
 /*
  * The FLAP version is sent by itself at the beginning of authorization
  * connections.  The FLAP version is also sent before the cookie when connecting
+ * The FLAP version is sent by itself at the beginning of authorization
+ * connections.  The FLAP version is also sent before the cookie when connecting
  * for other services (BOS, chatnav, chat, etc.).
  */
 …
  *   build  = 0x0013
  *   unknown= (not sent)
+ *
+ *
  * AIM for Linux 1.1.112:
  *   clientstring = "AOL Instant Messenger (SM)"
 …
         aim_tlvlist_free(&tl);
         aim_tx_enqueue(sess, fr);
 …
  * This is sent back as a general response to the login command.
  * It can be either an error or a success, depending on the
  * precense of certain TLVs.
+ * precense of certain TLVs.
+ *
  * The client should check the value passed as errorcode. If
 …
          * have an error url.
          */
         if (aim_tlv_gettlv(tlvlist, 0x0008, 1))
+        if (aim_tlv_gettlv(tlvlist, 0x0008, 1))
                 info->errorcode = aim_tlv_get16(tlvlist, 0x0008, 1);
         if (aim_tlv_gettlv(tlvlist, 0x0004, 1))
 …
          * The email address attached to this account
          *   Not available for ICQ or @mac.com logins.
          *   If you receive this TLV, then you are allowed to use
+         *   If you receive this TLV, then you are allowed to use
          *   family 0x0018 to check the status of your email.
          * XXX - Not really true!
 …
         aim_frame_t fr;
         aim_rxcallback_t userfunc;
         fr.conn = conn;
         if ((userfunc = aim_callhandler(sess, conn, 0x0017, 0x0007)))
                 userfunc(sess, &fr, "");
 …
  * Subtype 0x0006
+ *
  * In AIM 3.5 protocol, the first stage of login is to request login from the
  * Authorizer, passing it the screen name for verification.  If the name is
  * invalid, a 0017/0003 is spit back, with the standard error contents.  If
  * valid, a 0017/0007 comes back, which is the signal to send it the main
  * login command (0017/0002).
+ * In AIM 3.5 protocol, the first stage of login is to request login from the
+ * Authorizer, passing it the screen name for verification.  If the name is
+ * invalid, a 0017/0003 is spit back, with the standard error contents.  If
+ * valid, a 0017/0007 comes back, which is the signal to send it the main
+ * login command (0017/0002).
+ *
  */
 …
         aim_snacid_t snacid;
         aim_tlvlist_t *tl = NULL;
         if (!sess || !conn || !sn)
                 return -EINVAL;
 …
         keystr = aimbs_getstr(bs, keylen);
         /* XXX - When GiantGrayPanda signed on AIM I got a thing asking me to register
          * for the netscape network.  This SNAC had a type 0x0058 TLV with length 10.
+        /* XXX - When GiantGrayPanda signed on AIM I got a thing asking me to register
+         * for the netscape network.  This SNAC had a type 0x0058 TLV with length 10.
          * Data is 0x0007 0004 3e19 ae1e 0006 0004 0000 0005 */
 …
                 ret = userfunc(sess, rx, keystr);
         free(keystr);
+        free(keystr);
         return ret;

libfaim/bart.c

r07ab1cb	r7869e48
2	2	* Family 0x0010 - Server stored buddy art
3	3	*
4		* Used for storing and retrieving your cute little buddy icon
	4	* Used for storing and retrieving your cute little buddy icon
5	5	* from the AIM servers.
6	6	*

libfaim/bos.c

-                      rcf02dd6
+                      r7869e48
         int ret = 0;
         /*
          * TLVs follow
+        /*
+         * TLVs follow
          */
         tlvlist = aim_tlvlist_read(bs);
 …
          * TLV type 0x0002: Maximum number of buddies on deny list.
          */
         if (aim_tlv_gettlv(tlvlist, 0x0002, 1))
+        if (aim_tlv_gettlv(tlvlist, 0x0002, 1))
                 maxdenies = aim_tlv_get16(tlvlist, 0x0002, 1);
 …
         aim_tlvlist_free(&tlvlist);
         return ret;
+        return ret;
+}
 /*
+/*
  * Subtype 0x0004 - Set group permisson mask.
+ *
 …
  *  AIM_VISIBILITYCHANGE_DENYREMOVE: Lets list see you again
+ *
  * list should be a list of
+ * list should be a list of
  * screen names in the form "Screen Name One&ScreenNameTwo&" etc.
+ *
 …
  *   - Allow all users to contact me: Send an AIM_VISIBILITYCHANGE_DENYADD
  *      with only your name on it.
  *   - Allow only users on my Buddy List: Send an
+ *   - Allow only users on my Buddy List: Send an
  *      AIM_VISIBILITYCHANGE_PERMITADD with the list the same as your
  *      buddy list
  *   - Allow only the uesrs below: Send an AIM_VISIBILITYCHANGE_PERMITADD
+ *   - Allow only the uesrs below: Send an AIM_VISIBILITYCHANGE_PERMITADD
  *      with everyone listed that you want to see you.
  *   - Block all users: Send an AIM_VISIBILITYCHANGE_PERMITADD with only
+ *   - Block all users: Send an AIM_VISIBILITYCHANGE_PERMITADD with only
  *      yourself in the list
  *   - Block the users below: Send an AIM_VISIBILITYCHANGE_DENYADD with

libfaim/bstream.c

-                      re374dee
+                      r7869e48
 #define FAIM_INTERNAL
 #include <aim.h>
+#include <aim.h>
 faim_internal int aim_bstream_init(aim_bstream_t *bs, fu8_t *data, int len)
+{
         if (!bs)
                 return -1;
 …
 faim_internal fu8_t aimbs_get8(aim_bstream_t *bs)
+{
         if (aim_bstream_empty(bs) < 1)
                 return 0; /* XXX throw an exception */
+        if (aim_bstream_empty(bs) < 1)
+                return 0; /* XXX throw an exception */
         bs->offset++;
         return aimutil_get8(bs->data + bs->offset - 1);
+}
 …
 faim_internal fu16_t aimbs_get16(aim_bstream_t *bs)
+{
         if (aim_bstream_empty(bs) < 2)
                 return 0; /* XXX throw an exception */
+        if (aim_bstream_empty(bs) < 2)
+                return 0; /* XXX throw an exception */
         bs->offset += 2;
         return aimutil_get16(bs->data + bs->offset - 2);
+}
 …
 faim_internal fu32_t aimbs_get32(aim_bstream_t *bs)
+{
         if (aim_bstream_empty(bs) < 4)
                 return 0; /* XXX throw an exception */
+        if (aim_bstream_empty(bs) < 4)
+                return 0; /* XXX throw an exception */
         bs->offset += 4;
         return aimutil_get32(bs->data + bs->offset - 4);
+}
 …
 faim_internal fu8_t aimbs_getle8(aim_bstream_t *bs)
+{
         if (aim_bstream_empty(bs) < 1)
                 return 0; /* XXX throw an exception */
+        if (aim_bstream_empty(bs) < 1)
+                return 0; /* XXX throw an exception */
         bs->offset++;
         return aimutil_getle8(bs->data + bs->offset - 1);
+}
 …
 faim_internal fu16_t aimbs_getle16(aim_bstream_t *bs)
+{
         if (aim_bstream_empty(bs) < 2)
                 return 0; /* XXX throw an exception */
+        if (aim_bstream_empty(bs) < 2)
+                return 0; /* XXX throw an exception */
         bs->offset += 2;
         return aimutil_getle16(bs->data + bs->offset - 2);
+}
 …
 faim_internal fu32_t aimbs_getle32(aim_bstream_t *bs)
+{
         if (aim_bstream_empty(bs) < 4)
                 return 0; /* XXX throw an exception */
+        if (aim_bstream_empty(bs) < 4)
+                return 0; /* XXX throw an exception */
         bs->offset += 4;
         return aimutil_getle32(bs->data + bs->offset - 4);
+}

libfaim/buddylist.c

-                      rcf02dd6
+                      r7869e48
         int ret = 0;
         /*
          * TLVs follow
+        /*
+         * TLVs follow
          */
         tlvlist = aim_tlvlist_read(bs);
 …
          * list.  (This is called the "reverse list" by a certain
          * other IM protocol.)
+         *
+         *
          */
         if (aim_tlv_gettlv(tlvlist, 0x0002, 1))
 …
         aim_tlvlist_free(&tlvlist);
         return ret;
+        return ret;
+}
 …
  * buddy_list = "Screen Name One&ScreenNameTwo&";
+ *
  * XXX Clean this up.
+ * XXX Clean this up.
+ *
  */
 …
         char *tmpptr = NULL;
         if (!buddy_list || !(localcpy = strdup(buddy_list)))
+        if (!buddy_list || !(localcpy = strdup(buddy_list)))
                 return -EINVAL;
 …
+}
 /*
+/*
  * Subtype 0x000b
+ *
 …
         snacid = aim_cachesnac(sess, 0x0003, 0x000b, 0x0000, NULL, 0);
         aim_putsnac(&fr->data, 0x0003, 0x000b, 0x0000, snacid);
         aim_putuserinfo(&fr->data, info);
 …
+}
 /*
+/*
  * Subtype 0x000c
+ *
 …
         snacid = aim_cachesnac(sess, 0x0003, 0x000c, 0x0000, NULL, 0);
         aim_putsnac(&fr->data, 0x0003, 0x000c, 0x0000, snacid);
         aimbs_put8(&fr->data, strlen(sn));

libfaim/chat.c

-                      rcf02dd6
+                      r7869e48
 #define FAIM_INTERNAL
 #include <aim.h>
+#include <aim.h>
 #include <string.h>
 …
         buflen = 2 + 1 + strlen(roomname) + 2;
         if (!(buf = malloc(buflen)))
                 return 0;
 …
 /*
  * Join a room of name roomname.  This is the first step to joining an
  * already created room.  It's basically a Service Request for
  * family 0x000e, with a little added on to specify the exchange and room
+ * Join a room of name roomname.  This is the first step to joining an
+ * already created room.  It's basically a Service Request for
+ * family 0x000e, with a little added on to specify the exchange and room
  * name.
  */
 …
         aim_tlvlist_t *tl = NULL;
         struct chatsnacinfo csi;
         if (!sess || !conn || !roomname || !strlen(roomname))
                 return -EINVAL;
 …
         aim_tx_enqueue(sess, fr);
         return 0;
+        return 0;
+}
 …
         int hdrlen;
         aim_bstream_t hdrbs;
         if (!sess || !conn || !sn || !msg || !roomname)
                 return -EINVAL;
 …
          * Sigh.  AOL was rather inconsistent right here.  So we have
          * to play some minor tricks.  Right inside the type 5 is some
          * raw data, followed by a series of TLVs.
+         * raw data, followed by a series of TLVs.
+         *
          */
 …
         hdr = malloc(hdrlen);
         aim_bstream_init(&hdrbs, hdr, hdrlen);
         aimbs_put16(&hdrbs, 0x0000); /* Unknown! */
         aimbs_putraw(&hdrbs, ckstr, sizeof(ckstr)); /* I think... */
 …
         aim_addtlvtochain_chatroom(&itl, 0x2711, exchange, roomname, instance);
         aim_tlvlist_write(&hdrbs, &itl);
         aim_tlvlist_add_raw(&otl, 0x0005, aim_bstream_curpos(&hdrbs), hdr);
 …
         aim_tlvlist_free(&itl);
         aim_tlvlist_free(&otl);
         aim_tx_enqueue(sess, fr);
 …
         /*
          * Everything else are TLVs.
          */
+         */
         tlvlist = aim_tlvlist_read(bs);
 …
          * Type 0x0073:  Occupant list.
          */
         if (aim_tlv_gettlv(tlvlist, 0x0073, 1)) {
+        if (aim_tlv_gettlv(tlvlist, 0x0073, 1)) {
                 int curoccupant = 0;
                 aim_tlv_t *tmptlv;
 …
+        }
         /*
+        /*
          * Type 0x00c9: Flags. (AIM_CHATROOM_FLAG)
          */
 …
                 flags = aim_tlv_get16(tlvlist, 0x00c9, 1);
         /*
+        /*
          * Type 0x00ca: Creation time (4 bytes)
          */
 …
                 creationtime = aim_tlv_get32(tlvlist, 0x00ca, 1);
         /*
+        /*
          * Type 0x00d1: Maximum Message Length
          */
 …
                 maxmsglen = aim_tlv_get16(tlvlist, 0x00d1, 1);
         /*
+        /*
          * Type 0x00d2: Unknown. (2 bytes)
          */
 …
                 unknown_d2 = aim_tlv_get16(tlvlist, 0x00d2, 1);
         /*
+        /*
          * Type 0x00d3: Room Description
          */
 …
+                ;
         /*
+        /*
          * Type 0x00d5: Unknown. (1 byte)
          */
 …
         if (aim_tlv_gettlv(tlvlist, 0x000d6, 1))
+                ;
         /*
          * Type 0x00d7: Language 1 ("en")
 …
         if (aim_tlv_gettlv(tlvlist, 0x000d8, 1))
+                ;
         /*
          * Type 0x00d9: Language 2 ("en")
 …
  *                                 and displays the message as normal.)
+ *
  * XXX convert this to use tlvchains
+ * XXX convert this to use tlvchains
  */
 faim_export int aim_chat_send_im(aim_session_t *sess, aim_conn_t *conn, fu16_t flags, const char *msg, int msglen)
+{
+{
         int i;
         aim_frame_t *fr;
 …
+         *
          * This could include other information... We just
          * put in a message TLV however.
+         *
+         * put in a message TLV however.
+         *
          */
         aim_tlvlist_add_frozentlvlist(&otl, 0x0005, &itl);
         aim_tlvlist_write(&fr->data, &otl);
         aim_tlvlist_free(&itl);
         aim_tlvlist_free(&otl);
         aim_tx_enqueue(sess, fr);
 …
  * Subtype 0x0006
+ *
  * We could probably include this in the normal ICBM parsing
+ * We could probably include this in the normal ICBM parsing
  * code as channel 0x0003, however, since only the start
  * would be the same, we might as well do it here.
 …
  *         message string
  *       possibly others
+ *
+ *
  */
 static int incomingmsg(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
+{
         aim_userinfo_t userinfo;
         aim_rxcallback_t userfunc;
+        aim_rxcallback_t userfunc;
         int ret = 0;
         fu8_t *cookie;
 …
         /*
          * Start parsing TLVs right away.
+         * Start parsing TLVs right away.
          */
         otl = aim_tlvlist_read(bs);
 …
         /*
          * Type 0x0001: If present, it means it was a message to the
+         * Type 0x0001: If present, it means it was a message to the
          * room (as opposed to a whisper).
          */
 …
                 itl = aim_tlvlist_read(&tbs);
                 /*
+                /*
                  * Type 0x0001: Message.
                  */
+                 */
                 if (aim_tlv_gettlv(itl, 0x0001, 1))
                         msg = aim_tlv_getstr(itl, 0x0001, 1);
                 aim_tlvlist_free(&itl);
+                aim_tlvlist_free(&itl);
+        }

libfaim/chatnav.c

-                      rcf02dd6
+                      r7869e48
          * This looks to be a big hack.  You'll note that this entire
          * SNAC is just a room info structure, but the hard room name,
          * here, is set to "create".
+         * here, is set to "create".
+         *
          * Either this goes on the "list of questions concerning
 …
         aimbs_putraw(&fr->data, ck, strlen(ck));
         /*
+        /*
          * instance
+         *
+         *
          * Setting this to 0xffff apparently assigns the last instance.
+         *
 …
         tlvlist = aim_tlvlist_read(bs);
         /*
+        /*
          * Type 0x0002: Maximum concurrent rooms.
          */
+         */
         if (aim_tlv_gettlv(tlvlist, 0x0002, 1))
                 maxrooms = aim_tlv_get8(tlvlist, 0x0002, 1);
         /*
+        /*
          * Type 0x0003: Exchange information
+         *
          * There can be any number of these, each one
          * representing another exchange.
+         *
+         * representing another exchange.
+         *
          */
         for (curexchange = 0; ((exchangetlv = aim_tlv_gettlv(tlvlist, 0x0003, curexchange+1))); ) {
 …
                 innerlist = aim_tlvlist_read(&tbs);
                 /*
+                /*
                  * Type 0x000a: Unknown.
+                 *
 …
+                        ;
                 /*
+                /*
                  * Type 0x000d: Unknown.
                  */
 …
+                        ;
                 /*
+                /*
                  * Type 0x0004: Unknown
                  */
 …
+                        ;
                 /*
+                /*
                  * Type 0x0002: Unknown
                  */
 …
                         classperms = aim_tlv_get16(innerlist, 0x0002, 1);
                         faimdprintf(sess, 1, "faim: class permissions %x\n", classperms);
+                }
 …
                  * 8 Occupant Peek Allowed
+                 *
                  */
+                 */
                 if (aim_tlv_gettlv(innerlist, 0x00c9, 1))
                         exchanges[curexchange-1].flags = aim_tlv_get16(innerlist, 0x00c9, 1);
                 /*
                  * Type 0x00ca: Creation Date
+                /*
+                 * Type 0x00ca: Creation Date
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00ca, 1))
+                        ;
                 /*
                  * Type 0x00d0: Mandatory Channels?
 …
                  * Type 0x00d2: Maximum Occupancy?
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d2, 1))
+                if (aim_tlv_gettlv(innerlist, 0x00d2, 1))
+                        ;
 …
                  * Type 0x00d3: Exchange Description
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d3, 1))
+                if (aim_tlv_gettlv(innerlist, 0x00d3, 1))
                         exchanges[curexchange-1].name = aim_tlv_getstr(innerlist, 0x00d3, 1);
                 else
 …
                  * Type 0x00d4: Exchange Description URL
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d4, 1))
+                if (aim_tlv_gettlv(innerlist, 0x00d4, 1))
+                        ;
 …
                  * 1  Room creation allowed
                  * 2  Exchange creation allowed
+                 *
+                 *
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d5, 1)) {
 …
                 /*
                  * Type 0x00d6: Character Set (First Time)
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d6, 1))
+                 */
+                if (aim_tlv_gettlv(innerlist, 0x00d6, 1))
                         exchanges[curexchange-1].charset1 = aim_tlv_getstr(innerlist, 0x00d6, 1);
                 else
                         exchanges[curexchange-1].charset1 = NULL;
                 /*
                  * Type 0x00d7: Language (First Time)
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d7, 1))
+                 */
+                if (aim_tlv_gettlv(innerlist, 0x00d7, 1))
                         exchanges[curexchange-1].lang1 = aim_tlv_getstr(innerlist, 0x00d7, 1);
                 else
 …
                 /*
                  * Type 0x00d8: Character Set (Second Time)
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d8, 1))
+                 */
+                if (aim_tlv_gettlv(innerlist, 0x00d8, 1))
                         exchanges[curexchange-1].charset2 = aim_tlv_getstr(innerlist, 0x00d8, 1);
                 else
 …
                 /*
                  * Type 0x00d9: Language (Second Time)
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d9, 1))
+                 */
+                if (aim_tlv_gettlv(innerlist, 0x00d9, 1))
                         exchanges[curexchange-1].lang2 = aim_tlv_getstr(innerlist, 0x00d9, 1);
                 else
                         exchanges[curexchange-1].lang2 = NULL;
                 /*
                  * Type 0x00da: Unknown
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00da, 1))
+                if (aim_tlv_gettlv(innerlist, 0x00da, 1))
+                        ;
 …
  * Subtype 0x0009
+ *
  * Since multiple things can trigger this callback, we must lookup the
+ * Since multiple things can trigger this callback, we must lookup the
  * snacid to determine the original snac subtype that was called.
+ *
 …
  *    Nav Short Desc = 8
  *    Nav Instance Info = 16
  * And then everything is really asynchronous.  There is no specific
+ * And then everything is really asynchronous.  There is no specific
  * attachment of a response to a create room request, for example.  Creating
  * the room yields no different a response than requesting the room's info.

libfaim/conn.c

-                      rcf02dd6
+                      r7869e48
 #define FAIM_INTERNAL
 #define FAIM_NEED_CONN_INTERNAL
 #include <aim.h>
+#include <aim.h>
 #ifndef _WIN32
 …
  * In OSCAR, every connection has a set of SNAC groups associated
  * with it.  These are the groups that you can send over this connection
  * without being guarenteed a "Not supported" SNAC error.
+ *
  * The grand theory of things says that these associations transcend
+ * without being guarenteed a "Not supported" SNAC error.
+ *
+ * The grand theory of things says that these associations transcend
  * what libfaim calls "connection types" (conn->type).  You can probably
  * see the elegance here, but since I want to revel in it for a bit, you
+ * see the elegance here, but since I want to revel in it for a bit, you
  * get to hear it all spelled out.
+ *
 …
  * of your modules has just given you a SNAC of the group 0x0004 to send
  * you.  Maybe an IM destined for some twit in Greenland.  So you start
  * at the top of your connection list, looking for a connection that
+ * at the top of your connection list, looking for a connection that
  * claims to support group 0x0004.  You find one.  Why, that neat BOS
  * connection of yours can do that.  So you send it on its way.
 …
  * that connection.  One of the first things you get from this new server
  * is a message saying that indeed it does support the group you were looking
  * for.  So you continue and send rate confirmation and all that.
+ *
+ * for.  So you continue and send rate confirmation and all that.
+ *
  * Then you remember you had that SNAC to send, and now you have a means to
  * do it, and you do, and everyone is happy.  Except the Greenlander, who is
 …
  * to make libfaim work that way.  It would take a fair amount of effort,
  * and probably some client API changes as well.  (Whenever I don't want
  * to do something, I just say it would change the client API.  Then I
+ * to do something, I just say it would change the client API.  Then I
  * instantly have a couple of supporters of not doing it.)
+ *
 …
         aim_tx_cleanqueue(sess, *deadconn);
         if ((*deadconn)->fd != -1)
+        if ((*deadconn)->fd != -1)
                 aim_conn_close(*deadconn);
 …
         aim_conn_t *newconn;
         if (!(newconn = malloc(sizeof(aim_conn_t))))
+        if (!(newconn = malloc(sizeof(aim_conn_t))))
                 return NULL;
         memset(newconn, 0, sizeof(aim_conn_t));
 …
         aim_conn_t *cur, **prev;
         if (!deadconn || !*deadconn)
+        if (!deadconn || !*deadconn)
                 return;
 …
  * Close (but not free) a connection.
+ *
  * This leaves everything untouched except for clearing the
+ * This leaves everything untouched except for clearing the
  * handler list and setting the fd to -1 (used to recognize
  * dead connections).  It will also remove cookies if necessary.
 …
  * @type: Type of connection to look for
+ *
  * Searches for a connection of the specified type in the
+ * Searches for a connection of the specified type in the
  * specified session.  Returns the first connection of that
  * type found.
 …
         for (cur = sess->connlist; cur; cur = cur->next) {
                 if ((cur->type == type) &&
+                if ((cur->type == type) &&
                                 !(cur->status & AIM_CONN_STATUS_INPROGRESS))
                         break;
 …
 /**
  * aim_proxyconnect - An extrememly quick and dirty SOCKS5 interface.
+ * aim_proxyconnect - An extrememly quick and dirty SOCKS5 interface.
  * @sess: Session to connect
  * @host: Host to connect to
 …
                  * this function only gets called for some of that rendezvous
                  * crap, and not on SNAC connections, its probably okay for
                  * now.
+                 * now.
+                 *
                  */
 …
  * Opens a new connection to the specified dest host of specified
  * type, using the proxy settings if available.  If @host is %NULL,
  * the connection is allocated and returned, but no connection
+ * the connection is allocated and returned, but no connection
  * is made.
+ *
 …
+        }
         /*
          * As of 23 Jul 1999, AOL now sends the port number, preceded by a
          * colon, in the BOS redirect.  This fatally breaks all previous
+        /*
+         * As of 23 Jul 1999, AOL now sends the port number, preceded by a
+         * colon, in the BOS redirect.  This fatally breaks all previous
          * libfaims.  Bad, bad AOL.
+         *
          * We put this here to catch every case.
+         * We put this here to catch every case.
+         *
          */
 …
  * @sess: Session to search
+ *
  * Returns the highest valued filed descriptor of all open
+ * Returns the highest valued filed descriptor of all open
  * connections in @sess.
+ *
 …
  * Waits for a socket with data or for timeout, whichever comes first.
  * See select(2).
+ *
+ *
  * Return codes in *status:
  *   -1  error in select() (%NULL returned)
 …
  *    2  incoming data pending (connection with pending data returned)
+ *
  */
+ */
 faim_export aim_conn_t *aim_select(aim_session_t *sess, struct timeval *timeout, int *status)
+{
 …
+        }
         /*
+        /*
          * If we have data waiting to be sent, return
+         *
 …
                 *status = 1;
                 return NULL;
+        }
+        }
         if ((i = select(maxfd+1, &fds, &wfds, NULL, timeout))>=1) {
                 for (cur = sess->connlist; cur; cur = cur->next) {
                         if ((FD_ISSET(cur->fd, &fds)) ||
                                         ((cur->status & AIM_CONN_STATUS_INPROGRESS) &&
+                        if ((FD_ISSET(cur->fd, &fds)) ||
+                                        ((cur->status & AIM_CONN_STATUS_INPROGRESS) &&
                                         FD_ISSET(cur->fd, &wfds))) {
                                 *status = 2;
 …
+ *
  * This is my lame attempt at overcoming not understanding the rate
  * limiting.
+ * limiting.
+ *
  * XXX: This should really be replaced with something that scales and
 …
  * Call this with your SOCKS5 proxy server parameters before
  * the first call to aim_newconn().  If called with all %NULL
  * args, it will clear out a previously set proxy.
+ * args, it will clear out a previously set proxy.
+ *
  * Set username and password to %NULL if not applicable.
 …
         strncpy(sess->socksproxy.server, server, sizeof(sess->socksproxy.server));
         if (username && strlen(username))
+        if (username && strlen(username))
                 strncpy(sess->socksproxy.username, username, sizeof(sess->socksproxy.username));
         if (password && strlen(password))
 …
 /**
  * Initializes a session structure by setting the initial values
+ * Initializes a session structure by setting the initial values
  * stuff in the aim_session_t struct.
+ *
 …
         /*
          * This must always be set.  Default to the queue-based
          * version for back-compatibility.
+         * version for back-compatibility.
          */
         aim_tx_setenqueue(sess, AIM_TX_QUEUED, NULL);

libfaim/email.c

-                      rcf02dd6
+                      r7869e48
  * Family 0x0018 - Email notification
+ *
  * Used for being alerted when the email address(es) associated with
  * your screen name get new electronic-m.  For normal AIM accounts, you
  * get the email address screenname@netscape.net.  AOL accounts have
+ * Used for being alerted when the email address(es) associated with
+ * your screen name get new electronic-m.  For normal AIM accounts, you
+ * get the email address screenname@netscape.net.  AOL accounts have
  * screenname@aol.com, and can also activate a netscape.net account.
+ *
 …
  * Subtype 0x0007 - Receive information about your email account
+ *
  * So I don't even know if you can have multiple 16 byte keys,
+ * So I don't even know if you can have multiple 16 byte keys,
  * but this is coded so it will handle that, and handle it well.
  * This tells you if you have unread mail or not, the URL you
  * should use to access that mail, and the domain name for the
  * email account (screenname@domainname.com).  If this is the
  * first 0x0007 SNAC you've received since you signed on, or if
  * this is just a periodic status update, this will also contain
+ * This tells you if you have unread mail or not, the URL you
+ * should use to access that mail, and the domain name for the
+ * email account (screenname@domainname.com).  If this is the
+ * first 0x0007 SNAC you've received since you signed on, or if
+ * this is just a periodic status update, this will also contain
  * the number of unread emails that you have.
  */
 …
         alertitle = aim_tlv_getstr(tlvlist, 0x0005, 1);
         alerturl  = aim_tlv_getstr(tlvlist, 0x000d, 1);
         if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
                 ret = userfunc(sess, rx, new, havenewmail, alertitle, (alerturl ? alerturl + 2 : NULL));

libfaim/faimconfig.h

-                      r5e53c4a
+                      r7869e48
  * ICBMs and comparing them to incoming errors.  However,
  * its a helluvalot of overhead for something that should
  * rarely happen.
+ * rarely happen.
+ *
  * Default: defined.  This is now defined by default
  * because it should be stable and its not too bad.
+ * because it should be stable and its not too bad.
  * And Josh wanted it.
+ *
 …
 /*
  * Default Authorizer server name and TCP port for the OSCAR farm.
+ * Default Authorizer server name and TCP port for the OSCAR farm.
+ *
  * You shouldn't need to change this unless you're writing
  * your own server.
+ * your own server.
+ *
  * Note that only one server is needed to start the whole

libfaim/ft.c

-                      rfa8f439
+                      r7869e48
  * (ODC is also referred to as DirectIM and IM Image.)
+ *
  * There are a few static helper functions at the top, then
+ * There are a few static helper functions at the top, then
  * ODC stuff, then ft stuff.
+ *
  * I feel like this is a good place to explain OFT, so I'm going to
  * do just that.  Each OFT packet has a header type.  I guess this
  * is pretty similar to the subtype of a SNAC packet.  The type
  * basically tells the other client the meaning of the OFT packet.
  * There are two distinct types of file transfer, which I usually
  * call "sendfile" and "getfile."  Sendfile is when you send a file
  * to another AIM user.  Getfile is when you share a group of files,
+ * I feel like this is a good place to explain OFT, so I'm going to
+ * do just that.  Each OFT packet has a header type.  I guess this
+ * is pretty similar to the subtype of a SNAC packet.  The type
+ * basically tells the other client the meaning of the OFT packet.
+ * There are two distinct types of file transfer, which I usually
+ * call "sendfile" and "getfile."  Sendfile is when you send a file
+ * to another AIM user.  Getfile is when you share a group of files,
  * and other users request that you send them the files.
+ *
  * A typical sendfile file transfer goes like this:
  *   1) Sender sends a channel 2 ICBM telling the other user that
  *      we want to send them a file.  At the same time, we open a
  *      listener socket (this should be done before sending the
  *      ICBM) on some port, and wait for them to connect to us.
  *      The ICBM we sent should contain our IP address and the port
+ *   1) Sender sends a channel 2 ICBM telling the other user that
+ *      we want to send them a file.  At the same time, we open a
+ *      listener socket (this should be done before sending the
+ *      ICBM) on some port, and wait for them to connect to us.
+ *      The ICBM we sent should contain our IP address and the port
  *      number that we're listening on.
  *   2) The receiver connects to the sender on the given IP address
  *      and port.  After the connection is established, the receiver
+ *   2) The receiver connects to the sender on the given IP address
+ *      and port.  After the connection is established, the receiver
  *      sends an ICBM signifying that we are ready and waiting.
  *   3) The sender sends an OFT PROMPT message over the OFT
+ *   3) The sender sends an OFT PROMPT message over the OFT
  *      connection.
  *   4) The receiver of the file sends back an exact copy of this
  *      OFT packet, except the cookie is filled in with the cookie
  *      from the ICBM.  I think this might be an attempt to verify
  *      that the user that is connected is actually the guy that
+ *   4) The receiver of the file sends back an exact copy of this
+ *      OFT packet, except the cookie is filled in with the cookie
+ *      from the ICBM.  I think this might be an attempt to verify
+ *      that the user that is connected is actually the guy that
  *      we sent the ICBM to.  Oh, I've been calling this the ACK.
  *   5) The sender starts sending raw data across the connection
+ *   5) The sender starts sending raw data across the connection
  *      until the entire file has been sent.
  *   6) The receiver knows the file is finished because the sender
  *      sent the file size in an earlier OFT packet.  So then the
  *      receiver sends the DONE thingy (after filling in the
+ *   6) The receiver knows the file is finished because the sender
+ *      sent the file size in an earlier OFT packet.  So then the
+ *      receiver sends the DONE thingy (after filling in the
  *      "received" checksum and size) and closes the connection.
  */
 …
  * Calculate oft checksum of buffer
+ *
  * Prevcheck should be 0xFFFF0000 when starting a checksum of a file.  The
  * checksum is kind of a rolling checksum thing, so each time you get bytes
  * of a file you just call this puppy and it updates the checksum.  You can
  * calculate the checksum of an entire file by calling this in a while or a
+ * Prevcheck should be 0xFFFF0000 when starting a checksum of a file.  The
+ * checksum is kind of a rolling checksum thing, so each time you get bytes
+ * of a file you just call this puppy and it updates the checksum.  You can
+ * calculate the checksum of an entire file by calling this in a while or a
  * for loop, or something.
+ *
  * Thanks to Graham Booker for providing this improved checksum routine,
  * which is simpler and should be more accurate than Josh Myer's original
+ * Thanks to Graham Booker for providing this improved checksum routine,
+ * which is simpler and should be more accurate than Josh Myer's original
  * code. -- wtm
+ *
  * This algorithim works every time I have tried it.  The other fails
  * sometimes.  So, AOL who thought this up?  It has got to be the weirdest
+ * This algorithim works every time I have tried it.  The other fails
+ * sometimes.  So, AOL who thought this up?  It has got to be the weirdest
  * checksum I have ever seen.
+ *
 …
                 check -= val;
                 /*
                  * The following appears to be necessary.... It happens
+                 * The following appears to be necessary.... It happens
                  * every once in a while and the checksum doesn't fail.
                  */
 …
  * Create a listening socket on a given port.
+ *
  * XXX - Give the client author the responsibility of setting up a
  *       listener, then we no longer have a libfaim problem with broken
+ * XXX - Give the client author the responsibility of setting up a
+ *       listener, then we no longer have a libfaim problem with broken
  *       solaris *innocent smile* -- jbm
+ *
 …
                 perror("getaddrinfo");
                 return -1;
+        }
+        }
         ressave = res;
         do {
+        do {
                 listenfd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
                 if (listenfd < 0)
 …
  * @param sess The session.
  * @param conn The already-connected ODC connection.
  * @param typing If 0x0002, sends a "typing" message, 0x0001 sends "typed," and
+ * @param typing If 0x0002, sends a "typing" message, 0x0001 sends "typed," and
  *        0x0000 sends "stopped."
  * @return Return 0 if no errors, otherwise return the error number.
 …
  * Send client-to-client IM over an established direct connection.
  * Call this just like you would aim_send_im, to send a directim.
+ *
+ *
  * @param sess The session.
  * @param conn The already-connected ODC connection.
 …
         /* end of hdr2 */
 #if 0 /* XXX - this is how you send buddy icon info... */
+#if 0 /* XXX - this is how you send buddy icon info... */
         aimbs_put16(hdrbs, 0x0008);
         aimbs_put16(hdrbs, 0x000c);
 …
 /**
  * Get the screen name of the peer of a direct connection.
+ *
+ *
  * @param conn The ODC connection.
  * @return The screen name of the dude, or NULL if there was an anomaly.
 …
                 return NULL;
         if ((conn->type != AIM_CONN_TYPE_RENDEZVOUS) ||
+        if ((conn->type != AIM_CONN_TYPE_RENDEZVOUS) ||
                         (conn->subtype != AIM_CONN_SUBTYPE_OFT_DIRECTIM))
                 return NULL;
 …
  * @param sess The session.
  * @param sn The screen name of the buddy whose direct connection you want to find.
  * @return The conn for the direct connection with the given buddy, or NULL if no
+ * @return The conn for the direct connection with the given buddy, or NULL if no
  *         connection was found.
  */
 …
  * For those times when we want to open up the direct connection channel ourselves.
+ *
  * You'll want to set up some kind of watcher on this socket.
  * When the state changes, call aim_handlerendconnection with
  * the connection returned by this.  aim_handlerendconnection
+ * You'll want to set up some kind of watcher on this socket.
+ * When the state changes, call aim_handlerendconnection with
+ * the connection returned by this.  aim_handlerendconnection
  * will accept the pending connection and stop listening.
+ *
 …
  * This is a wrapper for aim_newconn.
+ *
  * If addr is NULL, the socket is not created, but the connection is
+ * If addr is NULL, the socket is not created, but the connection is
  * allocated and setup to connect.
+ *
 …
                         if (payloadlength - recvd >= 1024)
                                 i = aim_recv(conn->fd, &msg[recvd], 1024);
                         else
+                        else
                                 i = aim_recv(conn->fd, &msg[recvd], payloadlength - recvd);
                         if (i <= 0) {
 …
                                 ret = userfunc(sess, &fr, snptr, (double)recvd / payloadlength);
+                }
                 if ((userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINCOMING)))
                         ret = userfunc(sess, &fr, snptr, msg, payloadlength, encoding, isawaymsg);
 …
 /**
  * Remove the given oft_info struct from the oft_info linked list, and
+ * Remove the given oft_info struct from the oft_info linked list, and
  * then free its memory.
+ *
 …
  * Creates a listener socket so the other dude can connect to us.
+ *
  * You'll want to set up some kind of watcher on this socket.
  * When the state changes, call aim_handlerendconnection with
  * the connection returned by this.  aim_handlerendconnection
+ * You'll want to set up some kind of watcher on this socket.
+ * When the state changes, call aim_handlerendconnection with
+ * the connection returned by this.  aim_handlerendconnection
  * will accept the pending connection and stop listening.
+ *
  * @param sess The session.
  * @param oft_info File transfer information associated with this
+ * @param oft_info File transfer information associated with this
  *        connection.
  * @return Return 0 if no errors, otherwise return the error number.
 …
         return fh;
+}
+}
 /**
 …
  */
 static int aim_oft_buildheader(aim_bstream_t *bs, struct aim_fileheader_t *fh)
+{
+{
         fu8_t *hdr;
 …
  * @param sess The session.
  * @param type The subtype of the OFT packet we're sending.
  * @param oft_info The aim_oft_info struct with the connection and OFT
+ * @param oft_info The aim_oft_info struct with the connection and OFT
  *        info we're sending.
  * @return Return 0 if no errors, otherwise return the error number.
 …
 #if 0
         /*
          * If you are receiving a file, the cookie should be null, if you are sending a
          * file, the cookie should be the same as the one used in the ICBM negotiation
+         * If you are receiving a file, the cookie should be null, if you are sending a
+         * file, the cookie should be the same as the one used in the ICBM negotiation
          * SNACs.
          */
 …
 /**
  * Handle incoming data on a rendezvous connection.  This is analogous to the
  * consumesnac function in rxhandlers.c, and I really think this should probably
+ * Handle incoming data on a rendezvous connection.  This is analogous to the
+ * consumesnac function in rxhandlers.c, and I really think this should probably
  * be in rxhandlers.c as well, but I haven't finished cleaning everything up yet.
+ *
  * @param sess The session.
  * @param fr The frame allocated for the incoming data.
  * @return Return 0 if the packet was handled correctly, otherwise return the
+ * @return Return 0 if the packet was handled correctly, otherwise return the
  *         error number.
  */

libfaim/icq.c

-                      rcf02dd6
+                      r7869e48
+ *
  * @param sess The oscar session
  * @param passwd The new password.  If this is longer than 8 characters it
+ * @param passwd The new password.  If this is longer than 8 characters it
  *        will be truncated.
  * @return Return 0 if no errors, otherwise return the error number.
 …
 /*
  * Send an SMS message.  This is the non-US way.  The US-way is to IM
+ * Send an SMS message.  This is the non-US way.  The US-way is to IM
  * their cell phone number (+19195551234).
+ *
 …
  * </icq_sms_message>
+ *
  * Yeah hi Peter, whaaaat's happening.  If there's any way to use
+ * Yeah hi Peter, whaaaat's happening.  If there's any way to use
  * a codepage other than 1252 that would be great.  Thaaaanks.
  */

libfaim/im.c

-                      rcf02dd6
+                      r7869e48
  * is used for negotiating "rendezvous".  These transactions end in
  * something more complex happening, such as a chat invitation, or
  * a file transfer.  Channel 3 is used for chat messages (not in
  * the same family as these channels).  Channel 4 is used for
  * various ICQ messages.  Examples are normal messages, URLs, and
+ * a file transfer.  Channel 3 is used for chat messages (not in
+ * the same family as these channels).  Channel 4 is used for
+ * various ICQ messages.  Examples are normal messages, URLs, and
  * old-style authorization.
+ *
 …
  * use of this field.
+ *
  * TODO: Split this up into an im.c file an an icbm.c file.  It
+ * TODO: Split this up into an im.c file an an icbm.c file.  It
  *       will be beautiful, you'll see.
+ *
 …
 /**
  * Add a standard ICBM header to the given bstream with the given
+ * Add a standard ICBM header to the given bstream with the given
  * information.
+ *
 …
  * Heres the current collection:
  *  0501 0003 0101 0101 01              AOL Mobile Communicator, WinAIM 1.0.414
  *  0501 0003 0101 0201 01              WinAIM 2.0.847, 2.1.1187, 3.0.1464,
+ *  0501 0003 0101 0201 01              WinAIM 2.0.847, 2.1.1187, 3.0.1464,
  *                                      4.3.2229, 4.4.2286
  *  0501 0004 0101 0102 0101            WinAIM 4.1.2010, libfaim (right here)
 …
         } fingerprints[] = {
                 /* AOL Mobile Communicator, WinAIM 1.0.414 */
                 { AIM_CLIENTTYPE_MC,
+                { AIM_CLIENTTYPE_MC,
 , {0x01, 0x01, 0x01}},
                 /* WinAIM 2.0.847, 2.1.1187, 3.0.1464, 4.3.2229, 4.4.2286 */
                 { AIM_CLIENTTYPE_WINAIM,
+                { AIM_CLIENTTYPE_WINAIM,
 , {0x01, 0x01, 0x02}},
 …
+}
 /**
+/**
  * Subtype 0x0002 - Set ICBM parameters.
+ *
  * I definitly recommend sending this.  If you don't, you'll be stuck
  * with the rather unreasonable defaults.
+ *
+ *
  */
 faim_export int aim_im_setparams(aim_session_t *sess, struct aim_icbmparameters *params)
 …
         /* These are all read-write */
         aimbs_put32(&fr->data, params->flags);
+        aimbs_put32(&fr->data, params->flags);
         aimbs_put16(&fr->data, params->maxmsglen);
         aimbs_put16(&fr->data, params->maxsenderwarn);
         aimbs_put16(&fr->data, params->maxrecverwarn);
+        aimbs_put16(&fr->data, params->maxsenderwarn);
+        aimbs_put16(&fr->data, params->maxrecverwarn);
         aimbs_put32(&fr->data, params->minmsginterval);
 …
         params.maxrecverwarn = aimbs_get16(bs);
         params.minmsginterval = aimbs_get32(bs);
         if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
                 return userfunc(sess, rx, &params);
 …
 /**
  * Subtype 0x0006 - Send an ICBM (instant message).
+ * Subtype 0x0006 - Send an ICBM (instant message).
+ *
+ *
 …
  *                        what you're doing.
  *   AIM_IMFLAGS_ISO_8859_1 -- The message contains the ASCII8 subset
  *                        known as ISO-8859-1.
+ *                        known as ISO-8859-1.
+ *
  * Generally, you should use the lowest encoding possible to send
  * your message.  If you only use basic punctuation and the generic
  * Latin alphabet, use ASCII7 (no flags).  If you happen to use non-ASCII7
  * characters, but they are all clearly defined in ISO-8859-1, then
+ * characters, but they are all clearly defined in ISO-8859-1, then
  * use that.  Keep in mind that not all characters in the PC ASCII8
  * character set are defined in the ISO standard. For those cases (most
 …
  * of the clients I use can parse those messages (and besides that,
  * wchars are difficult and non-portable to handle in most UNIX environments).
  * If you really need to include special characters, use the HTML UNICODE
  * entities.  These are of the form &#2026; where 2026 is the hex
  * representation of the UNICODE index (in this case, UNICODE
+ * If you really need to include special characters, use the HTML UNICODE
+ * entities.  These are of the form &#2026; where 2026 is the hex
+ * representation of the UNICODE index (in this case, UNICODE
  * "Horizontal Ellipsis", or 133 in in ASCII8).
+ *
 …
  * in all of libfaim, it is written with performance in mind.  As such,
  * it is not as clear as it could be in respect to how this message is
  * supposed to be layed out. Most obviously, tlvlists should be used
  * instead of writing out the bytes manually.
+ * supposed to be layed out. Most obviously, tlvlists should be used
+ * instead of writing out the bytes manually.
+ *
  * XXX - more precise verification that we never send SNACs larger than 8192
 …
                 return -ENOMEM;
         /* XXX - should be optional */
+        /* XXX - should be optional */
         snacid = aim_cachesnac(sess, 0x0004, 0x0006, 0x0000, args->destsn, strlen(args->destsn)+1);
         aim_putsnac(&fr->data, 0x0004, 0x0006, 0x0000, snacid);
         /*
+        /*
          * Generate a random message cookie
+         *
          * We could cache these like we do SNAC IDs.  (In fact, it
          * might be a good idea.)  In the message error functions,
          * the 8byte message cookie is returned as well as the
+         * We could cache these like we do SNAC IDs.  (In fact, it
+         * might be a good idea.)  In the message error functions,
+         * the 8byte message cookie is returned as well as the
          * SNAC ID.
+         *
 …
         /*
          * Set the I HAVE A REALLY PURTY ICON flag.
          * XXX - This should really only be sent on initial
+         * XXX - This should really only be sent on initial
          * IMs and when you change your icon.
          */
 …
 /*
  * Simple wrapper for aim_im_sendch1_ext()
+ * Simple wrapper for aim_im_sendch1_ext()
+ *
  * You cannot use aim_send_im if you need the HASICON flag.  You must
 …
  * You'd think this would be in icq.c, but, well, I'm trying to stick with
  * the one-group-per-file scheme as much as possible.  This could easily
  * be an exception, since Rendezvous IMs are external of the Oscar core,
+ * be an exception, since Rendezvous IMs are external of the Oscar core,
  * and therefore are undefined.  Really I just need to think of a good way to
  * make an interface similar to what AOL actually uses.  But I'm not using COM.
 …
         aim_putsnac(&fr->data, 0x0004, 0x0006, 0x0000, snacid);
         /*
          * Generate a random message cookie
+         *
          * This cookie needs to be alphanumeric and NULL-terminated to be
+        /*
+         * Generate a random message cookie
+         *
+         * This cookie needs to be alphanumeric and NULL-terminated to be
          * TOC-compatible.
+         *
 …
         aim_tlvlist_add_16(&itl, 0x0005, port);
         aim_tlvlist_add_noval(&itl, 0x000f);
         aim_tlvlist_write(&hdrbs, &itl);
 …
  * @param sess The oscar session.
  * @param sn The UIN of the user of whom you wish to request info.
  * @param type The type of info you wish to request.  This should be the current
+ * @param type The type of info you wish to request.  This should be the current
  *        state of the user, as one of the AIM_ICQ_STATE_* defines.
  * @return Return 0 if no errors, otherwise return the error number.
 …
  * Subtype 0x0006 - Send an ICQ-esque ICBM.
+ *
  * This can be used to send an ICQ authorization reply (deny or grant).  It is the "old way."
  * The new way is to use SSI.  I like the new way a lot better.  This seems like such a hack,
  * mostly because it's in network byte order.  Figuring this stuff out sometimes takes a while,
  * but thats ok, because it gives me time to try to figure out what kind of drugs the AOL people
+ * This can be used to send an ICQ authorization reply (deny or grant).  It is the "old way."
+ * The new way is to use SSI.  I like the new way a lot better.  This seems like such a hack,
+ * mostly because it's in network byte order.  Figuring this stuff out sometimes takes a while,
+ * but thats ok, because it gives me time to try to figure out what kind of drugs the AOL people
  * were taking when they merged the two protocols.
+ *
 …
+ *
  * Not only do AIM ICBM's support multiple channels.  Not only do they
  * support multiple character sets.  But they support multiple character
+ * support multiple character sets.  But they support multiple character
  * sets / encodings within the same ICBM.
+ *
 …
  * seem utterly unnecessary by today's standards.  In fact, there is only
  * one client still in popular use that still uses this method: AOL for the
  * Macintosh, Version 5.0.  Obscure, yes, I know.
+ * Macintosh, Version 5.0.  Obscure, yes, I know.
+ *
  * In modern (non-"legacy") clients, if the user tries to send a character
 …
  * Multipart messages prevent this wasted space by allowing the client to
  * only send the characters in UNICODE that need to be sent that way, and
  * the rest of the message can be sent in whatever the native character
+ * the rest of the message can be sent in whatever the native character
  * set is (probably ASCII).
+ *
 …
 static int mpmsg_addsection(aim_session_t *sess, aim_mpmsg_t *mpm, fu16_t charset, fu16_t charsubset, fu8_t *data, fu16_t datalen)
+{
         aim_mpmsg_section_t *sec;
+        aim_mpmsg_section_t *sec;
         if (!(sec = malloc(sizeof(aim_mpmsg_section_t))))
                 return -1;
 …
         fu8_t *dup;
         if (!(dup = strdup(ascii)))
+        if (!(dup = strdup(ascii)))
                 return -1;
 …
                 return -1;
+        }
         return 0;
+}
 …
         for (cur = mpm->parts; cur; ) {
                 aim_mpmsg_section_t *tmp;
                 tmp = cur->next;
                 free(cur->data);
 …
                 cur = tmp;
+        }
         mpm->numparts = 0;
         mpm->parts = NULL;
 …
 /*
  * Start by building the multipart structures, then pick the first
+ * Start by building the multipart structures, then pick the first
  * human-readable section and stuff it into args->msg so no one gets
  * suspicious.
 …
                          * You really shouldn't advertise a zero-length icon
                          * anyway.
+                         *
+                         *
                          */
                         if (args.iconlen)
 …
 /*
  * The relationship between AIM_CAPS_ICQSERVERRELAY and AIM_CAPS_ICQRTF is
+ * The relationship between AIM_CAPS_ICQSERVERRELAY and AIM_CAPS_ICQRTF is
  * kind of odd. This sends the client ICQRTF since that is all that I've seen
  * SERVERRELAY used for.
 …
         msgtype = aimbs_getle16(servdata);
         anslen = aimbs_getle32(servdata);
         aim_bstream_advance(servdata, anslen);
 …
         args->destructor = (void *)incomingim_ch2_sendfile_free;
         /* Maybe there is a better way to tell what kind of sendfile
+        /* Maybe there is a better way to tell what kind of sendfile
          * this is?  Maybe TLV t(000a)? */
         if (servdata) { /* Someone is sending us a file */
 …
                 /*
                  * I hope to God I'm right when I guess that there is a
                  * 32 char max filename length for single files.  I think
                  * OFT tends to do that.  Gotta love inconsistency.  I saw
+                 * I hope to God I'm right when I guess that there is a
+                 * 32 char max filename length for single files.  I think
+                 * OFT tends to do that.  Gotta love inconsistency.  I saw
                  * a 26 byte filename?
                  */
                 /* AAA - create an aimbs_getnullstr function (don't anymore)(maybe) */
                 /* Use an inelegant way of getting the null-terminated filename,
+                /* Use an inelegant way of getting the null-terminated filename,
                  * since there's no easy bstream routine. */
                 for (flen = 0; aimbs_get8(servdata); flen++);
 …
                 args->info.sendfile.filename = aimbs_getstr(servdata, flen);
                 /* There is sometimes more after the null-terminated filename,
+                /* There is sometimes more after the null-terminated filename,
                  * but I'm unsure of its format. */
                 /* I don't believe him. */
 …
         /*
          * There's another block of TLVs embedded in the type 5 here.
+         * There's another block of TLVs embedded in the type 5 here.
          */
         block1 = aim_tlv_gettlv(tlvlist, 0x0005, 1);
 …
+         *
          * 0 is a request, 1 is a cancel, 2 is an accept
          */
+         */
         args.status = aimbs_get16(&bbs);
 …
          */
         cookie2 = aimbs_getraw(&bbs, 8);
         if (memcmp(cookie, cookie2, 8) != 0)
+        if (memcmp(cookie, cookie2, 8) != 0)
                 faimdprintf(sess, 0, "rend: warning cookies don't match!\n");
         memcpy(args.cookie, cookie2, 8);
 …
         args.reqclass = aim_locate_getcaps(sess, &bbs, 0x10);
         /*
+        /*
          * What follows may be TLVs or nothing, depending on the
          * purpose of the message.
 …
         if (aim_tlv_gettlv(list2, 0x000d, 1))
                 args.encoding = aim_tlv_getstr(list2, 0x000d, 1);
         /*
          * Language.
 …
          * Channel ID.
+         *
          * Channel 0x0001 is the message channel.  It is
+         * Channel 0x0001 is the message channel.  It is
          * used to send basic ICBMs.
+         *
 …
          * Channel 0x0003 is used for chat messages.
+         *
          * Channel 0x0004 is used for ICQ authorization, or
+         * Channel 0x0004 is used for ICQ authorization, or
          * possibly any system notice.
+         *
 …
          * userinfo block contains the number of TLVs that contain user
          * information, the rest are not even though there is no seperation.
          * You can start reading the message TLVs after aim_info_extract()
+         * You can start reading the message TLVs after aim_info_extract()
          * parses out the standard userinfo block.
+         *
 …
          * userinfo block and the rest of the message, however there should
          * never be two TLVs of the same type in one block.
+         *
+         *
          */
         aim_info_extract(sess, bs, &userinfo);
 …
                 /*
                  * Read block of TLVs (not including the userinfo data).  All
+                 * Read block of TLVs (not including the userinfo data).  All
                  * further data is derived from what is parsed here.
                  */
 …
 /*
  * Subtype 0x0008 - Send a warning to sn.
+ *
+ *
  * Flags:
  *  AIM_WARN_ANON  Send as an anonymous (doesn't count as much)
+ *
  * returns -1 on error (couldn't alloc packet), 0 on success.
+ * returns -1 on error (couldn't alloc packet), 0 on success.
+ *
  */
 …
         aim_putsnac(&fr->data, 0x0004, 0x0008, 0x0000, snacid);
         aimbs_put16(&fr->data, (flags & AIM_WARN_ANON) ? 0x0001 : 0x0000);
+        aimbs_put16(&fr->data, (flags & AIM_WARN_ANON) ? 0x0001 : 0x0000);
         aimbs_put8(&fr->data, strlen(sn));
         aimbs_putraw(&fr->data, sn, strlen(sn));
 …
         aim_userinfo_t userinfo;
         while (aim_bstream_empty(bs)) {
+        while (aim_bstream_empty(bs)) {
                 channel = aimbs_get16(bs);
 …
  *    AIM_TRANSFER_DENY_DECLINE -- "client has declined transfer"
  *    AIM_TRANSFER_DENY_NOTACCEPTING -- "client is not accepting transfers"
+ *
+ *
  */
 faim_export int aim_im_denytransfer(aim_session_t *sess, const char *sender, const char *cookie, fu16_t code)
 …
         aim_snacid_t snacid;
         aim_tlvlist_t *tl = NULL;
         if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0004)))
                 return -EINVAL;
 …
         snacid = aim_cachesnac(sess, 0x0004, 0x000b, 0x0000, NULL, 0);
         aim_putsnac(&fr->data, 0x0004, 0x000b, 0x0000, snacid);
         aimbs_putraw(&fr->data, cookie, 8);
 …
  * Subtype 0x000c - Receive an ack after sending an ICBM.
+ *
  * You have to have send the message with the AIM_IMFLAGS_ACK flag set
  * (TLV t(0003)).  The ack contains the ICBM header of the message you
+ * You have to have send the message with the AIM_IMFLAGS_ACK flag set
+ * (TLV t(0003)).  The ack contains the ICBM header of the message you
  * sent.
+ *
 …
  * Subtype 0x0014 - Send a mini typing notification (mtn) packet.
+ *
  * This is supported by winaim5 and newer, MacAIM bleh and newer, iChat bleh and newer,
+ * This is supported by winaim5 and newer, MacAIM bleh and newer, iChat bleh and newer,
  * and Gaim 0.60 and newer.
+ *
 …
  * Subtype 0x0014 - Receive a mini typing notification (mtn) packet.
+ *
  * This is supported by winaim5 and newer, MacAIM bleh and newer, iChat bleh and newer,
+ * This is supported by winaim5 and newer, MacAIM bleh and newer, iChat bleh and newer,
  * and Gaim 0.60 and newer.
+ *

libfaim/locate.c

-                      r6e3980e
+                      r7869e48
+ *
  * The functions here are responsible for requesting and parsing information-
  * gathering SNACs.  Or something like that.  This family contains the SNACs
+ * gathering SNACs.  Or something like that.  This family contains the SNACs
  * for getting and setting info, away messages, directory profile thingy, etc.
  */
 …
 /*
  * Capability blocks.
+ * Capability blocks.
+ *
  * These are CLSIDs. They should actually be of the form:
 …
          */
         {AIM_CAPS_ICHAT,
          {0x09, 0x46, 0x00, 0x00, 0x4c, 0x7f, 0x11, 0xd1,
+         {0x09, 0x46, 0x00, 0x00, 0x4c, 0x7f, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
         {AIM_CAPS_SECUREIM,
          {0x09, 0x46, 0x00, 0x01, 0x4c, 0x7f, 0x11, 0xd1,
+         {0x09, 0x46, 0x00, 0x01, 0x4c, 0x7f, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
         {AIM_CAPS_VIDEO,
          {0x09, 0x46, 0x01, 0x00, 0x4c, 0x7f, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
         /*
          * Not really sure about this one.  In an email from
          * 26 Sep 2003, Matthew Sachs suggested that, "this
+         {0x09, 0x46, 0x01, 0x00, 0x4c, 0x7f, 0x11, 0xd1,
+x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
+        /*
+         * Not really sure about this one.  In an email from
+         * 26 Sep 2003, Matthew Sachs suggested that, "this
          * is probably the capability for the SMS features."
          */
         {AIM_CAPS_SMS,
          {0x09, 0x46, 0x01, 0xff, 0x4c, 0x7f, 0x11, 0xd1,
+         {0x09, 0x46, 0x01, 0xff, 0x4c, 0x7f, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
         {AIM_CAPS_GENERICUNKNOWN,
          {0x09, 0x46, 0xf0, 0x03, 0x4c, 0x7f, 0x11, 0xd1,
+         {0x09, 0x46, 0xf0, 0x03, 0x4c, 0x7f, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
         {AIM_CAPS_GENERICUNKNOWN,
          {0x09, 0x46, 0xf0, 0x04, 0x4c, 0x7f, 0x11, 0xd1,
+         {0x09, 0x46, 0xf0, 0x04, 0x4c, 0x7f, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
         {AIM_CAPS_GENERICUNKNOWN,
          {0x09, 0x46, 0xf0, 0x05, 0x4c, 0x7f, 0x11, 0xd1,
+         {0x09, 0x46, 0xf0, 0x05, 0x4c, 0x7f, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
         {AIM_CAPS_HIPTOP,
          {0x09, 0x46, 0x13, 0x23, 0x4c, 0x7f, 0x11, 0xd1,
+         {0x09, 0x46, 0x13, 0x23, 0x4c, 0x7f, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
         {AIM_CAPS_VOICE,
          {0x09, 0x46, 0x13, 0x41, 0x4c, 0x7f, 0x11, 0xd1,
+         {0x09, 0x46, 0x13, 0x41, 0x4c, 0x7f, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
         {AIM_CAPS_SENDFILE,
          {0x09, 0x46, 0x13, 0x43, 0x4c, 0x7f, 0x11, 0xd1,
+         {0x09, 0x46, 0x13, 0x43, 0x4c, 0x7f, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
         {AIM_CAPS_ICQ_DIRECT,
          {0x09, 0x46, 0x13, 0x44, 0x4c, 0x7f, 0x11, 0xd1,
+         {0x09, 0x46, 0x13, 0x44, 0x4c, 0x7f, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
         {AIM_CAPS_DIRECTIM,
          {0x09, 0x46, 0x13, 0x45, 0x4c, 0x7f, 0x11, 0xd1,
+         {0x09, 0x46, 0x13, 0x45, 0x4c, 0x7f, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
         {AIM_CAPS_BUDDYICON,
          {0x09, 0x46, 0x13, 0x46, 0x4c, 0x7f, 0x11, 0xd1,
+         {0x09, 0x46, 0x13, 0x46, 0x4c, 0x7f, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 …
         /*
          * Indeed, there are two of these.  The former appears to be correct,
          * but in some versions of winaim, the second one is set.  Either they
          * forgot to fix endianness, or they made a typo. It really doesn't
+         * Indeed, there are two of these.  The former appears to be correct,
+         * but in some versions of winaim, the second one is set.  Either they
+         * forgot to fix endianness, or they made a typo. It really doesn't
          * matter which.
          */
 …
         /*
          * Setting this lets AIM users receive messages from ICQ users, and ICQ
          * users receive messages from AIM users.  It also lets ICQ users show
          * up in buddy lists for AIM users, and AIM users show up in buddy lists
          * for ICQ users.  And ICQ privacy/invisibility acts like AIM privacy,
          * in that if you add a user to your deny list, you will not be able to
          * see them as online (previous you could still see them, but they
+         * Setting this lets AIM users receive messages from ICQ users, and ICQ
+         * users receive messages from AIM users.  It also lets ICQ users show
+         * up in buddy lists for AIM users, and AIM users show up in buddy lists
+         * for ICQ users.  And ICQ privacy/invisibility acts like AIM privacy,
+         * in that if you add a user to your deny list, you will not be able to
+         * see them as online (previous you could still see them, but they
          * couldn't see you.
          */
 …
          */
         {AIM_CAPS_CHAT,
          {0x74, 0x8f, 0x24, 0x20, 0x62, 0x87, 0x11, 0xd1,
+         {0x74, 0x8f, 0x24, 0x20, 0x62, 0x87, 0x11, 0xd1,
 x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 …
         /* This is added by the servers and it only shows up for ourselves... */
         {AIM_CAPS_GENERICUNKNOWN,
          {0x97, 0xb1, 0x27, 0x51, 0x24, 0x3c, 0x43, 0x34,
+         {0x97, 0xb1, 0x27, 0x51, 0x24, 0x3c, 0x43, 0x34,
 xad, 0x22, 0xd6, 0xab, 0xf7, 0x3f, 0x14, 0x09}},
         {AIM_CAPS_APINFO,
+        {AIM_CAPS_APINFO,
          {0xaa, 0x4a, 0x32, 0xb5, 0xf8, 0x84, 0x48, 0xc6,
 xa3, 0xd7, 0x8c, 0x50, 0x97, 0x19, 0xfd, 0x5b}},
 …
 /*
  * Add the userinfo to our linked list.  If we already have userinfo
+ * Add the userinfo to our linked list.  If we already have userinfo
  * for this buddy, then just overwrite parts of the old data.
  * @param userinfo Contains the new information for the buddy.
 …
 /**
  * Remove this screen name from our queue.  If this info was resquested
+ * Remove this screen name from our queue.  If this info was resquested
  * by our info request queue, then pop the next element off of the queue.
+ *
  * @param sess The aim session.
  * @param sn Screen name of the info we just received.
  * @return True if the request was explicit (client requested the info),
+ * @return True if the request was explicit (client requested the info),
  *         false if the request was implicit (libfaim request the info).
  */
 …
 /*
  * AIM is fairly regular about providing user info.  This is a generic
+ * AIM is fairly regular about providing user info.  This is a generic
  * routine to extract it in its standard form.
  */
 …
         /*
          * Screen name.  Stored as an unterminated string prepended with a
+         * Screen name.  Stored as an unterminated string prepended with a
          * byte containing its length.
          */
 …
         /*
          * TLV Count. Unsigned short representing the number of
+         * TLV Count. Unsigned short representing the number of
          * Type-Length-Value triples that follow.
          */
         tlvcnt = aimbs_get16(bs);
         /*
+        /*
          * Parse out the Type-Length-Value triples as they're found.
          */
 …
                         /*
                          * Type = 0x0001: User flags
+                         *
+                         *
                          * Specified as any of the following ORed together:
                          *      0x0001  Trial (user less than 60days)
 …
                          *      0x0004  AOL Main Service user
                          *      0x0008  Unknown bit 4
                          *      0x0010  Free (AIM) user
+                         *      0x0010  Free (AIM) user
                          *      0x0020  Away
                          *      0x0400  ActiveBuddy
 …
                 } else if (type == 0x0002) {
                         /*
                          * Type = 0x0002: Account creation time.
+                         * Type = 0x0002: Account creation time.
+                         *
                          * The time/date that the user originally registered for
 …
                          * Type = 0x0003: On-Since date.
+                         *
                          * The time/date that the user started their current
+                         * The time/date that the user started their current
                          * session, stored in time_t format.
                          */
 …
                          * Type = 0x0004: Idle time.
+                         *
                          * Number of minutes since the user actively used the
+                         * Number of minutes since the user actively used the
                          * service.
+                         *
                          * Note that the client tells the server when to start
                          * counting idle times, so this may or may not be
+                         * counting idle times, so this may or may not be
                          * related to reality.
                          */
 …
                 } else if (type == 0x0005) {
                         /*
                          * Type = 0x0005: Member since date.
+                         * Type = 0x0005: Member since date.
+                         *
                          * The time/date that the user originally registered for
 …
                          * Type = 0x0006: ICQ Online Status
+                         *
                          * ICQ's Away/DND/etc "enriched" status. Some decoding
+                         * ICQ's Away/DND/etc "enriched" status. Some decoding
                          * of values done by Scott <darkagl@pcnet.com>
                          */
 …
                 } else if (type == 0x000c) {
                         /*
+                        /*
                          * Type = 0x000c
+                         *
 …
                          * Format is:
                          * 4 bytes - Our IP address, 0xc0 a8 01 2b for 192.168.1.43
+                         *
+                         *
+                         *
                          */
 …
                          * Type = 0x0010: Session Length. (AOL)
+                         *
                          * The duration, in seconds, of the user's current
+                         * The duration, in seconds, of the user's current
                          * session.
+                         *
 …
                          * Type = 0x0019
+                         *
                          * OSCAR short capability information.  A shortened
+                         * OSCAR short capability information.  A shortened
                          * form of the normal capabilities.
                          */
 …
                          * Type = 0x001a
+                         *
                          * AOL short capability information.  A shortened
+                         * AOL short capability information.  A shortened
                          * form of the normal capabilities.
                          */
 …
                          * Buddy icon information and available messages.
+                         *
                          * This almost seems like the AIM protocol guys gave
                          * the iChat guys a Type, and the iChat guys tried to
                          * cram as much cool shit into it as possible.  Then
                          * the Windows AIM guys were like, "hey, that's
+                         * This almost seems like the AIM protocol guys gave
+                         * the iChat guys a Type, and the iChat guys tried to
+                         * cram as much cool shit into it as possible.  Then
+                         * the Windows AIM guys were like, "hey, that's
                          * pretty neat, let's copy those prawns."
+                         *
                          * In that spirit, this can contain a custom message,
                          * kind of like an away message, but you're not away
                          * (it's called an "available" message).  Or it can
                          * contain information about the buddy icon the user
+                         * In that spirit, this can contain a custom message,
+                         * kind of like an away message, but you're not away
+                         * (it's called an "available" message).  Or it can
+                         * contain information about the buddy icon the user
                          * has stored on the server.
                          */
 …
                         /*
                          * Reaching here indicates that either AOL has
                          * added yet another TLV for us to deal with,
+                         * added yet another TLV for us to deal with,
                          * or the parsing has gone Terribly Wrong.
+                         *
 …
         if (info->present & AIM_USERINFO_PRESENT_CAPABILITIES)
                 aim_tlvlist_add_caps(&tlvlist, 0x000d, info->capabilities);
         if (info->present & AIM_USERINFO_PRESENT_SESSIONLEN)
                 aim_tlvlist_add_32(&tlvlist, (fu16_t)((info->flags & AIM_FLAG_AOL) ? 0x0010 : 0x000f), info->sessionlen);
 …
         /*
          * Remove this screen name from our queue.  If the client requested
          * this buddy's info explicitly, then notify them that we do not have
+         * Remove this screen name from our queue.  If the client requested
+         * this buddy's info explicitly, then notify them that we do not have
          * info for this buddy.
          */
 …
  * away are set, respectively, and their value may or may not be
  * restricted to a few choices.  I am currently aware of:
+ *
+ *
  * us-ascii             Just that
  * unicode-2-0          UCS2-BE
+ *
+ *
  * profile_len and awaymsg_len MUST be set similarly, and they MUST
  * be the length of their respective strings in bytes.
 …
  * message, set awaymsg non-NULL and awaymsg_len to 0 (this is the
  * obvious equivalent).
+ *
+ *
  */
 faim_export int aim_locate_setprofile(aim_session_t *sess,
 …
         snacid = aim_cachesnac(sess, 0x0002, 0x0005, 0x0000, NULL, 0);
         aim_putsnac(&fr->data, 0x0002, 0x0005, 0x0000, snacid);
         aimbs_put16(&fr->data, infotype);
 …
         /*
          * Remove this screen name from our queue.  If the client requested
          * this buddy's info explicitly, then notify them that we have info
+         * Remove this screen name from our queue.  If the client requested
+         * this buddy's info explicitly, then notify them that we have info
          * for this buddy.
          */
 …
+}
 /*
+/*
  * Subtype 0x0009 - Set directory profile data.
+ *
 …
+ *
  */
 faim_export int aim_locate_setdirinfo(aim_session_t *sess, const char *first, const char *middle, const char *last, const char *maiden, const char *nickname, const char *street, const char *city, const char *state, const char *zip, int country, fu16_t privacy)
+faim_export int aim_locate_setdirinfo(aim_session_t *sess, const char *first, const char *middle, const char *last, const char *maiden, const char *nickname, const char *street, const char *city, const char *state, const char *zip, int country, fu16_t privacy)
+{
         aim_conn_t *conn;
 …
         snacid = aim_cachesnac(sess, 0x0002, 0x000b, 0x0000, NULL, 0);
         aim_putsnac(&fr->data, 0x0002, 0x000b, 0x0000, snacid);
         aimbs_put8(&fr->data, strlen(sn));
 …
 /*
  * Subtype 0x000f
+ *
+ *
  * XXX pass these in better
+ *
 …
 /*
  * Subtype 0x0015 - Request the info a user using the short method.  This is
+ * Subtype 0x0015 - Request the info a user using the short method.  This is
  * what iChat uses.  It normally is VERY leniently rate limited.
+ *

libfaim/md5.h

r5e53c4a	r7869e48
62	62
63	63	#ifdef __cplusplus
64		extern "C"
	64	extern "C"
65	65	{
66	66	#endif

libfaim/misc.c

-                      rcf02dd6
+                      r7869e48
  * misc.c
+ *
  * Random stuff.  Basically just a few functions for sending
+ * Random stuff.  Basically just a few functions for sending
  * simple SNACs, and then the generic error handler.
+ *
 …
 #define FAIM_INTERNAL
 #include <aim.h>
+#include <aim.h>
 /*
 …
         if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+4)))
                 return -ENOMEM;
+                return -ENOMEM;
         snacid = aim_cachesnac(sess, family, subtype, 0x0000, NULL, 0);
 …
         if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+2)))
                 return -ENOMEM;
+                return -ENOMEM;
         snacid = aim_cachesnac(sess, family, subtype, 0x0000, NULL, 0);

libfaim/msgcookie.c

-                      re374dee
+                      r7869e48
  * Cookie Caching stuff. Adam wrote this, apparently just some
  * derivatives of n's SNAC work. I cleaned it up, added comments.
+ *
+ *
  */
 …
  * returns -1 on error, 0 on append, 1 on update.  the cookie you pass
  * in may be free'd, so don't count on its value after calling this!
+ *
+ *
  */
 faim_internal int aim_cachecookie(aim_session_t *sess, aim_msgcookie_t *cookie)
 …
         newcook = aim_checkcookie(sess, cookie->cookie, cookie->type);
         if (newcook == cookie) {
                 newcook->addtime = time(NULL);
 …
                 aim_cookie_free(sess, newcook);
         cookie->addtime = time(NULL);
+        cookie->addtime = time(NULL);
         cookie->next = sess->msgcookies;
 …
         for (prev = &sess->msgcookies; (cur = *prev); ) {
                 if ((cur->type == type) &&
+                if ((cur->type == type) &&
                                 (memcmp(cur->cookie, cookie, 8) == 0)) {
                         *prev = cur->next;
 …
+ *
  */
 faim_internal aim_msgcookie_t *aim_mkcookie(fu8_t *c, int type, void *data)
+faim_internal aim_msgcookie_t *aim_mkcookie(fu8_t *c, int type, void *data)
+{
         aim_msgcookie_t *cookie;
 …
         for (cur = sess->msgcookies; cur; cur = cur->next) {
                 if ((cur->type == type) &&
+                if ((cur->type == type) &&
                                 (memcmp(cur->cookie, cookie, 8) == 0))
                         return cur;
+                        return cur;
+        }
 …
 #if 0 /* debugging feature */
 faim_internal int aim_dumpcookie(aim_session_t *sess, aim_msgcookie_t *cookie)
+faim_internal int aim_dumpcookie(aim_session_t *sess, aim_msgcookie_t *cookie)
+{
 …
                 return -EINVAL;
         faimdprintf(sess, 0, "\tCookie at %p: %d/%s with %p, next %p\n", cookie,
+        faimdprintf(sess, 0, "\tCookie at %p: %d/%s with %p, next %p\n", cookie,
                         cookie->type, cookie->cookie, cookie->data, cookie->next);
 …
+ *
  */
 faim_internal int aim_cookie_free(aim_session_t *sess, aim_msgcookie_t *cookie)
+faim_internal int aim_cookie_free(aim_session_t *sess, aim_msgcookie_t *cookie)
+{
         aim_msgcookie_t *cur, **prev;
 …
         return 0;
+}
+}
 /* XXX I hate switch */
 faim_internal int aim_msgcookie_gettype(int reqclass)
+faim_internal int aim_msgcookie_gettype(int reqclass)
+{
         /* XXX: hokey-assed. needs fixed. */
 …
         case AIM_CAPS_SENDFILE: return AIM_COOKIETYPE_OFTSEND;
         default: return AIM_COOKIETYPE_UNKNOWN;
+        }
+        }
+}

libfaim/odir.c

rcf02dd6	r7869e48
2	2	* Family 0x000f - Newer Search Method
3	3	*
4		* Used for searching for other AIM users by email address, name,
	4	* Used for searching for other AIM users by email address, name,
5	5	* location, commmon interests, and a few other similar things.
6	6	*
…	…
52	52	* Subtype 0x0002 - Submit a User Search Request
53	53	*
54		* Search for an AIM screen name based on various info
	54	* Search for an AIM screen name based on various info
55	55	* about the person.
56	56	*

libfaim/oscar.c

-                      rcf02dd6
+                      r7869e48
         char *oldp;
         char *newp;
         GSList *oscar_chats;
         GSList *direct_ims;
 …
 /*
  * Various PRPL-specific buddy info that we want to keep track of
  * Some other info is maintained by locate.c, and I'd like to move
+ * Some other info is maintained by locate.c, and I'd like to move
  * the rest of this to libfaim, mostly im.c
  */
 …
         fu32_t encodingflag = 0;
         /* Determine how we can send this message.  Per the warnings elsewhere
          * in this file, these little checks determine the simplest encoding
+        /* Determine how we can send this message.  Per the warnings elsewhere
+         * in this file, these little checks determine the simplest encoding
          * we can use for a given message send using it. */
         while (utf8[i]) {
 …
         if (!name)
                 return NULL;
         x = strchr(name, '-');
 …
         if (dim->connected)
                 g_snprintf(buf, sizeof buf, _("Direct IM with %s closed"), sn);
         else
+        else
                 g_snprintf(buf, sizeof buf, _("Direct IM with %s failed"), sn);
 …
                 return;
+        }
         od = (OscarData *)gc->proto_data;
         if (!g_list_find(gaim_connections_get_all(), gc)) {
                 /* oh boy. this is probably bad. i guess the only thing we
+                /* oh boy. this is probably bad. i guess the only thing we
                  * can really do is return? */
                 gaim_debug(GAIM_DEBUG_INFO, "oscar",
 …
         aim_setdebuggingcb(sess, oscar_debug);
         /*
          * We need an immediate queue because we don't use a while-loop
+         * We need an immediate queue because we don't use a while-loop
          * to see if things need to be sent.
          */
 …
         od = gc->proto_data;
         sess = od->sess;
         bosconn = od->conn;
+        bosconn = od->conn;
         bosconn->fd = source;
 …
 /* BBB */
 /*
  * This little area in oscar.c is the nexus of file transfer code,
  * so I wrote a little explanation of what happens.  I am such a
+ * This little area in oscar.c is the nexus of file transfer code,
+ * so I wrote a little explanation of what happens.  I am such a
  * ninja.
+ *
  * The series of events for a file send is:
  *  -Create xfer and call gaim_xfer_request (this happens in oscar_ask_sendfile)
  *  -User chooses a file and oscar_xfer_init is called.  It establishs a
  *   listening socket, then asks the remote user to connect to us (and
+ *  -User chooses a file and oscar_xfer_init is called.  It establishs a
+ *   listening socket, then asks the remote user to connect to us (and
  *   gives them the file name, port, IP, etc.)
  *  -They connect to us and we send them an AIM_CB_OFT_PROMPT (this happens
+ *  -They connect to us and we send them an AIM_CB_OFT_PROMPT (this happens
  *   in oscar_sendfile_estblsh)
  *  -They send us an AIM_CB_OFT_ACK and then we start sending data
  *  -When we finish, they send us an AIM_CB_OFT_DONE and they close the
+ *  -When we finish, they send us an AIM_CB_OFT_DONE and they close the
  *   connection.
  *  -We get drunk because file transfer kicks ass.
 …
  * The series of events for a file receive is:
  *  -Create xfer and call gaim_xfer request (this happens in incomingim_chan2)
  *  -Gaim user selects file to name and location to save file to and
+ *  -Gaim user selects file to name and location to save file to and
  *   oscar_xfer_init is called
  *  -It connects to the remote user using the IP they gave us earlier
  *  -After connecting, they send us an AIM_CB_OFT_PROMPT.  In reply, we send
+ *  -After connecting, they send us an AIM_CB_OFT_PROMPT.  In reply, we send
  *   them an AIM_CB_OFT_ACK.
  *  -They begin to send us lots of raw data.
  *  -When they finish sending data we send an AIM_CB_OFT_DONE and then close
+ *  -When they finish sending data we send an AIM_CB_OFT_DONE and then close
  *   the connectionn.
  */
 …
                 /*
                  * First try the port specified earlier (5190).  If that fails,
+                 * First try the port specified earlier (5190).  If that fails,
                  * increment by 1 and try again.
                  */
 …
                         oft_info->conn->subtype = AIM_CONN_SUBTYPE_OFT_SENDFILE;
                         aim_conn_addhandler(od->sess, oft_info->conn, AIM_CB_FAM_OFT, AIM_CB_OFT_PROMPT, oscar_sendfile_prompt, 0);
                         oft_info->conn->fd = xfer->fd = gaim_proxy_connect(gaim_connection_get_account(gc), xfer->remote_ip, xfer->remote_port,
+                        oft_info->conn->fd = xfer->fd = gaim_proxy_connect(gaim_connection_get_account(gc), xfer->remote_ip, xfer->remote_port,
                                                                       oscar_sendfile_connected, xfer);
                         if (xfer->fd == -1) {
 …
                 gaim_debug(GAIM_DEBUG_MISC, "oscar", "Email is NULL\n");
+        }
         gaim_debug(GAIM_DEBUG_MISC, "oscar", "BOSIP: %s\n", info->bosip);
         gaim_debug(GAIM_DEBUG_INFO, "oscar",
 …
         struct sockaddr name;
         socklen_t name_len = 1;
         if (!g_list_find(gaim_connections_get_all(), gc)) {
                 g_free(dim);
 …
+        }
         od->direct_ims = g_slist_append(od->direct_ims, dim);
         dim->watcher = gaim_input_add(dim->conn->fd, GAIM_INPUT_READ, oscar_callback, dim->conn);
+}
 …
 /* BBB */
 /*
  * This is called after a remote AIM user has connected to us.  We
  * want to do some voodoo with the socket file descriptors, add a
+ * This is called after a remote AIM user has connected to us.  We
+ * want to do some voodoo with the socket file descriptors, add a
  * callback or two, and then send the AIM_CB_OFT_PROMPT.
  */
 …
 /*
  * This is the gaim callback passed to gaim_proxy_connect when connecting to another AIM
+ * This is the gaim callback passed to gaim_proxy_connect when connecting to another AIM
  * user in order to transfer a file.
  */
 …
 /*
  * This is called when a buddy sends us some file info.  This happens when they
+ * This is called when a buddy sends us some file info.  This happens when they
  * are sending a file to you, and you have just established a connection to them.
  * You should send them the exact same info except use the real cookie.  We also
+ * You should send them the exact same info except use the real cookie.  We also
  * get like totally ready to like, receive the file, kay?
  */
 …
 /*
  * We are sending a file to someone else.  They have just acknowledged our
+ * We are sending a file to someone else.  They have just acknowledged our
  * prompt, so we want to start sending data like there's no tomorrow.
  */
 …
 /*
  * We just sent a file to someone.  They said they got it and everything,
+ * We just sent a file to someone.  They said they got it and everything,
  * so we can close our direct connection and what not.
  */
 …
+        }
         if ((iconfile = gaim_account_get_buddy_icon(gaim_connection_get_account(gc))) &&
+        if ((iconfile = gaim_account_get_buddy_icon(gaim_connection_get_account(gc))) &&
             (args->icbmflags & AIM_IMFLAGS_BUDDYREQ) && !bi->ico_sent && bi->ico_informed) {
                 FILE *file;
 …
                         struct aim_oft_info *oft_info;
                         if (!args->cookie || !args->port || !args->verifiedip ||
                             !args->info.sendfile.filename || !args->info.sendfile.totsize ||
+                        if (!args->cookie || !args->port || !args->verifiedip ||
+                            !args->info.sendfile.filename || !args->info.sendfile.totsize ||
                             !args->info.sendfile.totfiles || !args->reqclass) {
                                 gaim_debug(GAIM_DEBUG_WARNING, "oscar",
 …
                 } else if (args->status == AIM_RENDEZVOUS_ACCEPT) {
                         /*
                          * This gets sent by the receiver of a file
                          * as they connect directly to us.  If we don't
                          * get this, then maybe a third party connected
+                         * This gets sent by the receiver of a file
+                         * as they connect directly to us.  If we don't
+                         * get this, then maybe a third party connected
                          * to us, and we shouldn't send them anything.
                          */
 …
 /*
  * Authorization Functions
  * Most of these are callbacks from dialogs.  They're used by both
+ * Most of these are callbacks from dialogs.  They're used by both
  * methods of authorization (SSI and old-school channel 4 ICBM)
  */
 …
 /*
  * We get this error when there was an error in the locate family.  This
+ * We get this error when there was an error in the locate family.  This
  * happens when you request info of someone who is offline.
  */
 …
                 bit <<= 1;
+        }
         return buf;
+        return buf;
+}
 …
                 g_free(to);
+        }
         if (alertitle)
                 gaim_debug(GAIM_DEBUG_MISC, "oscar", "Got an alert '%s' %s\n", alertitle, alerturl ? alerturl : "");
 …
         fu32_t windowsize, clear, alert, limit, disconnect, currentavg, maxavg;
         va_start(ap, fr);
+        va_start(ap, fr);
         code = (fu16_t)va_arg(ap, unsigned int);
         rateclass= (fu16_t)va_arg(ap, unsigned int);
 …
+ *
  * It may not be my place to do this, but...
  * I feel pretty strongly that the "last 2 digits" warning is ridiculously
  * stupid, and should not exist for % switches (%x in our case) that request
  * a year in the preferred representation for the current locale.  For that
+ * I feel pretty strongly that the "last 2 digits" warning is ridiculously
+ * stupid, and should not exist for % switches (%x in our case) that request
+ * a year in the preferred representation for the current locale.  For that
  * reason I've chosen to not use this workaround (n., see kluge).
+ *
  * I have a date.  I want to show it to the user in the "preferred" way.
  * Whether that displays a 2 digit year is perfectly fine--after all, it's
+ * I have a date.  I want to show it to the user in the "preferred" way.
+ * Whether that displays a 2 digit year is perfectly fine--after all, it's
  * what the locale wanted.
+ *
  * If I have a necessity for a full representation of the year in the current
  * locale, then I'll use a switch that returns a full representation of the
+ *
+ * If I have a necessity for a full representation of the year in the current
+ * locale, then I'll use a switch that returns a full representation of the
  * year.
+ *
  * If you think the preferred locale should show 4 digits instead of 2 digits
+ * If you think the preferred locale should show 4 digits instead of 2 digits
  * (because you're anal, or whatever), then change the f***ing locale.
+ *
  * I guess the bottom line is--I'm trying to show a date to the user how they
+ * I guess the bottom line is--I'm trying to show a date to the user how they
  * prefer to see it, why the hell does gcc want me to change that?
+ *
 …
  * "last 2 digits" warning.
  */
 static size_t my_strftime(char *s, size_t max, const char  *fmt,
+static size_t my_strftime(char *s, size_t max, const char  *fmt,
                         const struct tm *tm)
+{
 …
         if (email) {
                 char *dialog_msg = g_strdup_printf(_("The email address for %s is %s"),
+                char *dialog_msg = g_strdup_printf(_("The email address for %s is %s"),
                                                    gaim_account_get_username(gaim_connection_get_account(gc)), email);
                 gaim_notify_info(gc, NULL, _("Account Info"), dialog_msg);
 …
                 return;
+        }
         text_html = gaim_strdup_withhtml(text);
         flags = oscar_encoding_check(text_html);
 …
         if (flags & AIM_IMFLAGS_UNICODE) {
                 msg = g_convert(text_html, strlen(text_html), "UCS-2BE", "UTF-8", NULL, &msglen, NULL);
                 aim_locate_setprofile(od->sess, NULL, NULL, 0, "unicode-2-0", msg,
+                aim_locate_setprofile(od->sess, NULL, NULL, 0, "unicode-2-0", msg,
                         (msglen > od->rights.maxawaymsglen ? od->rights.maxawaymsglen : msglen));
                 g_free(msg);
 …
         } else if (flags & AIM_IMFLAGS_ISO_8859_1) {
                 msg = g_convert(text_html, strlen(text_html), "ISO-8859-1", "UTF-8", NULL, &msglen, NULL);
                 aim_locate_setprofile(od->sess, NULL, NULL, 0, "iso-8859-1", msg,
+                aim_locate_setprofile(od->sess, NULL, NULL, 0, "iso-8859-1", msg,
                         (msglen > od->rights.maxawaymsglen ? od->rights.maxawaymsglen : msglen));
                 g_free(msg);
 …
         } else {
                 msglen = strlen(text_html);
                 aim_locate_setprofile(od->sess, NULL, NULL, 0, "us-ascii", text_html,
+                aim_locate_setprofile(od->sess, NULL, NULL, 0, "us-ascii", text_html,
                         (msglen > od->rights.maxawaymsglen ? od->rights.maxawaymsglen : msglen));
                 gc->away = g_strndup(text_html, od->rights.maxawaymsglen);
 …
                 g_free(errstr);
+        }
         g_free(text_html);
         return;
 …
         OscarData *od = (OscarData *)g->proto_data;
         struct chat_connection *ccon = find_oscar_chat(g, id);
         if (!ccon)
                 return;
         aim_chat_invite(od->sess, od->conn, name, message ? message : "",
                         ccon->exchange, ccon->name, 0x0);
 …
         gaim_debug(GAIM_DEBUG_INFO, "oscar",
                            "Attempting to leave room %s (currently in %d rooms)\n", b->name, count);
         c = find_oscar_chat(g, gaim_conv_chat_get_id(GAIM_CONV_CHAT(b)));
         if (c != NULL) {
 …
         if (!GAIM_BUDDY_IS_ONLINE(b)) {
                 char *gname;
                 if ((b->name) && (od) && (od->sess->ssi.received_data) &&
                         (gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, b->name)) &&
+                if ((b->name) && (od) && (od->sess->ssi.received_data) &&
+                        (gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, b->name)) &&
                         (aim_ssi_waitingforauth(od->sess->ssi.local, gname, b->name))) {
                         emblems[i++] = "notauthorized";
 …
                         emblems[i++] = "away";
         } else {
                 if (b->uc & UC_UNAVAILABLE)
+                if (b->uc & UC_UNAVAILABLE)
                         emblems[i++] = "away";
+        }
 …
+                                }
                         } else if (flags == 0x81)
                                 aim_ssi_seticon(od->sess, md5, length);
+                                aim_ssi_seticon(od->sess, md5, length);
                 } break;
 …
 /*
  * This is called when each chunk of an image is received.  It can be used to
  * update a progress bar, or to eat lots of dry cat food.  Wet cat food is
+ * This is called when each chunk of an image is received.  It can be used to
+ * update a progress bar, or to eat lots of dry cat food.  Wet cat food is
  * nasty, you sicko.
  */
 …
 /*
  * This is called after a direct IM has been received in its entirety.  This
  * function is passed a long chunk of data which contains the IM with any
+ * This is called after a direct IM has been received in its entirety.  This
+ * function is passed a long chunk of data which contains the IM with any
  * data chunks (images) appended to it.
+ *
  * This function rips out all the data chunks and creates an imgstore for
  * each one.  In order to do this, it first goes through the IM and takes
  * out all the IMG tags.  When doing so, it rewrites the original IMG tag
  * with one compatable with the imgstore Gaim core code. For each one, we
  * then read in chunks of data from the end of the message and actually
+ * This function rips out all the data chunks and creates an imgstore for
+ * each one.  In order to do this, it first goes through the IM and takes
+ * out all the IMG tags.  When doing so, it rewrites the original IMG tag
+ * with one compatable with the imgstore Gaim core code. For each one, we
+ * then read in chunks of data from the end of the message and actually
  * create the img store using the given data.
+ *
 …
  *     Yeah it is<BR>
  *     Here is another one:<BR>
  *     <IMG SRC="Soap Bubbles.bmp" ID="2" WIDTH="256" HEIGHT="256" DATASIZE="65978">
+ *     <IMG SRC="Soap Bubbles.bmp" ID="2" WIDTH="256" HEIGHT="256" DATASIZE="65978">
  *     </FONT>
  * </BODY></HTML>
 …
         switch(account->perm_deny) {
         case 1:
+        case 1:
                 aim_bos_changevisibility(od->sess, od->conn, AIM_VISIBILITYCHANGE_DENYADD, gaim_account_get_username(account));
                 break;
 …
+                }
+        }
         return m;
+}
 …
+{
         gaim_request_input(gc, NULL, _("Available Message:"), NULL,
                                            _("I'm doing work and hoping for a distraction--IM me!"),
+                                           _("I'm doing work and hoping for a distraction--IM me!"),
                                            TRUE, FALSE,
                                            _("OK"), G_CALLBACK(oscar_setavailmsg),

libfaim/popups.c

rcf02dd6	r7869e48
13	13	*
14	14	* The message is probably HTML.
15		*
	15	*
16	16	*/
17	17	static int parsepopup(aim_session_t sess, aim_module_t mod, aim_frame_t rx, aim_modsnac_t snac, aim_bstream_t *bs)

libfaim/rxhandlers.c

-                      r54666e0
+                      r7869e48
         if (snac.flags & 0x0001) {
                 /*
                  * This means the SNAC will be followed by another SNAC with
                  * related information.  We don't need to do anything about
+                 * This means the SNAC will be followed by another SNAC with
+                 * related information.  We don't need to do anything about
                  * this here.
                  */
 …
         if (snac.flags & 0x8000) {
                 /*
                  * This packet contains the version of the family that this SNAC is
                  * in.  You get this when your SSI module is version 2 or higher.
                  * For now we have no need for this, but you could always save
+                 * This packet contains the version of the family that this SNAC is
+                 * in.  You get this when your SSI module is version 2 or higher.
+                 * For now we have no need for this, but you could always save
                  * it as a part of aim_modnsac_t, or something.  The format is...
                  * 2 byte length of total mini-header (which is 6 bytes), then TLV
                  * of  type 0x0001, length 0x0002, value is the 2 byte version
+                 * 2 byte length of total mini-header (which is 6 bytes), then TLV
+                 * of  type 0x0001, length 0x0002, value is the 2 byte version
                  * number
                  */
 …
         for (cur = (aim_module_t *)sess->modlistv; cur; cur = cur->next) {
                 if (!(cur->flags & AIM_MODFLAG_MULTIFAMILY) &&
+                if (!(cur->flags & AIM_MODFLAG_MULTIFAMILY) &&
                                 (cur->family != snac.family))
                         continue;
 …
         for (cur = (aim_module_t *)sess->modlistv; cur; cur = cur->next) {
                 if (!(cur->flags & AIM_MODFLAG_MULTIFAMILY) &&
+                if (!(cur->flags & AIM_MODFLAG_MULTIFAMILY) &&
                                 (cur->family != snac.family))
                         continue;
 …
                 msg = aim_tlv_getstr(tlvlist, 0x000b, 1);
         if ((userfunc = aim_callhandler(sess, fr->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR)))
+        if ((userfunc = aim_callhandler(sess, fr->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR)))
                 ret = userfunc(sess, fr, code, msg);
 …
         };
         static const int maxchannels = 5;
         /* XXX: this is ugly. and big just for debugging. */
         static const char *literals[14][25] = {
                 {"Invalid",
+                {"Invalid",
                  NULL
                 },
                 {"General",
+                {"General",
                  "Invalid",
                  "Error",
 …
                  "NOP"
                 },
                 {"Location",
+                {"Location",
                  "Invalid",
                  "Error",
                  "Request Rights",
                  "Rights Information",
                  "Set user information",
                  "Request User Information",
                  "User Information",
+                 "Rights Information",
+                 "Set user information",
+                 "Request User Information",
+                 "User Information",
                  "Watcher Sub Request",
                  "Watcher Notification"
                 },
                 {"Buddy List Management",
                  "Invalid",
                  "Error",
+                {"Buddy List Management",
+                 "Invalid",
+                 "Error",
                  "Request Rights",
                  "Rights Information",
                  "Add Buddy",
                  "Remove Buddy",
                  "Watcher List Query",
                  "Watcher List Response",
                  "Watcher SubRequest",
                  "Watcher Notification",
                  "Reject Notification",
                  "Oncoming Buddy",
+                 "Add Buddy",
+                 "Remove Buddy",
+                 "Watcher List Query",
+                 "Watcher List Response",
+                 "Watcher SubRequest",
+                 "Watcher Notification",
+                 "Reject Notification",
+                 "Oncoming Buddy",
                  "Offgoing Buddy"
                 },
                 {"Messeging",
                  "Invalid",
                  "Error",
+                {"Messeging",
+                 "Invalid",
+                 "Error",
                  "Add ICBM Parameter",
                  "Remove ICBM Parameter",
+                 "Remove ICBM Parameter",
                  "Request Parameter Information",
                  "Parameter Information",
                  "Outgoing Message",
+                 "Outgoing Message",
                  "Incoming Message",
                  "Evil Request",
                  "Evil Reply",
+                 "Evil Reply",
                  "Missed Calls",
                  "Message Error",
+                 "Message Error",
                  "Host Ack"
                 },
                 {"Advertisements",
                  "Invalid",
                  "Error",
+                {"Advertisements",
+                 "Invalid",
+                 "Error",
                  "Request Ad",
                  "Ad Data (GIFs)"
                 },
                 {"Invitation / Client-to-Client",
+                {"Invitation / Client-to-Client",
                  "Invalid",
                  "Error",
 …
                  "Invitation Ack"
                 },
                 {"Administrative",
+                {"Administrative",
                  "Invalid",
                  "Error",
 …
                  "Account Delete Reply"
                 },
                 {"Popups",
+                {"Popups",
                  "Invalid",
                  "Error",
                  "Display Popup"
                 },
                 {"BOS",
+                {"BOS",
                  "Invalid",
                  "Error",
 …
                  "Server Error"
                 },
                 {"User Lookup",
+                {"User Lookup",
                  "Invalid",
                  "Error",
 …
                  "Search Response"
                 },
                 {"Stats",
+                {"Stats",
                  "Invalid",
                  "Error",
 …
                  "Report Events"
                 },
                 {"Translate",
+                {"Translate",
                  "Invalid",
                  "Error",
 …
                  "Translate Reply",
                 },
                 {"Chat Navigation",
+                {"Chat Navigation",
                  "Invalid",
                  "Error",
 …
                  "Request Occupant List",
                  "Search for Room",
                  "Outgoing Message",
+                 "Outgoing Message",
                  "Incoming Message",
                  "Evil Request",
                  "Evil Reply",
+                 "Evil Request",
+                 "Evil Reply",
                  "Chat Error",
+                }
 …
                 family = aimbs_get16(&frame->data);
                 subtype = aimbs_get16(&frame->data);
                 if ((family < maxf) && (subtype+1 < maxs) && (literals[family][subtype] != NULL))
                         faimdprintf(sess, 0, "bleck: channel %s: null handler for %04x/%04x (%s)\n", channels[frame->hdr.flap.type], family, subtype, literals[family][subtype+1]);
 …
+        }
         return 1;
+}
 …
         for (cur = (struct aim_rxcblist_s *)src->handlerlist; cur; cur = cur->next) {
                 aim_conn_addhandler(sess, dest, cur->family, cur->type,
+                aim_conn_addhandler(sess, dest, cur->family, cur->type,
                                                 cur->handler, cur->flags);
+        }
 …
+        }
         /*
+        /*
          * This doesn't have to be called here.  It could easily be done
          * by a seperate thread or something. It's an administrative operation,

libfaim/rxqueue.c

-                      re374dee
+                      r7869e48
 #define FAIM_INTERNAL
 #include <aim.h>
+#include <aim.h>
 #ifndef _WIN32
 …
 faim_internal int aim_recv(int fd, void *buf, size_t count)
+{
         int left, cur;
+        int left, cur;
         for (cur = 0, left = count; left; ) {
                 int ret;
                 ret = recv(fd, ((unsigned char *)buf)+cur, left, 0);
 …
         if (!bs || (fd < 0) || (count < 0))
                 return -1;
         if (count > (bs->len - bs->offset))
                 count = bs->len - bs->offset; /* truncate to remaining space */
 …
         aim_bstream_t flaphdr;
         fu16_t payloadlen;
         aim_bstream_init(&flaphdr, flaphdr_raw, sizeof(flaphdr_raw));
 …
                 aim_conn_close(conn);
                 return -1;
+        }
+        }
         /* we're doing FLAP if we're here */
 …
 /*
  * Grab a single command sequence off the socket, and enqueue it in the incoming event queue
+ * Grab a single command sequence off the socket, and enqueue it in the incoming event queue
  * in a separate struct.
  */
 …
         /*
          * Rendezvous (client to client) connections do not speak FLAP, so this
+         * Rendezvous (client to client) connections do not speak FLAP, so this
          * function will break on them.
          */
 …
         newrx->conn->lastactivity = time(NULL);
         return 0;
+        return 0;
+}
 …
  * Purge recieve queue of all handled commands (->handled==1).  Also
  * allows for selective freeing using ->nofree so that the client can
  * keep the data for various purposes.
+ *
  * If ->nofree is nonzero, the frame will be delinked from the global list,
+ * keep the data for various purposes.
+ *
+ * If ->nofree is nonzero, the frame will be delinked from the global list,
  * but will not be free'ed.  The client _must_ keep a pointer to the
  * data -- libfaim will not!  If the client marks ->nofree but
 …
                         *prev = cur->next;
                         if (!cur->nofree)
                                 aim_frame_destroy(cur);
 …
                 if ((!currx->handled) && (currx->conn == conn))
                         currx->handled = 1;
+        }
+        }
         return;
+}

libfaim/search.c

-                      rcf02dd6
+                      r7869e48
         snacid = aim_cachesnac(sess, 0x000a, 0x0002, 0x0000, strdup(address), strlen(address)+1);
         aim_putsnac(&fr->data, 0x000a, 0x0002, 0x0000, snacid);
         aimbs_putraw(&fr->data, address, strlen(address));
+        aimbs_putraw(&fr->data, address, strlen(address));
         aim_tx_enqueue(sess, fr);
 …
         /* XXX uhm.
          * This is the only place that uses something other than 1 for the 3rd
+         * This is the only place that uses something other than 1 for the 3rd
          * parameter to aim_tlv_gettlv_whatever().
          */
 …
                 free(cur);
                 j++;
+                j++;
+        }

libfaim/service.c

-                      rcf02dd6
+                      r7869e48
         /*
          * Send only the tool versions that the server cares about (that it
          * marked as supporting in the server ready SNAC).
+         * marked as supporting in the server ready SNAC).
          */
         for (sg = ins->groups; sg; sg = sg->next) {
 …
 /*
  * Subtype 0x0003 - Host Online
+ *
+ *
  * See comments in conn.c about how the group associations are supposed
  * to work, and how they really work.
 …
  * We don't actually call the client here.  This starts off the connection
  * initialization routine required by all AIM connections.  The next time
  * the client is called is the CONNINITDONE callback, which should be
+ * the client is called is the CONNINITDONE callback, which should be
  * shortly after the rate information is acknowledged.
+ *
+ *
  */
 static int hostonline(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
 …
         aim_setversions(sess, rx->conn);
         return 1;
+        return 1;
+}
 …
  * it.  The rate classes, their limiting properties, and the definitions
  * of which SNACs are belong to which class, are defined in the
  * Rate Response packet at login to each host.
+ * Rate Response packet at login to each host.
+ *
  * Logically, all rate offenses within one class count against further
 …
+ *
  * The only other thing of note is that class 5 (chat) has slightly looser
  * limiting properties than class 3 (normal messages).  But thats just a
+ * limiting properties than class 3 (normal messages).  But thats just a
  * small bit of trivia for you.
+ *
 …
  * system is how the actual numbers relate to the passing of time.  This
  * seems to be a big mystery.
+ *
+ *
  */
 …
                  * depending on the version we advertised in 1/17.  If we
                  * didn't send 1/17 (evil!), then this will crash and you
                  * die, as it will default to the old version but we have
                  * the new version hardcoded here.
+                 * die, as it will default to the old version but we have
+                 * the new version hardcoded here.
                  */
                 if (mod->version >= 3)
 …
+{
         aim_conn_inside_t *ins = (aim_conn_inside_t *)conn->inside;
         aim_frame_t *fr;
+        aim_frame_t *fr;
         aim_snacid_t snacid;
         struct rateclass *rc;
         if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 512)))
                 return -ENOMEM;
+                return -ENOMEM;
         snacid = aim_cachesnac(sess, 0x0001, 0x0008, 0x0000, NULL, 0);
 …
+{
         aim_conn_inside_t *ins = (aim_conn_inside_t *)conn->inside;
         aim_frame_t *fr;
+        aim_frame_t *fr;
         aim_snacid_t snacid;
         struct rateclass *rc;
         if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 512)))
                 return -ENOMEM;
+                return -ENOMEM;
         snacid = aim_cachesnac(sess, 0x0001, 0x0009, 0x0000, NULL, 0);
 …
         code = aimbs_get16(bs);
         rateclass = aimbs_get16(bs);
         windowsize = aimbs_get32(bs);
         clear = aimbs_get32(bs);
 …
  * How Migrations work.
+ *
  * The server sends a Server Pause message, which the client should respond to
  * with a Server Pause Ack, which contains the families it needs on this
  * connection. The server will send a Migration Notice with an IP address, and
  * then disconnect. Next the client should open the connection and send the
+ * The server sends a Server Pause message, which the client should respond to
+ * with a Server Pause Ack, which contains the families it needs on this
+ * connection. The server will send a Migration Notice with an IP address, and
+ * then disconnect. Next the client should open the connection and send the
  * cookie.  Repeat the normal login process and pretend this never happened.
+ *
 …
         /*
          * This list should have all the groups that the original
          * Host Online / Server Ready said this host supports.  And
+         * This list should have all the groups that the original
+         * Host Online / Server Ready said this host supports.  And
          * we want them all back after the migration.
          */
 …
         memset(&userinfo, 0, sizeof(aim_userinfo_t));
         newevil = aimbs_get16(bs);
 …
+ *
  * This is the final SNAC sent on the original connection during a migration.
  * It contains the IP and cookie used to connect to the new server, and
+ * It contains the IP and cookie used to connect to the new server, and
  * optionally a list of the SNAC groups being migrated.
+ *
 …
          * moves to the new server.  When not all the groups for a connection
          * are migrated, or they are all migrated but some groups are moved
          * to a different server than others, it is called a bifurcated
+         * to a different server than others, it is called a bifurcated
          * migration.
+         *
 …
          *   3 System bulletin
          *   4 Nothing's wrong ("top o the world" -- normal)
          *   5 Lets-break-something.
+         *   5 Lets-break-something.
+         *
          */
         id = aimbs_get16(bs);
         /*
          * TLVs follow
+        /*
+         * TLVs follow
          */
         tlvlist = aim_tlvlist_read(bs);
 …
+}
 /*
+/*
  * Subtype 0x0014 - Set privacy flags
+ *
 …
  * Subtype 0x0016 - No-op
+ *
  * WinAIM sends these every 4min or so to keep the connection alive.  Its not
+ * WinAIM sends these every 4min or so to keep the connection alive.  Its not
  * really necessary.
+ *
  * Wha?  No?  Since when?  I think WinAIM sends an empty channel 3
+ * Wha?  No?  Since when?  I think WinAIM sends an empty channel 3
  * SNAC as a no-op...
  */
 …
+}
 /*
+/*
  * Subtype 0x0017 - Set client versions
+ *
  * If you've seen the clientonline/clientready SNAC you're probably
+ * If you've seen the clientonline/clientready SNAC you're probably
  * wondering what the point of this one is.  And that point seems to be
  * that the versions in the client online SNAC are sent too late for the
  * server to be able to use them to change the protocol for the earlier
  * login packets (client versions are sent right after Host Online is
+ * login packets (client versions are sent right after Host Online is
  * received, but client online versions aren't sent until quite a bit later).
  * We can see them already making use of this by changing the format of
 …
         /*
          * Send only the versions that the server cares about (that it
          * marked as supporting in the server ready SNAC).
+         * marked as supporting in the server ready SNAC).
          */
         for (sg = ins->groups; sg; sg = sg->next) {
 …
+}
 /*
+/*
  * Subtype 0x001e - Extended Status
+ *
  * Sets your ICQ status (available, away, do not disturb, etc.)
+ *
  * These are the same TLVs seen in user info.  You can
+ * These are the same TLVs seen in user info.  You can
  * also set 0x0008 and 0x000c.
  */
 …
         snacid = aim_cachesnac(sess, 0x0001, 0x001e, 0x0000, NULL, 0);
         aim_putsnac(&fr->data, 0x0001, 0x001e, 0x0000, snacid);
         aim_tlvlist_add_32(&tl, 0x0006, data);
         aim_tlvlist_write(&fr->data, &tl);
         aim_tlvlist_free(&tl);
         aim_tx_enqueue(sess, fr);
 …
+}
 /*
+/*
  * Subtype 0x001e - Extended Status.
+ *
  * Sets your "available" message.  This is currently only supported by iChat
+ * Sets your "available" message.  This is currently only supported by iChat
  * and Gaim.
+ *
  * These are the same TLVs seen in user info.  You can
+ * These are the same TLVs seen in user info.  You can
  * also set 0x0008 and 0x000c.
  */
 …
  * the data that the specific client should have, the client will get the
  * following message from "AOL Instant Messenger":
  *    "You have been disconnected from the AOL Instant Message Service (SM)
+ *    "You have been disconnected from the AOL Instant Message Service (SM)
  *     for accessing the AOL network using unauthorized software.  You can
  *     download a FREE, fully featured, and authorized client, here
+ *     download a FREE, fully featured, and authorized client, here
  *     http://www.aol.com/aim/download2.html"
  * The connection is then closed, recieving disconnect code 1, URL
  * http://www.aim.aol.com/errors/USER_LOGGED_OFF_NEW_LOGIN.html.
+ *
  * Note, however, that numerous inconsistencies can cause the above error,
+ * http://www.aim.aol.com/errors/USER_LOGGED_OFF_NEW_LOGIN.html.
+ *
+ * Note, however, that numerous inconsistencies can cause the above error,
  * not just sending back a bad hash.  Do not immediatly suspect this code
  * if you get disconnected.  AOL and the open/free software community have
 …
         if ((flag == AIM_SENDMEMBLOCK_FLAG_ISHASH) && buf && (len == 0x10)) { /* we're getting a hash */
                 aimbs_putraw(&fr->data, buf, 0x10);
+                aimbs_putraw(&fr->data, buf, 0x10);
         } else if (buf && (len > 0)) { /* use input buffer */
 …
                 md5_byte_t digest[0x10];
                 md5_init(&state);
+                md5_init(&state);
                 md5_append(&state, (const md5_byte_t *)buf, len);
                 md5_finish(&state, digest);
 …
                 /*
                  * These MD5 routines are stupid in that you have to have
                  * at least one append.  So thats why this doesn't look
+                 * at least one append.  So thats why this doesn't look
                  * real logical.
                  */
 …
         } else {
                 /*
+                /*
                  * This data is correct for AIM 3.5.1670.
+                 *
 …
  * Subtype 0x0021 - Receive our extended status
+ *
  * This is used for iChat's "available" messages, and maybe ICQ extended
  * status messages?  It's also used to tell the client whether or not it
+ * This is used for iChat's "available" messages, and maybe ICQ extended
+ * status messages?  It's also used to tell the client whether or not it
  * needs to upload an SSI buddy icon... who engineers this stuff, anyway?
  */
 …
         fu8_t flags, length;
         type = aimbs_get16(bs);
+        type = aimbs_get16(bs);
         flags = aimbs_get8(bs);
         length = aimbs_get8(bs);

libfaim/snac.c

re374dee	r7869e48
1	1	/*
2	2	*
3		* Various SNAC-related dodads...
	3	* Various SNAC-related dodads...
4	4	*
5	5	* outstanding_snacs is a list of aim_snac_t structs. A SNAC should be added
6	6	* whenever a new SNAC is sent and it should remain in the list until the
7		* response for it has been receieved.
	7	* response for it has been receieved.
8	8	*
9	9	* cleansnacs() should be called periodically by the client in order
…	…
74	74
75	75	/*
76		* Finds a snac structure with the passed SNAC ID,
	76	* Finds a snac structure with the passed SNAC ID,
77	77	* removes it from the list/hash, and returns a pointer to it.
78	78	*
…	…
80	80	*
81	81	*/
82		faim_internal aim_snac_t aim_remsnac(aim_session_t sess, aim_snacid_t id)
	82	faim_internal aim_snac_t aim_remsnac(aim_session_t sess, aim_snacid_t id)
83	83	{
84	84	aim_snac_t cur, *prev;

libfaim/ssi.c

-                      r0154e2d
+                      r7869e48
  * Family 0x0013 - Server-Side/Stored Information.
+ *
  * Relatively new facility that allows certain types of information, such as
  * a user's buddy list, permit/deny list, and permit/deny preferences, to be
+ * Relatively new facility that allows certain types of information, such as
+ * a user's buddy list, permit/deny list, and permit/deny preferences, to be
  * stored on the server, so that they can be accessed from any client.
+ *
  * We keep 2 copies of SSI data:
  * 1) An exact copy of what is stored on the AIM servers.
  * 2) A local copy that we make changes to, and then send diffs
+ * 2) A local copy that we make changes to, and then send diffs
  *    between this and the exact copy to keep them in sync.
+ *
  * All the "aim_ssi_itemlist_bleh" functions near the top just modify the list
+ * All the "aim_ssi_itemlist_bleh" functions near the top just modify the list
  * that is given to them (i.e. they don't send SNACs).
+ *
  * The SNAC sending and receiving functions are lower down in the file, and
  * they're simpler.  They are in the order of the subtypes they deal with,
  * starting with the request rights function (subtype 0x0002), then parse
+ * The SNAC sending and receiving functions are lower down in the file, and
+ * they're simpler.  They are in the order of the subtypes they deal with,
+ * starting with the request rights function (subtype 0x0002), then parse
  * rights (subtype 0x0003), then--well, you get the idea.
+ *
 …
+ *
  * @param list A pointer to a pointer to the current list of items.
  * @param name A null terminated string containing the group name, or NULL
+ * @param name A null terminated string containing the group name, or NULL
  *        if you want to modify the master group.
  * @return Return a pointer to the modified item.
 …
+ *
  * @param list A pointer to a pointer to the current list of items.
  * @param name A null terminated string of the name of the new item, or NULL if the
+ * @param name A null terminated string of the name of the new item, or NULL if the
  *        item should have no name.
  * @param gid The group ID# you want the new item to have, or 0xFFFF if we should pick something.
 …
 /**
  * Locally find an item given a group name, screen name, and type.  If group name
+ * Locally find an item given a group name, screen name, and type.  If group name
  * and screen name are null, then just return the first item of the given type.
+ *
 …
 /**
  * Locally find the presence flag item, and return the setting.  The returned setting is a
  * bitmask of the user flags that you are visible to.  See the AIM_FLAG_* #defines
+ * Locally find the presence flag item, and return the setting.  The returned setting is a
+ * bitmask of the user flags that you are visible to.  See the AIM_FLAG_* #defines
  * in aim.h
+ *
 …
  * @param gn The group of the buddy.
  * @param sn The name of the buddy.
  * @return A pointer to a NULL terminated string that is the buddy's
+ * @return A pointer to a NULL terminated string that is the buddy's
  *         alias, or NULL if the buddy has no alias.  You should free
  *         this returned value!
 …
  * @param gn The group of the buddy.
  * @param sn The name of the buddy.
  * @return A pointer to a NULL terminated string that is the buddy's
+ * @return A pointer to a NULL terminated string that is the buddy's
  *         comment, or NULL if the buddy has no comment.  You should free
  *         this returned value!
 …
  * @param gn The group of the buddy.
  * @param sn The name of the buddy.
  * @return A pointer to a NULL terminated string that is the buddies
+ * @return A pointer to a NULL terminated string that is the buddies
  *         alias, or NULL if the buddy has no alias.  You should free
  *         this returned value!
 …
 /**
  * If there are changes, then create temporary items and
+ * If there are changes, then create temporary items and
  * call addmoddel.
+ *
 …
         /*
          * Compare the 2 lists and create an aim_ssi_tmp for each difference.
          * We should only send either additions, modifications, or deletions
          * before waiting for an acknowledgement.  So first do deletions, then
          * additions, then modifications.  Also, both the official and the local
          * list should be in ascending numerical order for the group ID#s and the
+         * Compare the 2 lists and create an aim_ssi_tmp for each difference.
+         * We should only send either additions, modifications, or deletions
+         * before waiting for an acknowledgement.  So first do deletions, then
+         * additions, then modifications.  Also, both the official and the local
+         * list should be in ascending numerical order for the group ID#s and the
          * buddy ID#s, which makes things more efficient.  I think.
          */
 …
+        }
         /* Make sure we don't send anything else between now
+        /* Make sure we don't send anything else between now
          * and when we receive the ack for the following operation */
         sess->ssi.waiting_for_ack = 1;
 …
 /**
  * Move a buddy from one group to another group.  This basically just deletes the
+ * Move a buddy from one group to another group.  This basically just deletes the
  * buddy and re-adds it.
+ *
 …
  * @param gn The group that the buddy is currently in.
  * @param sn The screen name of the buddy.
  * @param alias The new alias for the buddy, or NULL if you want to remove
+ * @param alias The new alias for the buddy, or NULL if you want to remove
  *        a buddy's comment.
  * @return Return 0 if no errors, otherwise return the error number.
 …
  * @param gn The group that the buddy is currently in.
  * @param sn The screen name of the buddy.
  * @param alias The new comment for the buddy, or NULL if you want to remove
+ * @param alias The new comment for the buddy, or NULL if you want to remove
  *        a buddy's comment.
  * @return Return 0 if no errors, otherwise return the error number.
 …
  *        4 - Block only the users below
  *        5 - Allow only users on my buddy list
  * @param vismask A bitmask of the class of users to whom you want to be
+ * @param vismask A bitmask of the class of users to whom you want to be
  *        visible.  See the AIM_FLAG_BLEH #defines in aim.h
  * @return Return 0 if no errors, otherwise return the error number.
 …
 /**
  * Remove a reference to a server stored buddy icon.  This will make your
+ * Remove a reference to a server stored buddy icon.  This will make your
  * icon stop showing up to other people.
+ *
 …
 /*
  * Subtype 0x0004 - Request SSI Data when you don't have a timestamp and
+ * Subtype 0x0004 - Request SSI Data when you don't have a timestamp and
  * revision number.
+ *
+ *
  */
 faim_export int aim_ssi_reqdata(aim_session_t *sess)
 …
 /*
  * Subtype 0x0005 - Request SSI Data when you have a timestamp and revision
+ * Subtype 0x0005 - Request SSI Data when you have a timestamp and revision
  * number.
+ *
  * The data will only be sent if it is newer than the posted local
  * timestamp and revision.
+ *
+ *
  * Note that the client should never increment the revision, only the server.
+ *
+ *
  */
 faim_export int aim_ssi_reqifchanged(aim_session_t *sess, time_t timestamp, fu16_t numitems)
 …
  * presence information for everyone in your list and put your permit/deny
  * settings into effect.
+ *
+ *
  */
 faim_export int aim_ssi_enable(aim_session_t *sess)
 …
  * information.  These 3 SNACs all have an identical structure.  The only
  * difference is the subtype that is set for the SNAC.
+ *
+ *
  */
 faim_export int aim_ssi_addmoddel(aim_session_t *sess)
 …
         /*
          * If outcome is 0, then add the item to the item list, or replace the other item,
          * or remove the old item.  If outcome is non-zero, then remove the item from the
+         * If outcome is 0, then add the item to the item list, or replace the other item,
+         * or remove the old item.  If outcome is non-zero, then remove the item from the
          * local list, or unmodify it, or add it.
          */
 …
+ *
  * Tells the server you're going to start modifying data.
+ *
+ *
  */
 faim_export int aim_ssi_modbegin(aim_session_t *sess)
 …
  * Subtype 0x001a - Send authorization reply
+ *
  * Sends a reply to a request for authorization.  The reply can either
+ * Sends a reply to a request for authorization.  The reply can either
  * grant authorization or deny authorization.
+ *
 …
 /*
  * Subtype 0x001b - Receive an authorization reply
  * You get this bad boy when other people respond to the authorization
+ * You get this bad boy when other people respond to the authorization
  * request that you have previously sent them.
  */

libfaim/tlv.c

-                      rcf02dd6
+                      r7869e48
         if (!oldtlv || !*oldtlv)
                 return;
         free((*oldtlv)->value);
         free(*oldtlv);
 …
+ *
  * XXX There should be a flag setable here to have the tlvlist contain
  * bstream references, so that at least the ->value portion of each
+ * bstream references, so that at least the ->value portion of each
  * element doesn't need to be malloc/memcpy'd.  This could prove to be
  * just as effecient as the in-place TLV parsing used in a couple places
 …
+{
         aim_tlvlist_t *list = NULL, *cur;
         while (aim_bstream_empty(bs) > 0) {
                 fu16_t type, length;
 …
                  * Okay, so now AOL has decided that any TLV of
                  * type 0x0013 can only be two bytes, despite
                  * what the actual given length is.  So here
+                 * what the actual given length is.  So here
                  * we dump any invalid TLVs of that sort.  Hopefully
                  * theres no special cases to this special case.
 …
+                        }
                         if (cur->tlv->length > 0) {
                                 cur->tlv->value = aimbs_getraw(bs, length);
+                                cur->tlv->value = aimbs_getraw(bs, length);
                                 if (!cur->tlv->value) {
                                         freetlv(&cur->tlv);
 …
+ *
  * XXX There should be a flag setable here to have the tlvlist contain
  * bstream references, so that at least the ->value portion of each
+ * bstream references, so that at least the ->value portion of each
  * element doesn't need to be malloc/memcpy'd.  This could prove to be
  * just as effecient as the in-place TLV parsing used in a couple places
 …
+ *
  * @param bs Input bstream
  * @param num The max number of TLVs that will be read, or -1 if unlimited.
  *        There are a number of places where you want to read in a tlvchain,
  *        but the chain is not at the end of the SNAC, and the chain is
+ * @param num The max number of TLVs that will be read, or -1 if unlimited.
+ *        There are a number of places where you want to read in a tlvchain,
+ *        but the chain is not at the end of the SNAC, and the chain is
  *        preceeded by the number of TLVs.  So you can limit that with this.
  */
 …
+ *
  * XXX There should be a flag setable here to have the tlvlist contain
  * bstream references, so that at least the ->value portion of each
+ * bstream references, so that at least the ->value portion of each
  * element doesn't need to be malloc/memcpy'd.  This could prove to be
  * just as effecient as the in-place TLV parsing used in a couple places
 …
  * @param bs Input bstream
  * @param len The max length in bytes that will be read.
  *        There are a number of places where you want to read in a tlvchain,
  *        but the chain is not at the end of the SNAC, and the chain is
+ *        There are a number of places where you want to read in a tlvchain,
+ *        but the chain is not at the end of the SNAC, and the chain is
  *        preceeded by the length of the TLVs.  So you can limit that with this.
  */
 …
 /*
  * Compare two TLV lists for equality.  This probably is not the most
+ * Compare two TLV lists for equality.  This probably is not the most
  * efficient way to do this.
+ *
 …
         for (cur = *list; cur; ) {
                 aim_tlvlist_t *tmp;
                 freetlv(&cur->tlv);
 …
+ *
  * @param list Chain to be sized
  * @return The number of bytes that would be needed to
+ * @return The number of bytes that would be needed to
  *         write the passed TLV chain to a data buffer.
  */
 …
+ *
  * XXX should probably support sublists for real.
+ *
+ *
  * This is so neat.
+ *
 …
 /**
  * Substitute a TLV of a given type with a new TLV of the same type.  If
  * you attempt to replace a TLV that does not exist, this function will
+ * Substitute a TLV of a given type with a new TLV of the same type.  If
+ * you attempt to replace a TLV that does not exist, this function will
  * just add a new TLV as if you called aim_tlvlist_add_raw().
+ *
 …
 /**
  * Substitute a TLV of a given type with a new TLV of the same type.  If
  * you attempt to replace a TLV that does not exist, this function will
+ * Substitute a TLV of a given type with a new TLV of the same type.  If
+ * you attempt to replace a TLV that does not exist, this function will
  * just add a new TLV as if you called aim_tlvlist_add_raw().
+ *
 …
 /**
  * Substitute a TLV of a given type with a new TLV of the same type.  If
  * you attempt to replace a TLV that does not exist, this function will
+ * Substitute a TLV of a given type with a new TLV of the same type.  If
+ * you attempt to replace a TLV that does not exist, this function will
  * just add a new TLV as if you called aim_tlvlist_add_raw().
+ *
 …
 /**
  * Substitute a TLV of a given type with a new TLV of the same type.  If
  * you attempt to replace a TLV that does not exist, this function will
+ * Substitute a TLV of a given type with a new TLV of the same type.  If
+ * you attempt to replace a TLV that does not exist, this function will
  * just add a new TLV as if you called aim_tlvlist_add_raw().
+ *
 …
 /**
  * Remove a TLV of a given type.  If you attempt to remove a TLV that
+ * Remove a TLV of a given type.  If you attempt to remove a TLV that
  * does not exist, nothing happens.
+ *
 …
+ *
  * Copies a TLV chain into a raw data buffer, writing only the number
  * of bytes specified. This operation does not free the chain;
+ * of bytes specified. This operation does not free the chain;
  * aim_tlvlist_free() must still be called to free up the memory used
  * by the chain structures.
+ *
  * XXX clean this up, make better use of bstreams
+ * XXX clean this up, make better use of bstreams
  */
 faim_internal int aim_tlvlist_write(aim_bstream_t *bs, aim_tlvlist_t **list)
 …
  * Grab the Nth TLV of type type in the TLV list list.
+ *
  * Returns a pointer to an aim_tlv_t of the specified type;
+ * Returns a pointer to an aim_tlv_t of the specified type;
  * %NULL on error.  The @nth parameter is specified starting at %1.
  * In most cases, there will be no more than one TLV of any type
 …
  * @param type TLV type to search for.
  * @param nth Index of TLV to return.
  * @return The value of the TLV you were looking for, or NULL if one could
  *         not be found.  This is a dynamic buffer and must be freed by the
+ * @return The value of the TLV you were looking for, or NULL if one could
+ *         not be found.  This is a dynamic buffer and must be freed by the
  *         caller.
  */
 …
 /**
  * Retrieve the data from the nth TLV in the given TLV chain as an 8bit
+ * Retrieve the data from the nth TLV in the given TLV chain as an 8bit
  * integer.
+ *
 …
  * @param type TLV type to search for.
  * @param nth Index of TLV to return.
  * @return The value the TLV you were looking for, or 0 if one could
+ * @return The value the TLV you were looking for, or 0 if one could
  *         not be found.
  */
 …
 /**
  * Retrieve the data from the nth TLV in the given TLV chain as a 16bit
+ * Retrieve the data from the nth TLV in the given TLV chain as a 16bit
  * integer.
+ *
 …
  * @param type TLV type to search for.
  * @param nth Index of TLV to return.
  * @return The value the TLV you were looking for, or 0 if one could
+ * @return The value the TLV you were looking for, or 0 if one could
  *         not be found.
  */
 …
 /**
  * Retrieve the data from the nth TLV in the given TLV chain as a 32bit
+ * Retrieve the data from the nth TLV in the given TLV chain as a 32bit
  * integer.
+ *
 …
  * @param type TLV type to search for.
  * @param nth Index of TLV to return.
  * @return The value the TLV you were looking for, or 0 if one could
+ * @return The value the TLV you were looking for, or 0 if one could
  *         not be found.
  */

libfaim/translate.c

r862371b	r7869e48
7	7	*
8	8	* But we advertise it anyway, because its fun.
9		*
	9	*
10	10	*/
11	11

libfaim/txqueue.c

-                      rcf02dd6
+                      r7869e48
         memset(fr, 0, sizeof(aim_frame_t));
         fr->conn = conn;
+        fr->conn = conn;
         fr->hdrtype = framing;
 …
                 fr->hdr.rend.type = chan;
         } else
+        } else
                 faimdprintf(sess, 0, "tx_new: unknown framing\n");
 …
  * Basically the same as its __queuebased couterpart, however
  * instead of doing a list append, it just calls aim_tx_sendframe()
  * right here.
+ *
+ * right here.
+ *
  */
 static int aim_tx_enqueue__immediate(aim_session_t *sess, aim_frame_t *fr)
 …
 faim_export int aim_tx_setenqueue(aim_session_t *sess, int what, int (*func)(aim_session_t *, aim_frame_t *))
+{
         if (what == AIM_TX_QUEUED)
                 sess->tx_enqueue = &aim_tx_enqueue__queuebased;
         else if (what == AIM_TX_IMMEDIATE)
+        else if (what == AIM_TX_IMMEDIATE)
                 sess->tx_enqueue = &aim_tx_enqueue__immediate;
         else if (what == AIM_TX_USER) {
 …
 faim_internal int aim_tx_enqueue(aim_session_t *sess, aim_frame_t *fr)
+{
         /*
          * If we want to send a connection thats inprogress, we have to force
 …
          * want.
          */
         if (fr && fr->conn &&
+        if (fr && fr->conn &&
                         (fr->conn->status & AIM_CONN_STATUS_INPROGRESS)) {
                 return aim_tx_enqueue__queuebased(sess, fr);
 …
+}
 /*
+/*
  *  aim_get_next_txseqnum()
+ *
 …
+{
         flap_seqnum_t ret;
         ret = ++conn->seqnum;
 …
         if (count) {
                 if ((conn->type == AIM_CONN_TYPE_RENDEZVOUS) &&
+                if ((conn->type == AIM_CONN_TYPE_RENDEZVOUS) &&
                     (conn->subtype == AIM_CONN_SUBTYPE_OFT_DIRECTIM)) {
                         /* I strongly suspect that this is a horrible thing to do
 …
                         while (count - wrote > 1024) {
                                 wrote = wrote + aim_send(conn->fd, bs->data + bs->offset + wrote, 1024);
                                 if ((userfunc=aim_callhandler(conn->sessv, conn,
                                                                 AIM_CB_FAM_SPECIAL,
+                                if ((userfunc=aim_callhandler(conn->sessv, conn,
+                                                                AIM_CB_FAM_SPECIAL,
                                                                 AIM_CB_SPECIAL_IMAGETRANSFER)))
                                   userfunc(conn->sessv, NULL, sn,
+                                  userfunc(conn->sessv, NULL, sn,
                                            count-wrote>1024 ? ((double)wrote / count) : 1);
+                        }
 …
                 faimdprintf(sess, 2, "\nOutgoing data: (%d bytes)", wrote);
                 for (i = 0; i < wrote; i++) {
                         if (!(i % 8))
+                        if (!(i % 8))
                                 faimdprintf(sess, 2, "\n\t");
                         faimdprintf(sess, 2, "0x%02x ", *(bs->data + bs->offset + i));
 …
         if (aim_bstream_send(&obs, fr->conn, obslen) != obslen)
                 err = -errno;
         free(obs_raw); /* XXX aim_bstream_free */
 …
                  */
                 if ((cur->conn->lastactivity + cur->conn->forcedlatency) >= time(NULL)) {
                         /*
                          * XXX should be a break! we dont want to block the
+                        /*
+                         * XXX should be a break! we dont want to block the
                          * upper layers
+                         *
 …
 /*
  *  aim_tx_purgequeue()
+ *
  *  This is responsable for removing sent commands from the transmit
+ *
+ *  This is responsable for removing sent commands from the transmit
  *  queue. This is not a required operation, but it of course helps
  *  reduce memory footprint at run time!
+ *  reduce memory footprint at run time!
+ *
  */

libfaim/util.c

-                      re374dee
+                      r7869e48
 /*
 * int snlen(const char *)
+*
+*
 * This takes a screen name and returns its length without
 * spaces.  If there are no spaces in the SN, then the
+* spaces.  If there are no spaces in the SN, then the
 * return is equal to that of strlen().
+*
 …
 * on screen names for AIM/AOL.  Mainly, this means case and space
 * insensitivity (all case differences and spacing differences are
 * ignored, with the exception that screen names can not start with
+* ignored, with the exception that screen names can not start with
 * a space).
+*

logging.c

-                      r0792d99
+                      r7869e48
   /* skip login/logout messages if appropriate */
   if (!owl_global_is_loglogins(&g) && owl_message_is_loginout(m)) return(0);
   /* check direction */
   if ((owl_global_get_loggingdirection(&g)==OWL_LOGGING_DIRECTION_IN) && owl_message_is_direction_out(m)) {
 …
     buffer = g_string_new("");
     tmp = short_zuser(owl_message_get_sender(m));
     g_string_append_printf(buffer, "Class: %s Instance: %s",
                            owl_message_get_class(m),
+    g_string_append_printf(buffer, "Class: %s Instance: %s",
+                           owl_message_get_class(m),
                            owl_message_get_instance(m));
     if (strcmp(owl_message_get_opcode(m), "")) {
       g_string_append_printf(buffer, " Opcode: %s",
+      g_string_append_printf(buffer, " Opcode: %s",
                              owl_message_get_opcode(m));
+    }
     g_string_append_printf(buffer, "\n");
     g_string_append_printf(buffer, "Time: %s Host: %s\n",
                            owl_message_get_timestr(m),
+    g_string_append_printf(buffer, "Time: %s Host: %s\n",
+                           owl_message_get_timestr(m),
                            owl_message_get_hostname(m));
     g_string_append_printf(buffer, "From: %s <%s>\n\n",
+    g_string_append_printf(buffer, "From: %s <%s>\n\n",
                            owl_message_get_zsig(m), tmp);
     g_string_append_printf(buffer, "%s\n\n", owl_message_get_body(m));
 …
     GString *buffer = NULL;
     buffer = g_string_new("");
     g_string_append_printf(buffer, "From: <%s> To: <%s>\n",
+    g_string_append_printf(buffer, "From: <%s> To: <%s>\n",
                            owl_message_get_sender(m), owl_message_get_recipient(m));
     g_string_append_printf(buffer, "Time: %s\n\n",
+    g_string_append_printf(buffer, "Time: %s\n\n",
                            owl_message_get_timestr(m));
     if (owl_message_is_login(m)) {
 …
     buffer = g_string_new("");
     g_string_append_printf(buffer, "From: <%s> To: <%s>\n",
                            owl_message_get_sender(m),
+                           owl_message_get_sender(m),
                            owl_message_get_recipient(m));
     g_string_append_printf(buffer, "Time: %s\n\n",
+    g_string_append_printf(buffer, "Time: %s\n\n",
                            owl_message_get_timestr(m));
     g_string_append_printf(buffer, "%s\n\n", owl_message_get_body(m));
 …
     GString *buffer;
     buffer = g_string_new("");
     g_string_append_printf(buffer, "From: <%s> To: <%s>\n",
                            owl_message_get_sender(m),
+    g_string_append_printf(buffer, "From: <%s> To: <%s>\n",
+                           owl_message_get_sender(m),
                            owl_message_get_recipient(m));
     g_string_append_printf(buffer, "Time: %s\n\n",
+    g_string_append_printf(buffer, "Time: %s\n\n",
                            owl_message_get_timestr(m));
     g_string_append_printf(buffer, "%s\n\n",
+    g_string_append_printf(buffer, "%s\n\n",
                            owl_message_get_body(m));
     return g_string_free(buffer, FALSE);
 …
 void owl_log_enqueue_message(const char *buffer, const char *filename)
+{
   owl_log_entry *log_msg = NULL;
+  owl_log_entry *log_msg = NULL;
   log_msg = g_new(owl_log_entry,1);
   log_msg->message = g_strdup(buffer);
   log_msg->filename = g_strdup(filename);
   owl_select_post_task(owl_log_write_entry, log_msg,
+  owl_select_post_task(owl_log_write_entry, log_msg,
                        owl_log_entry_free, log_context);
+}
 …
   } else if (owl_message_is_type_jabber(m)) {
     if (personal) {
       from=frombuff=g_strdup_printf("jabber:%s",
+      from=frombuff=g_strdup_printf("jabber:%s",
                                     owl_message_get_sender(m));
     } else {
       from=frombuff=g_strdup_printf("jabber:%s",
+      from=frombuff=g_strdup_printf("jabber:%s",
                                     owl_message_get_recipient(m));
+    }
 …
     from=frombuff=g_strdup("unknown");
+  }
   /* check for malicious sender formats */
   len=strlen(frombuff);
 …
+}
 void owl_log_init(void)
+void owl_log_init(void)
+{
   log_context = g_main_context_new();
 …
+  }
 #endif
+}

m4/pkg.m4

-                      r650fb2c
+                      r7869e48
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # serial 1 (pkg-config-0.24)
+#
+#
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
 …
         if test $_pkg_short_errors_supported = yes; then
                 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
         else
+        else
                 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi

mainwin.c

rab88b05	r7869e48
142	142	if (m==owl_view_get_element(v, curmsg)) {
143	143	wmove(recwin, savey, 0);
144		wattron(recwin, A_BOLD);
	144	wattron(recwin, A_BOLD);
145	145	if (owl_global_get_curmsg_vert_offset(&g)>0) {
146	146	waddstr(recwin, "+");

message.c

-                      r2354e9a
+                      r7869e48
   owl_message_set_hostname(m, "");
   m->attributes = g_ptr_array_new();
   /* save the time */
   m->time = time(NULL);
 …
+{
   const char *realm;
   realm=owl_message_get_attribute_value(m, "realm");
   if (!realm) return("");
 …
   return !strcasecmp(t, type);
+}
 int owl_message_is_type_admin(const owl_message *m)
+{
 …
   owl_fmtext_init_null(&a);
   owl_fmtext_init_null(&b);
   owl_fmtext_truncate_lines(&(m->fmtext->fmtext), aline, bline-aline, &a);
   owl_fmtext_truncate_cols(&a, acol, bcol, &b);
 …
   owl_message_format(m); /* is this necessary? */
   return owl_fmtext_search(&(m->fmtext->fmtext), re, 0) >= 0;
+}
 …
   owl_message_init(m);
   owl_message_set_type_zephyr(m);
   owl_message_set_direction_in(m);
   /* first save the full notice */
   m->notice = *n;
 …
   /* a little gross, we'll replace \r's with ' ' for now */
   owl_zephyr_hackaway_cr(&(m->notice));
   /* save the time, we need to nuke the string saved by message_init */
   if (m->timestr) g_free(m->timestr);
 …
+  }
   /* set the "isprivate" attribute if it's a private zephyr. */
   if (owl_zwrite_recip_is_personal(n->z_recipient)) {
 …
   memset(&(m->notice), 0, sizeof(ZNotice_t));
 #endif
   longuser=long_zuser(user);
   owl_message_init(m);
   owl_message_set_type_zephyr(m);
   owl_message_set_direction_in(m);
 …
+{
   char *replyline;
   owl_message_init(m);
 …
   owl_message_set_body(m, body);
   owl_message_set_zsig(m, owl_zwrite_get_zsig(z));
   /* save the hostname */
   owl_message_set_hostname(m, g_get_host_name());
 …
   int i;
   owl_pair *p;
 #ifdef HAVE_LIBZEPHYR
+#ifdef HAVE_LIBZEPHYR
   if (m->has_notice) {
     ZFreeNotice(&(m->notice));
 …
   g_ptr_array_free(m->attributes, true);
   owl_message_invalidate_format(m);
+}

msgwin.c

rd4927a7	r7869e48
19	19	werase(curswin);
20	20	if (msgwin->msg)
21		waddstr(curswin, msgwin->msg);
	21	waddstr(curswin, msgwin->msg);
22	22	}
23	23

owl.c

-                      r4d9e311c
+                      r7869e48
       char utf8buf[7];
       memset(utf8buf, '\0', 7);
       utf8buf[0] = j.ch;
       if ((j.ch & 0xc0) && (~j.ch & 0x20)) bytes = 2;
       else if ((j.ch & 0xe0) && (~j.ch & 0x10)) bytes = 3;
 …
       else if ((j.ch & 0xfc) && (~j.ch & 0x02)) bytes = 6;
       else bytes = 1;
       for (i = 1; i < bytes; i++) {
         int tmp = wgetch(g->input_pad);
 …
         utf8buf[i] = tmp;
+      }
       if (j.ch != ERR) {
         if (g_utf8_validate(utf8buf, -1, NULL)) {
 …
   /* Send a message to the main thread. */
   owl_select_post_task(sig_handler_main_thread,
                        GINT_TO_POINTER(siginfo->si_signo),
+                       GINT_TO_POINTER(siginfo->si_signo),
                        NULL, g_main_context_default());
+}
 …
 #if OWL_STDERR_REDIR
 /* Replaces stderr with a pipe so that we can read from it.
+/* Replaces stderr with a pipe so that we can read from it.
  * Returns the fd of the pipe from which stderr can be read. */
 int stderr_replace(void)

owl.h

-                      rc42a8d1
+                      r7869e48
 #endif /* !OWL_VERSION_STRING */
 /* Feature that is being tested to redirect stderr through a pipe.
+/* Feature that is being tested to redirect stderr through a pipe.
  * There may still be some portability problems with this. */
 #define OWL_STDERR_REDIR 1
 …
   int  (*validate_fn)(const struct _owl_variable *v, const void *newval);
                                 /* returns 1 if newval is valid */
   int  (*set_fn)(struct _owl_variable *v, const void *newval);
+  int  (*set_fn)(struct _owl_variable *v, const void *newval);
                                 /* sets the variable to a value
                                  * of the appropriate type.
                                  * unless documented, this
                                  * should make a copy.
+                                 * unless documented, this
+                                 * should make a copy.
                                  * returns 0 on success. */
   int  (*set_fromstring_fn)(struct _owl_variable *v, const char *newval);
                                 /* sets the variable to a value
                                  * of the appropriate type.
                                  * unless documented, this
                                  * should make a copy.
+                                 * unless documented, this
+                                 * should make a copy.
                                  * returns 0 on success. */
   const void *(*get_fn)(const struct _owl_variable *v);
 …
   char *cmd_aliased_to;         /* what this command is aliased to... */
   /* These don't take any context */
   CALLER_OWN char *(*cmd_args_fn)(int argc, const char *const *argv, const char *buff);
 …
   owl_window *cmdwin;
 } owl_viewwin;
 typedef struct _owl_popwin {
   owl_window *border;
 …
   gulong sig_resize_id;
 } owl_popwin;
 typedef struct _owl_msgwin {
   char *msg;

perl/lib/BarnOwl.pm

rb303ba2	r7869e48
661	661	=head3 random_zephyr_signature
662	662
663		Retrieve a random line from ~/.zsigs (except those beginning with '#')
	663	Retrieve a random line from ~/.zsigs (except those beginning with '#')
664	664	and use it as the zephyr signature.
665	665

perl/lib/BarnOwl/Complete/Filter.pm

r6dba228	r7869e48
81	81	return $INCOMPLETE if $i == $INCOMPLETE;
82	82	}
83
	83
84	84	return $i; # Well, it looks like we're happy
85	85	# (Actually, I'm pretty sure this never happens...)

perl/lib/BarnOwl/Completion/Util.pm

-                      re6cec01
+                      r7869e48
     my ($pfx, $base) = splitfile($string);
     opendir(my $dh, $dir) or return;
     my @dirs = readdir($dh);
 …
             next;
+        }
         my ($text, $value, $done) = ($d, "${pfx}${d}", 1);

perl/lib/BarnOwl/Hooks.pm

-                      rb8a3e00
+                      r7869e48
 C<BarnOwl::Hooks> exports a set of C<BarnOwl::Hook> objects made
 available by BarnOwl internally.
+available by BarnOwl internally.
 =head2 USAGE
 …
         package BarnOwl;
         if(*BarnOwl::format_msg{CODE}) {
             # if the config defines a legacy formatting function, add 'perl' as a style
+            # if the config defines a legacy formatting function, add 'perl' as a style
             BarnOwl::create_style("perl", BarnOwl::Style::Legacy->new(
                 "BarnOwl::format_msg",
 …
         BarnOwl::error("Can't load BarnOwl::ModuleLoader, loadable module support disabled:\n$@");
+    }
     $mainLoop->check_owlconf();
     $startup->run(0);
 …
 sub _shutdown {
     $shutdown->run;
     BarnOwl::shutdown() if *BarnOwl::shutdown{CODE};
+}
 …
     $receiveMessage->run($m);
     BarnOwl::receive_msg($m) if *BarnOwl::receive_msg{CODE};
+}
 …
     $newMessage->run($m);
     BarnOwl::new_msg($m) if *BarnOwl::new_msg{CODE};
+}

perl/lib/BarnOwl/Message/Zephyr.pm

r6401db3	r7869e48
165	165	} elsif($sender && !$self->is_private) {
166	166	# Possible future feature: (Optionally?) include the class and/or
167		# instance of the message being replied to in the instance of the
	167	# instance of the message being replied to in the instance of the
168	168	# outgoing personal reply
169	169	$class = 'MESSAGE';

perl/modules/Facebook/lib/Facebook/Graph.pm

-                      r5ef98c7
+                      r7869e48
+}
 sub authorize {
+sub authorize {
     my ($self) = @_;
     return Facebook::Graph::Authorize->new(
 …
  my $sarah_bownds = $fb->fetch('sarahbownds');
  my $perl_page = $fb->fetch('16665510298');
 Or better yet:
 …
     ->request
     ->as_hashref;
  my $sarahs_picture_uri = $fb->picture('sarahbownds')->get_large->uri_as_string;
 …
     ->request('https://graph.facebook.com/btaylor')
     ->as_hashref;
 =head2 Building A Privileged App
 …
  my $q = Plack::Request->new($env);
  $fb->request_access_token($q->query_param('code'));
 Or if you already had the access token:
  $fb->access_token($token);
 Get some info:
 …
  my $sarah = $fb->fetch('sarahbownds');
  my $sarah = $fb->query->find('sarahbownds')->request->as_hashref;

perl/modules/Facebook/lib/Facebook/Graph/Cookbook/Recipe1.pod

-                      r2a42248
+                      r7869e48
  my $urlmap = Plack::App::URLMap->new;
  # your code will go here
  $urlmap->to_app;
 All the code we have you add should go in the C<# your code will go here> block, in the order that we have you add it.
+All the code we have you add should go in the C<# your code will go here> block, in the order that we have you add it.
 =head2 Step 6: Create your Facebook::Graph object.
 …
     secret      => 'Put Your Application Secret Here',
  );
 Now you need the URL you entered in step 3, and the application ID and secret you got in step 4.
 …
  sudo plackup --port 80 app.psgi
 Now we point our browser to:
  http://www.yourapplication.com/facebook
 Voila! You have created an authenticated Facebook app. If you would like to see this full program check out C<eg/recipe1.psgi> inside this distribution of L<Facebook::Graph>.
 …
 =head1 CAVEATS
 You should never design an application using all the poor stuff we've done here, like using a shared L<Facebook::Graph> object, not using a Framework/CMS or at least L<Plack::Builder>, not using a templating system, passing the offline access token through the URL, etc. We've made comments about these things as we did them to warn you. These choices were made here B<only> because this is example code who's primary purpose is to show you how to use L<Facebook::Graph>, and not best practices for web development.
+You should never design an application using all the poor stuff we've done here, like using a shared L<Facebook::Graph> object, not using a Framework/CMS or at least L<Plack::Builder>, not using a templating system, passing the offline access token through the URL, etc. We've made comments about these things as we did them to warn you. These choices were made here B<only> because this is example code who's primary purpose is to show you how to use L<Facebook::Graph>, and not best practices for web development.
 =head1 SEE ALSO

perl/modules/Facebook/lib/Facebook/Graph/Cookbook/Recipe2.pod

-                      r2a42248
+                      r7869e48
 You'll need to have all of the following modules installed in order to run this app (in addition to L<Facebook::Graph>):
 L<DateTime::Format::ICal> L<Dancer> L<Template> L<Data::ICal> L<XML::FeedPP>
+L<DateTime::Format::ICal> L<Dancer> L<Template> L<Data::ICal> L<XML::FeedPP>
 =head2 Assumptions
 …
  mkdir -p /opt/webapp
  cp -Rfp Facebook-Graph/eg/recipe2/* /opt/webapp
 =head2 Step 6: Configure your app.
 …
  vi config.yml
 Specifically we need to set the C<app_id> and C<secret> fields with information from our Facebook application settings page. And we need to update the C<postback> with the domain pointing to our server.
+Specifically we need to set the C<app_id> and C<secret> fields with information from our Facebook application settings page. And we need to update the C<postback> with the domain pointing to our server.
 =head2 Step 7: Start it.

perl/modules/Facebook/lib/Facebook/Graph/Picture.pm

r2a42248	r7869e48
63	63
64	64	my $fb = Facebook::Graph->new;
65
	65
66	66	my $default_picture = $fb->picture('16665510298')->uri_as_string;
67	67	my $large_picture = $fb->picture('16665510298')->get_large->uri_as_string;

perl/modules/Facebook/lib/Facebook/Graph/Publish.pm

rfe03126	r7869e48
77	77	=head1 DESCRIPTION
78	78
79		This module shouldn't be used by you directly for any purpose.
	79	This module shouldn't be used by you directly for any purpose.
80	80
81	81	=head1 LEGAL

perl/modules/Facebook/lib/Facebook/Graph/Publish/Event.pm

-                      r2a42248
+                      r7869e48
  {"id":"1647395831_130068550371568"}
 =head1 TODO

perl/modules/Facebook/lib/Facebook/Graph/Publish/Post.pm

-                      r2a42248
+                      r7869e48
 =head2 set_privacy ( setting, options )
 A completely optional privacy setting.
+A completely optional privacy setting.
 =head2 set_properties ( properties )
 …
  $post->set_target_countries( ['US'] );
 =head3 countries
 …
  $post->set_target_regions( [6,53] );
 =head3 regions
 …
  $post->set_target_cities( [2547804] );
 =head3 cities
 …
  $post->set_target_locales( [6] );
 =head3 locales

perl/modules/Facebook/lib/Facebook/Graph/Query.pm

-                      rb7fa912
+                      r7869e48
     my ($self, $limit) = @_;
     $self->limit($limit);
     return $self;
+    return $self;
+}
 …
     my ($self, $offset) = @_;
     $self->offset($offset);
     return $self;
+    return $self;
+}
 …
  my $fb = Facebook::Graph->new;
  my $perl_page = $fb->find('16665510298')
     ->include_metadata
     ->request
     ->as_hashref;
  my $sarah_bownds = $fb->find('sarahbownds')
     ->select_fields(qw(id name))
 …
     ->request
     ->as_hashref;
 The above query, if you were read it like text, says: "Give me the user ids and full names of all users named Dave that have been created since yesterday, and limit the result set to the first 25."
 …
 =head2 search ( query, context )
 Perform a keyword search on a group of items.
+Perform a keyword search on a group of items.
 If you prefer not to search by keyword see the C<from> method.

perl/modules/Facebook/lib/Facebook/Graph/Role/Uri.pm

r2a42248	r7869e48
24	24	=head1 DESCRIPTION
25	25
26		Provides a C<uri> method in any class which returns a L<URI> object that points to the Facebook Graph API.
	26	Provides a C<uri> method in any class which returns a L<URI> object that points to the Facebook Graph API.
27	27
28	28	=head1 LEGAL

perl/modules/IRC/inc/Module/Install/Fetch.pm

-                      r43c62e4
+                      r7869e48
 sub get_file {
     my ($self, %args) = @_;
     my ($scheme, $host, $path, $file) =
+    my ($scheme, $host, $path, $file) =
         $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
 …
         $args{url} = $args{ftp_url}
             or (warn("LWP support unavailable!\n"), return);
         ($scheme, $host, $path, $file) =
+        ($scheme, $host, $path, $file) =
             $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
+    }

perl/modules/IRC/inc/Module/Install/Makefile.pm

-                      r43c62e4
+                      r7869e48
         my $clean = $self->makemaker_args->{clean} ||= {};
         %$clean = (
                 %$clean,
+                %$clean,
                 FILES => join(' ', grep length, $clean->{FILES}, @_),
         );
 …
         my $realclean = $self->makemaker_args->{realclean} ||= {};
         %$realclean = (
                 %$realclean,
+                %$realclean,
                 FILES => join(' ', grep length, $realclean->{FILES}, @_),
         );
 …
         my $top_version   = $self->_top->VERSION || '';
         my $preamble = $self->preamble
+        my $preamble = $self->preamble
                 ? "# Preamble by $top_class $top_version\n"
                         . $self->preamble

perl/modules/IRC/inc/Module/Install/Metadata.pm

r43c62e4	r7869e48
282	282	$author =~ s{E<lt>}{<}g;
283	283	$author =~ s{E<gt>}{>}g;
284		$self->author($author);
	284	$self->author($author);
285	285	}
286	286	else {

perl/modules/IRC/inc/Module/Install/Win32.pm

r43c62e4	r7869e48
17	17	$self->load('can_run');
18	18	$self->load('get_file');
19
	19
20	20	require Config;
21	21	return unless (

perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm

-                      r13ee8f2
+                      r7869e48
         $self->{reconnect_timer}->stop;
+    }
     $self->{reconnect_timer} =
+    $self->{reconnect_timer} =
         BarnOwl::Timer->new( {
             name  => 'IRC (' . $self->alias . ') reconnect_timer',
 …
     $body =~ s/\cC\d+(?:,\d+)?//g;
     $body =~ s/\cO//g;
     my @pieces = split /\cB/, $body;
     my $out = '';

perl/modules/Jabber/inc/Module/Install/Fetch.pm

-                      r300b470
+                      r7869e48
 sub get_file {
     my ($self, %args) = @_;
     my ($scheme, $host, $path, $file) =
+    my ($scheme, $host, $path, $file) =
         $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
 …
         $args{url} = $args{ftp_url}
             or (warn("LWP support unavailable!\n"), return);
         ($scheme, $host, $path, $file) =
+        ($scheme, $host, $path, $file) =
             $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
+    }

perl/modules/Jabber/inc/Module/Install/Makefile.pm

-                      r300b470
+                      r7869e48
     my $clean = $self->makemaker_args->{clean} ||= {};
     %$clean = (
         %$clean,
+        %$clean,
         FILES => join(' ', grep length, $clean->{FILES}, @_),
     );
 …
     my $realclean = $self->makemaker_args->{realclean} ||= {};
     %$realclean = (
         %$realclean,
+        %$realclean,
         FILES => join(' ', grep length, $realclean->{FILES}, @_),
     );
 …
     my $top_version   = $self->_top->VERSION || '';
     my $preamble = $self->preamble
+    my $preamble = $self->preamble
         ? "# Preamble by $top_class $top_version\n"
             . $self->preamble

perl/modules/Jabber/inc/Module/Install/Metadata.pm

r300b470	r7869e48
273	273	$author =~ s{E<lt>}{<}g;
274	274	$author =~ s{E<gt>}{>}g;
275		$self->author($author);
	275	$self->author($author);
276	276	}
277	277	else {

perl/modules/Jabber/inc/Module/Install/Win32.pm

r300b470	r7869e48
17	17	$self->load('can_run');
18	18	$self->load('get_file');
19
	19
20	20	require Config;
21	21	return unless (

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

r678f607	r7869e48
1050	1050	sid => $sid } );
1051	1051	$jhash{type} = 'admin';
1052
	1052
1053	1053	BarnOwl::queue_message( BarnOwl::Message->new(%jhash) );
1054	1054	}

perl/modules/Jabber/lib/Net/Jabber/Client.pm

rc2bed55	r7869e48
70	70	use Net::Jabber::Protocol;
71	71	use base qw( Net::XMPP::Client Net::Jabber::Protocol );
72		use vars qw( $VERSION );
	72	use vars qw( $VERSION );
73	73
74	74	$VERSION = "2.0";

perl/modules/Jabber/lib/Net/Jabber/Component.pm

-                      ra8c55b5
+                      r7869e48
                                       defaults for the two are localhost
                                       and 5269.
                                       Note: A change from previous
                                       versions is that Component now
 …
    - Status ok, no data received.
                          undef - Status not ok, stop processing.
                        IMPORTANT: You need to check the output of every
                        Process.  If you get an undef then the connection
 …
     bless($self, $proto);
     $self->init(@_);
     $self->{SERVER}->{port} = 5269;
     $self->{SERVER}->{namespace} = "jabber:component:accept";
     $self->{SERVER}->{allow_register} = 0;
     return $self;
+}
 …
     my $self = shift;
     my (%args) = @_;
     $self->{STREAM}->SetCallBacks(node=>undef);
 …
     my $self = shift;
     my (%args) = @_;
     my %connect;
     $connect{componentname}  = $args{componentname};
 …
     $connect{tls}            = $args{tls}            if exists($args{tls});
     return %connect;
+}

perl/modules/Jabber/lib/Net/Jabber/Data.pm

rcdd3959	r7869e48
44	44	jabber:iq:roster
45	45
46		For more information on what these namespaces are for, visit
	46	For more information on what these namespaces are for, visit
47	47	http://www.jabber.org and browse the Jabber Programmers Guide.
48	48

perl/modules/Jabber/lib/Net/Jabber/Dialback/Result.pm

-                      rc2bed55
+                      r7869e48
 =head2 Test functions
   DefinedTo() - returns 1 if the to attribute is defined in the
+  DefinedTo() - returns 1 if the to attribute is defined in the
                 <db:result/>, 0 otherwise.
   DefinedFrom() - returns 1 if the from attribute is defined in the
+  DefinedFrom() - returns 1 if the from attribute is defined in the
                   <db:result/>, 0 otherwise.
   DefinedType() - returns 1 if the type attribute is defined in the
+  DefinedType() - returns 1 if the type attribute is defined in the
                   <db:result/>, 0 otherwise.

perl/modules/Jabber/lib/Net/Jabber/Dialback/Verify.pm

-                      rc2bed55
+                      r7869e48
 =head2 Test functions
   DefinedTo() - returns 1 if the to attribute is defined in the
+  DefinedTo() - returns 1 if the to attribute is defined in the
                 <db:verify/>, 0 otherwise.
   DefinedFrom() - returns 1 if the from attribute is defined in the
+  DefinedFrom() - returns 1 if the from attribute is defined in the
                   <db:verify/>, 0 otherwise.
   DefinedType() - returns 1 if the type attribute is defined in the
+  DefinedType() - returns 1 if the type attribute is defined in the
                   <db:verify/>, 0 otherwise.
   DefinedID() - returns 1 if the id attribute is defined in the
+  DefinedID() - returns 1 if the id attribute is defined in the
                   <db:verify/>, 0 otherwise.

perl/modules/Jabber/lib/Net/Jabber/IQ.pm

-                      rc2bed55
+                      r7869e48
 sub DefinedQuery { my $self = shift; $self->DefinedChild(@_); }
 sub NewQuery     { my $self = shift; $self->RemoveFirstChild(); $self->NewFirstChild(@_);     }
 sub AddQuery     { my $self = shift; $self->AddChild(@_);     }
+sub AddQuery     { my $self = shift; $self->AddChild(@_);     }
 sub RemoveQuery  { my $self = shift; $self->RemoveFirstChild(@_);  }
 …
 sub DefinedX { my $self = shift; $self->DefinedChild(@_); }
 sub NewX     { my $self = shift; $self->NewChild(@_);     }
 sub AddX     { my $self = shift; $self->AddChild(@_);     }
+sub AddX     { my $self = shift; $self->AddChild(@_);     }
 sub RemoveX  { my $self = shift; $self->RemoveChild(@_);  }

perl/modules/Jabber/lib/Net/Jabber/Key.pm

-                      ra8c55b5
+                      r7869e48
     new(debug=>string,       - creates the Key object.  debug should
         debugfh=>FileHandle,   be set to the path for the debug
         debuglevel=>integer)   log to be written.  If set to "stdout"
+        debuglevel=>integer)   log to be written.  If set to "stdout"
                                then the debug will go there.  Also, you
                                can specify a filehandle that already
 …
                  time and the PID.
     Create(cacheString) - generates a key and caches it with the key
+    Create(cacheString) - generates a key and caches it with the key
                           of cacheString.  Create returns the key.
 …
     $self->{VERSION} = $VERSION;
     $self->{CACHE} = {};
 …
 ###########################################################################
+#
 # Generate - returns a random string based on the PID and time and a
 #            random number.  Then it creates an SHA1 Digest of that
+# Generate - returns a random string based on the PID and time and a
+#            random number.  Then it creates an SHA1 Digest of that
 #            string and returns it.
+#

perl/modules/Jabber/lib/Net/Jabber/Log.pm

-                      rc2bed55
+                      r7869e48
   Net::Jabber::Log is a companion to the Net::Jabber module.
   It provides the user a simple interface to set and retrieve all
+  It provides the user a simple interface to set and retrieve all
   parts of a Jabber Log.
 =head1 DESCRIPTION
   To initialize the Log with a Jabber <log/> you must pass it the
+  To initialize the Log with a Jabber <log/> you must pass it the
   XML::Parser Tree array.  For example:
 …
   GetFrom()      -  returns either a string with the Jabber Identifier,
   GetFrom("jid")    or a Net::Jabber::JID object for the person who
                     sent the <log/>.  To get the JID object set
                     the string to "jid", otherwise leave blank for the
+                    sent the <log/>.  To get the JID object set
+                    the string to "jid", otherwise leave blank for the
                     text string.
 …
   SetFrom(string) - sets the from attribute.  You can either pass a string
   SetFrom(JID)      or a JID object.  They must be valid Jabber
+  SetFrom(JID)      or a JID object.  They must be valid Jabber
                     Identifiers or the server will return an error log.
                     (ie.  jabber:bob@jabber.org/Silent Bob, etc...)
 …
                     notice     general logging
                     warn       warning
                     alert      critical error (can still run but not
+                    alert      critical error (can still run but not
                                correctly)
                     error      fatal error (cannot run anymore)
 …
 =head2 Test functions
   DefinedFrom() - returns 1 if the from attribute is defined in the
+  DefinedFrom() - returns 1 if the from attribute is defined in the
                   <log/>, 0 otherwise.
   DefinedType() - returns 1 if the type attribute is defined in the
+  DefinedType() - returns 1 if the type attribute is defined in the
                   <log/>, 0 otherwise.
 …
     my $class = ref($proto) || $proto;
     my $self = { };
     $self->{VERSION} = $VERSION;
     $self->{TIMESTAMP} = &Net::Jabber::GetTimeStamp("local");
 …
     $type = "" unless defined($type);
     my $treeName = "LOG";
     return "log" if ($AUTOLOAD eq "GetTag");
     return &XML::Stream::BuildXML(@{$self->{$treeName}}) if ($AUTOLOAD eq "GetXML");

perl/modules/Jabber/lib/Net/Jabber/Message.pm

-                      rc2bed55
+                      r7869e48
 $VERSION = "2.0";
 sub GetX     { my $self = shift; $self->GetChild(@_);    }
+sub GetX     { my $self = shift; $self->GetChild(@_);    }
 sub DefinedX { my $self = shift; $self->DefinedChild(@_); }
 sub NewX     { my $self = shift; $self->NewChild(@_);    }
 sub AddX     { my $self = shift; $self->AddChild(@_);    }
+sub AddX     { my $self = shift; $self->AddChild(@_);    }
 sub RemoveX  { my $self = shift; $self->RemoveChild(@_); }

perl/modules/Jabber/lib/Net/Jabber/Namespaces.pm

rc2bed55	r7869e48
487	487	);
488	488	}
489
	489
490	490	#-----------------------------------------------------------------------------
491	491	# __netjabber__:iq:rpc:methodResponse
…	…
514	514	);
515	515	}
516
	516
517	517	#-----------------------------------------------------------------------------
518	518	# __netjabber__:iq:rpc:fault
…	…
535	535	);
536	536	}
537
	537
538	538	#-----------------------------------------------------------------------------
539	539	# __netjabber__:iq:rpc:params
…	…
581	581	);
582	582	}
583
	583
584	584	#-----------------------------------------------------------------------------
585	585	# __netjabber__:iq:rpc:value
…	…
805	805	);
806	806	}
807
	807
808	808	#-----------------------------------------------------------------------------
809	809	# jabber:iq:version
…	…
848	848	);
849	849	}
850
	850
851	851	#-----------------------------------------------------------------------------
852	852	# jabber:x:conference
…	…
969	969	);
970	970	}
971
	971
972	972	#-----------------------------------------------------------------------------
973	973	# __netjabber__:x:data:item
…	…
1061	1061	);
1062	1062	}
1063
	1063
1064	1064	#-----------------------------------------------------------------------------
1065	1065	# jabber:x:event
…	…
1152	1152	);
1153	1153	}
1154
	1154
1155	1155	#-----------------------------------------------------------------------------
1156	1156	# __netjabber__:x:roster:item
…	…
1396	1396	);
1397	1397	}
1398
	1398
1399	1399	#-----------------------------------------------------------------------------
1400	1400	# __netjabber__:iq:disco:items:item
…	…
1433	1433	);
1434	1434	}
1435
	1435
1436	1436	#-----------------------------------------------------------------------------
1437	1437	# http://jabber.org/protocol/muc
…	…
1472	1472	},
1473	1473	);
1474
	1474
1475	1475	}
1476	1476

perl/modules/Jabber/lib/Net/Jabber/Presence.pm

-                      rc2bed55
+                      r7869e48
 $VERSION = "2.0";
 sub GetX     { my $self = shift; $self->GetChild(@_);    }
+sub GetX     { my $self = shift; $self->GetChild(@_);    }
 sub DefinedX { my $self = shift; $self->DefinedChild(@_); }
 sub NewX     { my $self = shift; $self->NewChild(@_);    }
 sub AddX     { my $self = shift; $self->AddChild(@_);    }
+sub AddX     { my $self = shift; $self->AddChild(@_);    }
 sub RemoveX  { my $self = shift; $self->RemoveChild(@_); }

perl/modules/Jabber/lib/Net/Jabber/Protocol.pm

-                      rcdd3959
+                      r7869e48
             comes back.  You can optionally specify a timeout so that
             you do not block forever.
     nonblock - send the packet with an ID, but then return that id and
                control to the master program.  Net::Jabber is still
 …
                combined with the XPath function because you can register
                a one shot function tied to the id you get back.
 =head2 Basic Functions
 …
 =head2 Bystreams Functions
     %hash = $Con->ByteStreamsProxyRequest(jid=>"proxy.server");
+    %hash = $Con->ByteStreamsProxyRequest(jid=>"proxy.server");
     %hash = $Con->ByteStreamsProxyRequest(jid=>"proxy.server",
                                           timeout=>10);
+                                          timeout=>10);
     $id = $Con->ByteStreamsProxyRequest(jid=>"proxy.server",
 …
                                         mode=>"passthru");
     %hash = $Con->ByteStreamsProxyParse($query);
     $status = $Con->ByteStreamsProxyActivate(sid=>"stream_id",
                                              jid=>"proxy.server");
+                                             jid=>"proxy.server");
     $status = $Con->ByteStreamsProxyActivate(sid=>"stream_id",
                                              jid=>"proxy.server",
                                             timeout=>10);
+                                            timeout=>10);
     $id = $Con->ByteStreamsProxyActivate(sid=>"stream_id",
 …
     $id = $Con->ByteStreamsProxyActivate(sid=>"stream_id",
                                          jid=>"proxy.server",
                                         mode=>"passthru");
+                                        mode=>"passthru");
 …
                                                 ...
                                                ],
                                   jid=>"bob\@jabber.org");
+                                  jid=>"bob\@jabber.org");
     $jid = $Con->ByteStreamsOffer(sid=>"stream_id",
                                   streamhosts=>[{},{},...],
                                   jid=>"bob\@jabber.org",
                                   timeout=>10);
+                                  timeout=>10);
     $id = $Con->ByteStreamsOffer(sid=>"stream_id",
 …
                                  jid=>"bob\@jabber.org",
                                  mode=>"passthru");
 =head2 Disco Functions
 …
                                  mode=>"passthru");
     %hash = $Con->DiscoInfoParse($query);
 …
                                   mode=>"passthru");
     %hash = $Con->DiscoItemsParse($query);
 =head2 Feature Negotiation Functions
     %hash = $Con->FeatureNegRequest(jid=>"jabber.org",
                                     features=>{ feat1=>["opt1","opt2",...],
 …
     $iq->AddQuery($query);
     %hash = $Con->FeatureNegParse($query);
+    %hash = $Con->FeatureNegParse($query);
 =head2 File Transfer Functions
 …
                                     See DiscoInfoParse for the format
                                     of the resulting tree.
                                     See MODES above for using the mode
                                     and timeout.
 …
              $info{feature}->{http://jabber.org/protocol/disco#info} = 1;
              $info{feature}->{http://jabber.org/protocol/muc#admin} = 1;
     DiscoItemsRequest(jid=>string, - sends a disco#items request to
                       mode=>string,  the jid passed as an argument.
 …
                                      See DiscoItemsParse for the format
                                      of the resulting tree.
                                      See MODES above for using the mode
                                      and timeout.
 …
                                            See DiscoInfoQuery for the format
                                            of the features hash ref.
                                            See DiscoInfoParse for the format
                                            of the resulting tree.
                                            See MODES above for using the mode
                                            and timeout.
 …
             params=>array,        to the specified address.  Returns
             mode=>string,         the above data from RPCParse.
             timeout=>int)
+            timeout=>int)
                                   See MODES above for using the mode
                                   and timeout.
 …
                                  present are the required fields the
                                  server needs.
                                  See MODES above for using the mode
                                  and timeout.
 …
     croak("You must specify functions=>'' for the function call to DefineNamespace")
         if !exists($args{functions});
     my %xpath;
 …
                             $xpath{$name}->{$type}->{skip_xmlns} = 1;
+                        }
                         if ($funcHash{$type}->[$i] eq "__netjabber__:specifyname")
+                        {
 …
             next;
+        }
         my $type = $funcHash{set}->[0];
         my $xpath = $funcHash{set}->[1];
 …
             next;
+        }
         if ($type eq "scalar")
+        {
 …
             next;
+        }
         if ($type eq "flag")
+        {
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
 ###############################################################################
 sub BrowseParse
+{
+{
     my $self = shift;
     my $item = shift;
 …
 ###############################################################################
+#
 # ByteStreamsProxyRequest - This queries a proxy server to get a list of
+# ByteStreamsProxyRequest - This queries a proxy server to get a list of
+#
 ###############################################################################
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
         push(@hosts,\%host);
+    }
     return \@hosts;
+}
 …
 ###############################################################################
+#
 # ByteStreamsProxyActivate - This tells a proxy to activate the connection
+# ByteStreamsProxyActivate - This tells a proxy to activate the connection
+#
 ###############################################################################
 …
                            activate=>(ref($args{recipient}) eq "Net::Jabber::JID" ? $args{recipient}->GetJID("full") : $args{recipient})
                          );
     #--------------------------------------------------------------------------
     # Send the IQ with the next available ID and wait for a reply with that
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
     $iq = $self->SendAndReceiveWithID($iq,$timeout);
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
         $disco{feature}->{$feat->GetVar()} = 1;
+    }
     return \%disco;
+}
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
         $disco{$item->GetJID()}->{$item->GetNode()} = $item->GetName();
+    }
     return \%disco;
+}
 …
     $iq->AddQuery($query);
     #--------------------------------------------------------------------------
     # Send the IQ with the next available ID and wait for a reply with that
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
     $tag = $Net::Jabber::Query::TAGS{'http://jabber.org/protocol/feature-neg'}
         if exists($Net::Jabber::Query::TAGS{'http://jabber.org/protocol/feature-neg'});
     my $query = Net::Jabber::Query->new($tag);
     $query->SetXMLNS("http://jabber.org/protocol/feature-neg");
     my $xdata = $query->NewX("jabber:x:data");
     foreach my $feature (keys(%{$features}))
+    {
 …
     my $xdata = $item->GetX("jabber:x:data");
     foreach my $field ($xdata->GetFields())
+    {
         my @options;
         foreach my $option ($field->GetOptions())
+        {
 …
         if ($#options == -1)
+        {
             $feats{$field->GetVar()} = $field->GetValue();
+        }
 …
+        }
+    }
     return \%feats;
+}
 …
     $profile->SetFile(desc=>$args{desc}) if exists($args{desc});
     $query->SetStream(mimetype=>(-B $args{filename} ?
+    $query->SetStream(mimetype=>(-B $args{filename} ?
                                     "application/octect-stream" :
                                     "text/plain"
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
         return %tree;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
     $tree->{size} += (-s $path);
     opendir(DIR, $path);
     foreach my $file ( sort {$a cmp $b} readdir(DIR) )
 …
+        {
             $tree->{size} += (-s "$path/$file");
             $tree->{tree}->{"$path/$file"}->{order} = $tree->{counter};
             $tree->{tree}->{"$path/$file"}->{sid} =
 …
     my $waitforid = delete($args{waitforid});
     $args{mode} = "block" if $waitforid;
     my $timeout = exists($args{timeout}) ? delete($args{timeout}) : undef;
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
     my $waitforid = delete($args{waitforid});
     $args{mode} = "block" if $waitforid;
     my $timeout = exists($args{timeout}) ? delete($args{timeout}) : undef;
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
         $x->SetMUC(password=>$args{password});
+    }
     return $presence->GetXML() if exists($args{'__netjabber__:test'});
     $self->Send($presence);
 …
                     $target->{form}->[$order]->{value} = ($field->GetValue())[0];
+                }
+            }
+            }
             my $count = 0;
             foreach my $option ($field->GetOptions())
 …
     $body .=   "Time: ".$query->GetDisplay()."\n";
     $body .=   "Timezone: ".$query->GetTZ()."\n";
     my $message = $self->_message();
     $message->SetMessage(to=>$iq->GetTo(),
 …
             if ($query->DefinedMessage());
+    }
     my $message = $self->_message();
     $message->SetMessage(from=>$iq->GetFrom(),

perl/modules/Jabber/lib/Net/Jabber/Server.pm

-                      rc2bed55
+                      r7869e48
     %status = $Server->Process();
     %status = $Server->Process(5);
     $Server->Stop();
 …
    - Status ok, no data received.
                          undef - Status not ok, stop processing.
                        IMPORTANT: You need to check the output of every
                        Process.  If you get an undef then the connection

perl/modules/Jabber/lib/Net/Jabber/Stanza.pm

-                      rc2bed55
+                      r7869e48
 =pod
   For more information on what these namespaces are for, visit
+  For more information on what these namespaces are for, visit
   http://www.jabber.org and browse the Jabber Programmers Guide.
 …
   ny:private:ns
   Name                        Type     Get  Set  Remove  Defined  Add
   ==========================  =======  ===  ===  ======  =======  ===
   Foo                         scalar    X    X     X        X
   Bar                         child                                X
+  Bar                         child                                X
   Bars                        child     X
   Test                        master    X    X
 …
     GetFoo(), SetFoo(), RemoveFoo(), DefinedFoo()
     AddBar()
     GetBars(), DefinedBars()
     GetTest(), SetMaster()
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Activate                    scalar      X    X     X        X
   SID                         scalar      X    X     X        X
   StreamHostUsedJID           jid         X    X     X        X
   StreamHost                  child                                  X
   StreamHosts                 child       X          X        X
   ByteStreams                 master      X    X
+  Activate                    scalar      X    X     X        X
+  SID                         scalar      X    X     X        X
+  StreamHostUsedJID           jid         X    X     X        X
+  StreamHost                  child                                  X
+  StreamHosts                 child       X          X        X
+  ByteStreams                 master      X    X
 =head1 http://jabber.org/protocol/bytestreams - streamhost objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Host                        scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Port                        scalar      X    X     X        X
   ZeroConf                    scalar      X    X     X        X
   StreamHost                  master      X    X
+  Host                        scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Port                        scalar      X    X     X        X
+  ZeroConf                    scalar      X    X     X        X
+  StreamHost                  master      X    X
 =head1 http://jabber.org/protocol/commands
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Action                      scalar      X    X     X        X
   Node                        scalar      X    X     X        X
   SessionID                   scalar      X    X     X        X
   Status                      scalar      X    X     X        X
   Note                        child                                  X
   Notes                       child       X          X        X
   Command                     master      X    X
+  Action                      scalar      X    X     X        X
+  Node                        scalar      X    X     X        X
+  SessionID                   scalar      X    X     X        X
+  Status                      scalar      X    X     X        X
+  Note                        child                                  X
+  Notes                       child       X          X        X
+  Command                     master      X    X
 =head1 http://jabber.org/protocol/commands - note objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Message                     scalar      X    X     X        X
   Type                        scalar      X    X     X        X
   Note                        master      X    X
+  Message                     scalar      X    X     X        X
+  Type                        scalar      X    X     X        X
+  Note                        master      X    X
 =head1 http://jabber.org/protocol/disco#info
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Feature                     child                                  X
   Features                    child       X          X        X
   Identities                  child       X          X        X
   Identity                    child                                  X
   DiscoInfo                   master      X    X
+  Node                        scalar      X    X     X        X
+  Feature                     child                                  X
+  Features                    child       X          X        X
+  Identities                  child       X          X        X
+  Identity                    child                                  X
+  DiscoInfo                   master      X    X
 =head1 http://jabber.org/protocol/disco#info - feature objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Var                         scalar      X    X     X        X
   Feature                     master      X    X
+  Var                         scalar      X    X     X        X
+  Feature                     master      X    X
 =head1 http://jabber.org/protocol/disco#info - identity objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Category                    scalar      X    X     X        X
   Name                        scalar      X    X     X        X
   Type                        scalar      X    X     X        X
   Identity                    master      X    X
+  Category                    scalar      X    X     X        X
+  Name                        scalar      X    X     X        X
+  Type                        scalar      X    X     X        X
+  Identity                    master      X    X
 =head1 http://jabber.org/protocol/disco#items
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Item                        child                                  X
   Items                       child       X          X        X
   DiscoItems                  master      X    X
+  Node                        scalar      X    X     X        X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  DiscoItems                  master      X    X
 =head1 http://jabber.org/protocol/disco#items - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Action                      scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Name                        scalar      X    X     X        X
   Node                        scalar      X    X     X        X
   Item                        master      X    X
+  Action                      scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Name                        scalar      X    X     X        X
+  Node                        scalar      X    X     X        X
+  Item                        master      X    X
 =head1 http://jabber.org/protocol/feature-neg
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   FeatureNeg                  master      X    X
+  FeatureNeg                  master      X    X
 =head1 http://jabber.org/protocol/muc
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Password                    scalar      X    X     X        X
   MUC                         master      X    X
+  Password                    scalar      X    X     X        X
+  MUC                         master      X    X
 =head1 http://jabber.org/protocol/muc#admin
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Item                        child                                  X
   Items                       child       X          X        X
   Admin                       master      X    X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  Admin                       master      X    X
 =head1 http://jabber.org/protocol/muc#admin - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   ActorJID                    jid         X    X     X        X
   Affiliation                 scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Nick                        scalar      X    X     X        X
   Reason                      scalar      X    X     X        X
   Role                        scalar      X    X     X        X
   Item                        master      X    X
+  ActorJID                    jid         X    X     X        X
+  Affiliation                 scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Nick                        scalar      X    X     X        X
+  Reason                      scalar      X    X     X        X
+  Role                        scalar      X    X     X        X
+  Item                        master      X    X
 =head1 http://jabber.org/protocol/muc#user
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Alt                         scalar      X    X     X        X
   Password                    scalar      X    X     X        X
   StatusCode                  scalar      X    X     X        X
   Invite                      child       X          X        X      X
   Item                        child       X          X        X      X
   User                        master      X    X
+  Alt                         scalar      X    X     X        X
+  Password                    scalar      X    X     X        X
+  StatusCode                  scalar      X    X     X        X
+  Invite                      child       X          X        X      X
+  Item                        child       X          X        X      X
+  User                        master      X    X
 =head1 http://jabber.org/protocol/muc#user - invite objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   From                        jid         X    X     X        X
   Reason                      scalar      X    X     X        X
   To                          jid         X    X     X        X
   Invite                      master      X    X
+  From                        jid         X    X     X        X
+  Reason                      scalar      X    X     X        X
+  To                          jid         X    X     X        X
+  Invite                      master      X    X
 =head1 http://jabber.org/protocol/muc#user - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   ActorJID                    jid         X    X     X        X
   Affiliation                 scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Nick                        scalar      X    X     X        X
   Reason                      scalar      X    X     X        X
   Role                        scalar      X    X     X        X
   Item                        master      X    X
+  ActorJID                    jid         X    X     X        X
+  Affiliation                 scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Nick                        scalar      X    X     X        X
+  Reason                      scalar      X    X     X        X
+  Role                        scalar      X    X     X        X
+  Item                        master      X    X
 =head1 http://jabber.org/protocol/pubsub
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Affiliations                child       X          X        X      X
   Configure                   child       X          X        X      X
   Create                      child       X          X        X      X
   Delete                      child       X          X        X      X
   Entities                    child       X          X        X      X
   Entity                      child       X          X        X      X
   Item                        child       X          X        X      X
   Items                       child       X          X        X      X
   Options                     child       X          X        X      X
   Publish                     child       X          X        X      X
   Purge                       child       X          X        X      X
   Retract                     child       X          X        X      X
   Subscribe                   child       X          X        X      X
   Unsubscribe                 child       X          X        X      X
   PubSub                      master      X    X
+  Affiliations                child       X          X        X      X
+  Configure                   child       X          X        X      X
+  Create                      child       X          X        X      X
+  Delete                      child       X          X        X      X
+  Entities                    child       X          X        X      X
+  Entity                      child       X          X        X      X
+  Item                        child       X          X        X      X
+  Items                       child       X          X        X      X
+  Options                     child       X          X        X      X
+  Publish                     child       X          X        X      X
+  Purge                       child       X          X        X      X
+  Retract                     child       X          X        X      X
+  Subscribe                   child       X          X        X      X
+  Unsubscribe                 child       X          X        X      X
+  PubSub                      master      X    X
 =head1 http://jabber.org/protocol/pubsub - affiliations objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Entity                      child       X          X        X      X
   Affiliations                master      X    X
+  Entity                      child       X          X        X      X
+  Affiliations                master      X    X
 =head1 http://jabber.org/protocol/pubsub - configure objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Configure                   master      X    X
+  Node                        scalar      X    X     X        X
+  Configure                   master      X    X
 =head1 http://jabber.org/protocol/pubsub - create objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Create                      master      X    X
+  Node                        scalar      X    X     X        X
+  Create                      master      X    X
 =head1 http://jabber.org/protocol/pubsub - delete objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Delete                      master      X    X
+  Node                        scalar      X    X     X        X
+  Delete                      master      X    X
 =head1 http://jabber.org/protocol/pubsub - entities objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Entity                      child       X          X        X      X
   Entities                    master      X    X
+  Entity                      child       X          X        X      X
+  Entities                    master      X    X
 =head1 http://jabber.org/protocol/pubsub - entity objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Affiliation                 scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Node                        scalar      X    X     X        X
   Subscription                scalar      X    X     X        X
   SubscribeOptions            child       X          X        X      X
   Entity                      master      X    X
+  Affiliation                 scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Node                        scalar      X    X     X        X
+  Subscription                scalar      X    X     X        X
+  SubscribeOptions            child       X          X        X      X
+  Entity                      master      X    X
 =head1 http://jabber.org/protocol/pubsub - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   ID                          scalar      X    X     X        X
   Payload                     raw         X    X     X        X
   Item                        master      X    X
+  ID                          scalar      X    X     X        X
+  Payload                     raw         X    X     X        X
+  Item                        master      X    X
 =head1 http://jabber.org/protocol/pubsub - items objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   MaxItems                    scalar      X    X     X        X
   Node                        scalar      X    X     X        X
   Item                        child       X          X        X      X
   Items                       master      X    X
+  MaxItems                    scalar      X    X     X        X
+  Node                        scalar      X    X     X        X
+  Item                        child       X          X        X      X
+  Items                       master      X    X
 =head1 http://jabber.org/protocol/pubsub - options objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   JID                         jid         X    X     X        X
   Node                        scalar      X    X     X        X
   Options                     master      X    X
+  JID                         jid         X    X     X        X
+  Node                        scalar      X    X     X        X
+  Options                     master      X    X
 =head1 http://jabber.org/protocol/pubsub - publish objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Item                        child       X          X        X      X
   Publish                     master      X    X
+  Node                        scalar      X    X     X        X
+  Item                        child       X          X        X      X
+  Publish                     master      X    X
 =head1 http://jabber.org/protocol/pubsub - purge objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Purge                       master      X    X
+  Node                        scalar      X    X     X        X
+  Purge                       master      X    X
 =head1 http://jabber.org/protocol/pubsub - retract objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Item                        child       X          X        X      X
   Retract                     master      X    X
+  Node                        scalar      X    X     X        X
+  Item                        child       X          X        X      X
+  Retract                     master      X    X
 =head1 http://jabber.org/protocol/pubsub - subscribe objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   JID                         jid         X    X     X        X
   Node                        scalar      X    X     X        X
   Subscribe                   master      X    X
+  JID                         jid         X    X     X        X
+  Node                        scalar      X    X     X        X
+  Subscribe                   master      X    X
 =head1 http://jabber.org/protocol/pubsub - subscribe-options objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Required                    flag        X    X     X        X
   SubscribeOptions            master      X    X
+  Required                    flag        X    X     X        X
+  SubscribeOptions            master      X    X
 =head1 http://jabber.org/protocol/pubsub - unsubscribe objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   JID                         jid         X    X     X        X
   Node                        scalar      X    X     X        X
   Unsubscribe                 master      X    X
+  JID                         jid         X    X     X        X
+  Node                        scalar      X    X     X        X
+  Unsubscribe                 master      X    X
 =head1 http://jabber.org/protocol/pubsub#event
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Delete                      child       X          X        X      X
   Items                       child       X          X        X      X
   Event                       master      X    X
+  Delete                      child       X          X        X      X
+  Items                       child       X          X        X      X
+  Event                       master      X    X
 =head1 http://jabber.org/protocol/pubsub#event - delete objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Delete                      master      X    X
+  Node                        scalar      X    X     X        X
+  Delete                      master      X    X
 =head1 http://jabber.org/protocol/pubsub#event - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   ID                          scalar      X    X     X        X
   Payload                     raw         X    X     X        X
   Item                        master      X    X
+  ID                          scalar      X    X     X        X
+  Payload                     raw         X    X     X        X
+  Item                        master      X    X
 =head1 http://jabber.org/protocol/pubsub#event - items objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Item                        child       X          X        X      X
   Items                       master      X    X
+  Node                        scalar      X    X     X        X
+  Item                        child       X          X        X      X
+  Items                       master      X    X
 =head1 http://jabber.org/protocol/pubsub#owner
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Action                      scalar      X    X     X        X
   Configure                   child       X          X        X      X
   Owner                       master      X    X
+  Action                      scalar      X    X     X        X
+  Configure                   child       X          X        X      X
+  Owner                       master      X    X
 =head1 http://jabber.org/protocol/pubsub#owner - configure objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Configure                   master      X    X
+  Node                        scalar      X    X     X        X
+  Configure                   master      X    X
 =head1 http://jabber.org/protocol/si
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   ID                          scalar      X    X     X        X
   MimeType                    scalar      X    X     X        X
   Profile                     scalar      X    X     X        X
   Stream                      master      X    X
+  ID                          scalar      X    X     X        X
+  MimeType                    scalar      X    X     X        X
+  Profile                     scalar      X    X     X        X
+  Stream                      master      X    X
 =head1 http://jabber.org/protocol/si/profile/file-transfer
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Date                        scalar      X    X     X        X
   Desc                        scalar      X    X     X        X
   Hash                        scalar      X    X     X        X
   Name                        scalar      X    X     X        X
   Range                       flag        X    X     X        X
   RangeLength                 scalar      X    X     X        X
   RangeOffset                 scalar      X    X     X        X
   Size                        scalar      X    X     X        X
   File                        master      X    X
+  Date                        scalar      X    X     X        X
+  Desc                        scalar      X    X     X        X
+  Hash                        scalar      X    X     X        X
+  Name                        scalar      X    X     X        X
+  Range                       flag        X    X     X        X
+  RangeLength                 scalar      X    X     X        X
+  RangeOffset                 scalar      X    X     X        X
+  Size                        scalar      X    X     X        X
+  File                        master      X    X
 =head1 jabber:iq:agent - DEPRECATED
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Agents                      flag        X    X     X        X
   Description                 scalar      X    X     X        X
   GroupChat                   flag        X    X     X        X
   JID                         jid         X    X     X        X
   Name                        scalar      X    X     X        X
   Register                    flag        X    X     X        X
   Search                      flag        X    X     X        X
   Service                     scalar      X    X     X        X
   Transport                   scalar      X    X     X        X
   URL                         scalar      X    X     X        X
   Agent                       master      X    X
+  Agents                      flag        X    X     X        X
+  Description                 scalar      X    X     X        X
+  GroupChat                   flag        X    X     X        X
+  JID                         jid         X    X     X        X
+  Name                        scalar      X    X     X        X
+  Register                    flag        X    X     X        X
+  Search                      flag        X    X     X        X
+  Service                     scalar      X    X     X        X
+  Transport                   scalar      X    X     X        X
+  URL                         scalar      X    X     X        X
+  Agent                       master      X    X
 =head1 jabber:iq:agents - DEPRECATED
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Agent                       child                                  X
   Agents                      child       X          X        X
+  Agent                       child                                  X
+  Agents                      child       X          X        X
 =head1 jabber:iq:autoupdate
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Beta                        child                                  X
   Dev                         child                                  X
   Release                     child                                  X
   Releases                    child       X          X        X
+  Beta                        child                                  X
+  Dev                         child                                  X
+  Release                     child                                  X
+  Releases                    child       X          X        X
 =head1 jabber:iq:autoupdate - release objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Desc                        scalar      X    X     X        X
   Priority                    scalar      X    X     X        X
   URL                         scalar      X    X     X        X
   Version                     scalar      X    X     X        X
   Release                     master      X    X
+  Desc                        scalar      X    X     X        X
+  Priority                    scalar      X    X     X        X
+  URL                         scalar      X    X     X        X
+  Version                     scalar      X    X     X        X
+  Release                     master      X    X
 =head1 jabber:iq:browse - DEPRECATED
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Category                    scalar      X    X     X        X
   JID                         jid         X    X     X        X
   NS                          array       X    X     X        X
   Name                        scalar      X    X     X        X
   Type                        scalar      X    X     X        X
   Item                        child                                  X
   Items                       child       X          X        X
   Browse                      master      X    X
+  Category                    scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  NS                          array       X    X     X        X
+  Name                        scalar      X    X     X        X
+  Type                        scalar      X    X     X        X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  Browse                      master      X    X
 =head1 jabber:iq:browse - item objects - DEPRECATED
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Category                    scalar      X    X     X        X
   JID                         jid         X    X     X        X
   NS                          array       X    X     X        X
   Name                        scalar      X    X     X        X
   Type                        scalar      X    X     X        X
   Item                        child                                  X
   Items                       child       X          X        X
   Browse                      master      X    X
+  Category                    scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  NS                          array       X    X     X        X
+  Name                        scalar      X    X     X        X
+  Type                        scalar      X    X     X        X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  Browse                      master      X    X
 =head1 jabber:iq:conference
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   ID                          scalar      X    X     X        X
   Name                        scalar      X    X     X        X
   Nick                        scalar      X    X     X        X
   Privacy                     flag        X    X     X        X
   Secret                      scalar      X    X     X        X
   Conference                  master      X    X
+  ID                          scalar      X    X     X        X
+  Name                        scalar      X    X     X        X
+  Nick                        scalar      X    X     X        X
+  Privacy                     flag        X    X     X        X
+  Secret                      scalar      X    X     X        X
+  Conference                  master      X    X
 =head1 jabber:iq:filter - DEPRECATED
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Rule                        child                                  X
   Rules                       child       X          X        X
+  Rule                        child                                  X
+  Rules                       child       X          X        X
 =head1 jabber:iq:filter - rule objects - DEPRECATED
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Body                        scalar      X    X     X        X
   Continued                   scalar      X    X     X        X
   Drop                        scalar      X    X     X        X
   Edit                        scalar      X    X     X        X
   Error                       scalar      X    X     X        X
   From                        scalar      X    X     X        X
   Offline                     scalar      X    X     X        X
   Reply                       scalar      X    X     X        X
   Resource                    scalar      X    X     X        X
   Show                        scalar      X    X     X        X
   Size                        scalar      X    X     X        X
   Subject                     scalar      X    X     X        X
   Time                        scalar      X    X     X        X
   Type                        scalar      X    X     X        X
   Unavailable                 scalar      X    X     X        X
   Rule                        master      X    X
+  Body                        scalar      X    X     X        X
+  Continued                   scalar      X    X     X        X
+  Drop                        scalar      X    X     X        X
+  Edit                        scalar      X    X     X        X
+  Error                       scalar      X    X     X        X
+  From                        scalar      X    X     X        X
+  Offline                     scalar      X    X     X        X
+  Reply                       scalar      X    X     X        X
+  Resource                    scalar      X    X     X        X
+  Show                        scalar      X    X     X        X
+  Size                        scalar      X    X     X        X
+  Subject                     scalar      X    X     X        X
+  Time                        scalar      X    X     X        X
+  Type                        scalar      X    X     X        X
+  Unavailable                 scalar      X    X     X        X
+  Rule                        master      X    X
 =head1 jabber:iq:gateway
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Desc                        scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Prompt                      scalar      X    X     X        X
   Gateway                     master      X    X
+  Desc                        scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Prompt                      scalar      X    X     X        X
+  Gateway                     master      X    X
 =head1 jabber:iq:last
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Message                     scalar      X    X     X        X
   Seconds                     scalar      X    X     X        X
   Last                        master      X    X
+  Message                     scalar      X    X     X        X
+  Seconds                     scalar      X    X     X        X
+  Last                        master      X    X
 =head1 jabber:iq:oob
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Desc                        scalar      X    X     X        X
   URL                         scalar      X    X     X        X
   Oob                         master      X    X
+  Desc                        scalar      X    X     X        X
+  URL                         scalar      X    X     X        X
+  Oob                         master      X    X
 =head1 jabber:iq:pass
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Client                      scalar      X    X     X        X
   ClientPort                  scalar      X    X     X        X
   Close                       flag        X    X     X        X
   Expire                      scalar      X    X     X        X
   OneShot                     flag        X    X     X        X
   Proxy                       scalar      X    X     X        X
   ProxyPort                   scalar      X    X     X        X
   Server                      scalar      X    X     X        X
   ServerPort                  scalar      X    X     X        X
   Pass                        master      X    X
+  Client                      scalar      X    X     X        X
+  ClientPort                  scalar      X    X     X        X
+  Close                       flag        X    X     X        X
+  Expire                      scalar      X    X     X        X
+  OneShot                     flag        X    X     X        X
+  Proxy                       scalar      X    X     X        X
+  ProxyPort                   scalar      X    X     X        X
+  Server                      scalar      X    X     X        X
+  ServerPort                  scalar      X    X     X        X
+  Pass                        master      X    X
 =head1 jabber:iq:rpc
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   MethodCall                  child       X          X        X      X
   MethodResponse              child       X          X        X      X
+  MethodCall                  child       X          X        X      X
+  MethodResponse              child       X          X        X      X
 =head1 jabber:iq:rpc - array objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Data                        child                                  X
   Datas                       child       X          X        X
+  Data                        child                                  X
+  Datas                       child       X          X        X
 =head1 jabber:iq:rpc - data objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Value                       child       X          X        X      X
+  Value                       child       X          X        X      X
 =head1 jabber:iq:rpc - fault objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Value                       child       X          X        X      X
+  Value                       child       X          X        X      X
 =head1 jabber:iq:rpc - member objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Name                        scalar      X    X     X        X
   Value                       child       X          X        X      X
   Member                      master      X    X
+  Name                        scalar      X    X     X        X
+  Value                       child       X          X        X      X
+  Member                      master      X    X
 =head1 jabber:iq:rpc - methodCall objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   MethodName                  scalar      X    X     X        X
   Params                      child       X          X        X      X
   MethodCall                  master      X    X
+  MethodName                  scalar      X    X     X        X
+  Params                      child       X          X        X      X
+  MethodCall                  master      X    X
 =head1 jabber:iq:rpc - methodResponse objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Fault                       child       X          X        X      X
   Params                      child       X          X        X      X
+  Fault                       child       X          X        X      X
+  Params                      child       X          X        X      X
 =head1 jabber:iq:rpc - param objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Value                       child       X          X        X      X
+  Value                       child       X          X        X      X
 =head1 jabber:iq:rpc - params objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Param                       child                                  X
   Params                      child       X          X        X
+  Param                       child                                  X
+  Params                      child       X          X        X
 =head1 jabber:iq:rpc - struct objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Member                      child                                  X
   Members                     child       X          X        X
+  Member                      child                                  X
+  Members                     child       X          X        X
 =head1 jabber:iq:rpc - value objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Base64                      scalar      X    X     X        X
   Boolean                     scalar      X    X     X        X
   DateTime                    scalar      X    X     X        X
   Double                      scalar      X    X     X        X
   I4                          scalar      X    X     X        X
   Int                         scalar      X    X     X        X
   String                      scalar      X    X     X        X
   Value                       scalar      X    X     X        X
   Array                       child       X          X        X      X
   Struct                      child       X          X        X      X
   RPCValue                    master      X    X
+  Base64                      scalar      X    X     X        X
+  Boolean                     scalar      X    X     X        X
+  DateTime                    scalar      X    X     X        X
+  Double                      scalar      X    X     X        X
+  I4                          scalar      X    X     X        X
+  Int                         scalar      X    X     X        X
+  String                      scalar      X    X     X        X
+  Value                       scalar      X    X     X        X
+  Array                       child       X          X        X      X
+  Struct                      child       X          X        X      X
+  RPCValue                    master      X    X
 =head1 jabber:iq:search
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Email                       scalar      X    X     X        X
   Family                      scalar      X    X     X        X
   First                       scalar      X    X     X        X
   Given                       scalar      X    X     X        X
   Instructions                scalar      X    X     X        X
   Key                         scalar      X    X     X        X
   Last                        scalar      X    X     X        X
   Name                        scalar      X    X     X        X
   Nick                        scalar      X    X     X        X
   Truncated                   flag        X    X     X        X
   Item                        child                                  X
   Items                       child       X          X        X
   Search                      master      X    X
+  Email                       scalar      X    X     X        X
+  Family                      scalar      X    X     X        X
+  First                       scalar      X    X     X        X
+  Given                       scalar      X    X     X        X
+  Instructions                scalar      X    X     X        X
+  Key                         scalar      X    X     X        X
+  Last                        scalar      X    X     X        X
+  Name                        scalar      X    X     X        X
+  Nick                        scalar      X    X     X        X
+  Truncated                   flag        X    X     X        X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  Search                      master      X    X
 =head1 jabber:iq:search - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Email                       scalar      X    X     X        X
   Family                      scalar      X    X     X        X
   First                       scalar      X    X     X        X
   Given                       scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Key                         scalar      X    X     X        X
   Last                        scalar      X    X     X        X
   Name                        scalar      X    X     X        X
   Nick                        scalar      X    X     X        X
   Item                        master      X    X
+  Email                       scalar      X    X     X        X
+  Family                      scalar      X    X     X        X
+  First                       scalar      X    X     X        X
+  Given                       scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Key                         scalar      X    X     X        X
+  Last                        scalar      X    X     X        X
+  Name                        scalar      X    X     X        X
+  Nick                        scalar      X    X     X        X
+  Item                        master      X    X
 =head1 jabber:iq:time
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Display                     special     X    X     X        X
   TZ                          special     X    X     X        X
   UTC                         special     X    X     X        X
   Time                        master      X    X
+  Display                     special     X    X     X        X
+  TZ                          special     X    X     X        X
+  UTC                         special     X    X     X        X
+  Time                        master      X    X
 =head1 jabber:iq:version
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Name                        scalar      X    X     X        X
   OS                          special     X    X     X        X
   Ver                         special     X    X     X        X
   Version                     master      X    X
+  Name                        scalar      X    X     X        X
+  OS                          special     X    X     X        X
+  Ver                         special     X    X     X        X
+  Version                     master      X    X
 =head1 jabber:x:autoupdate
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   JID                         jid         X    X     X        X
   Autoupdate                  master      X    X
+  JID                         jid         X    X     X        X
+  Autoupdate                  master      X    X
 =head1 jabber:x:conference
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   JID                         jid         X    X     X        X
   Conference                  master      X    X
+  JID                         jid         X    X     X        X
+  Conference                  master      X    X
 =head1 jabber:x:data
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Form                        scalar      X    X     X        X
   Instructions                scalar      X    X     X        X
   Title                       scalar      X    X     X        X
   Type                        scalar      X    X     X        X
   Field                       child                                  X
   Fields                      child       X          X        X
   Item                        child                                  X
   Items                       child       X          X        X
   Reported                    child       X          X        X      X
   Data                        master      X    X
+  Form                        scalar      X    X     X        X
+  Instructions                scalar      X    X     X        X
+  Title                       scalar      X    X     X        X
+  Type                        scalar      X    X     X        X
+  Field                       child                                  X
+  Fields                      child       X          X        X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  Reported                    child       X          X        X      X
+  Data                        master      X    X
 =head1 jabber:x:data - field objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Desc                        scalar      X    X     X        X
   Label                       scalar      X    X     X        X
   Required                    flag        X    X     X        X
   Type                        scalar      X    X     X        X
   Value                       array       X    X     X        X
   Var                         scalar      X    X     X        X
   Option                      child                                  X
   Options                     child       X          X        X
   Field                       master      X    X
+  Desc                        scalar      X    X     X        X
+  Label                       scalar      X    X     X        X
+  Required                    flag        X    X     X        X
+  Type                        scalar      X    X     X        X
+  Value                       array       X    X     X        X
+  Var                         scalar      X    X     X        X
+  Option                      child                                  X
+  Options                     child       X          X        X
+  Field                       master      X    X
 =head1 jabber:x:data - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Field                       child                                  X
   Fields                      child       X          X        X
   Item                        master      X    X
+  Field                       child                                  X
+  Fields                      child       X          X        X
+  Item                        master      X    X
 =head1 jabber:x:data - option objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Label                       scalar      X    X     X        X
   Value                       scalar      X    X     X        X
   Option                      master      X    X
+  Label                       scalar      X    X     X        X
+  Value                       scalar      X    X     X        X
+  Option                      master      X    X
 =head1 jabber:x:data - reported objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Field                       child                                  X
   Fields                      child       X          X        X
   Reported                    master      X    X
+  Field                       child                                  X
+  Fields                      child       X          X        X
+  Reported                    master      X    X
 =head1 jabber:x:delay
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   From                        jid         X    X     X        X
   Message                     scalar      X    X     X        X
   Stamp                       timestamp   X    X     X        X
   Delay                       master      X    X
+  From                        jid         X    X     X        X
+  Message                     scalar      X    X     X        X
+  Stamp                       timestamp   X    X     X        X
+  Delay                       master      X    X
 =head1 jabber:x:encrypted
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Message                     scalar      X    X     X        X
   Encrypted                   master      X    X
+  Message                     scalar      X    X     X        X
+  Encrypted                   master      X    X
 =head1 jabber:x:event
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Composing                   flag        X    X     X        X
   Delivered                   flag        X    X     X        X
   Displayed                   flag        X    X     X        X
   ID                          scalar      X    X     X        X
   Offline                     flag        X    X     X        X
   Event                       master      X    X
+  Composing                   flag        X    X     X        X
+  Delivered                   flag        X    X     X        X
+  Displayed                   flag        X    X     X        X
+  ID                          scalar      X    X     X        X
+  Offline                     flag        X    X     X        X
+  Event                       master      X    X
 =head1 jabber:x:expire
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Seconds                     scalar      X    X     X        X
   Expire                      master      X    X
+  Seconds                     scalar      X    X     X        X
+  Expire                      master      X    X
 =head1 jabber:x:oob
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Desc                        scalar      X    X     X        X
   URL                         scalar      X    X     X        X
   Oob                         master      X    X
+  Desc                        scalar      X    X     X        X
+  URL                         scalar      X    X     X        X
+  Oob                         master      X    X
 =head1 jabber:x:roster
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Item                        child                                  X
   Items                       child       X          X        X
   Roster                      master      X    X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  Roster                      master      X    X
 =head1 jabber:x:roster - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Ask                         scalar      X    X     X        X
   Group                       array       X    X     X        X
   JID                         jid         X    X     X        X
   Name                        scalar      X    X     X        X
   Subscription                scalar      X    X     X        X
   Item                        master      X    X
+  Ask                         scalar      X    X     X        X
+  Group                       array       X    X     X        X
+  JID                         jid         X    X     X        X
+  Name                        scalar      X    X     X        X
+  Subscription                scalar      X    X     X        X
+  Item                        master      X    X
 =head1 jabber:x:signed
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Signature                   scalar      X    X     X        X
   Signed                      master      X    X
+  Signature                   scalar      X    X     X        X
+  Signed                      master      X    X
 # DOC_BEGIN
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Activate                    scalar      X    X     X        X
   SID                         scalar      X    X     X        X
   StreamHostUsedJID           jid         X    X     X        X
   StreamHost                  child                                  X
   StreamHosts                 child       X          X        X
   ByteStreams                 master      X    X
+  Activate                    scalar      X    X     X        X
+  SID                         scalar      X    X     X        X
+  StreamHostUsedJID           jid         X    X     X        X
+  StreamHost                  child                                  X
+  StreamHosts                 child       X          X        X
+  ByteStreams                 master      X    X
 =head1 http://jabber.org/protocol/bytestreams - streamhost objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Host                        scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Port                        scalar      X    X     X        X
   ZeroConf                    scalar      X    X     X        X
   StreamHost                  master      X    X
+  Host                        scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Port                        scalar      X    X     X        X
+  ZeroConf                    scalar      X    X     X        X
+  StreamHost                  master      X    X
 =head1 http://jabber.org/protocol/commands
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Action                      scalar      X    X     X        X
   Node                        scalar      X    X     X        X
   SessionID                   scalar      X    X     X        X
   Status                      scalar      X    X     X        X
   Note                        child                                  X
   Notes                       child       X          X        X
   Command                     master      X    X
+  Action                      scalar      X    X     X        X
+  Node                        scalar      X    X     X        X
+  SessionID                   scalar      X    X     X        X
+  Status                      scalar      X    X     X        X
+  Note                        child                                  X
+  Notes                       child       X          X        X
+  Command                     master      X    X
 =head1 http://jabber.org/protocol/commands - note objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Message                     scalar      X    X     X        X
   Type                        scalar      X    X     X        X
   Note                        master      X    X
+  Message                     scalar      X    X     X        X
+  Type                        scalar      X    X     X        X
+  Note                        master      X    X
 =head1 http://jabber.org/protocol/disco#info
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Feature                     child                                  X
   Features                    child       X          X        X
   Identities                  child       X          X        X
   Identity                    child                                  X
   DiscoInfo                   master      X    X
+  Node                        scalar      X    X     X        X
+  Feature                     child                                  X
+  Features                    child       X          X        X
+  Identities                  child       X          X        X
+  Identity                    child                                  X
+  DiscoInfo                   master      X    X
 =head1 http://jabber.org/protocol/disco#info - feature objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Var                         scalar      X    X     X        X
   Feature                     master      X    X
+  Var                         scalar      X    X     X        X
+  Feature                     master      X    X
 =head1 http://jabber.org/protocol/disco#info - identity objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Category                    scalar      X    X     X        X
   Name                        scalar      X    X     X        X
   Type                        scalar      X    X     X        X
   Identity                    master      X    X
+  Category                    scalar      X    X     X        X
+  Name                        scalar      X    X     X        X
+  Type                        scalar      X    X     X        X
+  Identity                    master      X    X
 =head1 http://jabber.org/protocol/disco#items
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Item                        child                                  X
   Items                       child       X          X        X
   DiscoItems                  master      X    X
+  Node                        scalar      X    X     X        X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  DiscoItems                  master      X    X
 =head1 http://jabber.org/protocol/disco#items - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Action                      scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Name                        scalar      X    X     X        X
   Node                        scalar      X    X     X        X
   Item                        master      X    X
+  Action                      scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Name                        scalar      X    X     X        X
+  Node                        scalar      X    X     X        X
+  Item                        master      X    X
 =head1 http://jabber.org/protocol/feature-neg
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   FeatureNeg                  master      X    X
+  FeatureNeg                  master      X    X
 =head1 http://jabber.org/protocol/muc
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Password                    scalar      X    X     X        X
   MUC                         master      X    X
+  Password                    scalar      X    X     X        X
+  MUC                         master      X    X
 =head1 http://jabber.org/protocol/muc#admin
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Item                        child                                  X
   Items                       child       X          X        X
   Admin                       master      X    X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  Admin                       master      X    X
 =head1 http://jabber.org/protocol/muc#admin - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   ActorJID                    jid         X    X     X        X
   Affiliation                 scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Nick                        scalar      X    X     X        X
   Reason                      scalar      X    X     X        X
   Role                        scalar      X    X     X        X
   Item                        master      X    X
+  ActorJID                    jid         X    X     X        X
+  Affiliation                 scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Nick                        scalar      X    X     X        X
+  Reason                      scalar      X    X     X        X
+  Role                        scalar      X    X     X        X
+  Item                        master      X    X
 =head1 http://jabber.org/protocol/muc#user
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Alt                         scalar      X    X     X        X
   Password                    scalar      X    X     X        X
   StatusCode                  scalar      X    X     X        X
   Invite                      child       X          X        X      X
   Item                        child       X          X        X      X
   User                        master      X    X
+  Alt                         scalar      X    X     X        X
+  Password                    scalar      X    X     X        X
+  StatusCode                  scalar      X    X     X        X
+  Invite                      child       X          X        X      X
+  Item                        child       X          X        X      X
+  User                        master      X    X
 =head1 http://jabber.org/protocol/muc#user - invite objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   From                        jid         X    X     X        X
   Reason                      scalar      X    X     X        X
   To                          jid         X    X     X        X
   Invite                      master      X    X
+  From                        jid         X    X     X        X
+  Reason                      scalar      X    X     X        X
+  To                          jid         X    X     X        X
+  Invite                      master      X    X
 =head1 http://jabber.org/protocol/muc#user - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   ActorJID                    jid         X    X     X        X
   Affiliation                 scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Nick                        scalar      X    X     X        X
   Reason                      scalar      X    X     X        X
   Role                        scalar      X    X     X        X
   Item                        master      X    X
+  ActorJID                    jid         X    X     X        X
+  Affiliation                 scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Nick                        scalar      X    X     X        X
+  Reason                      scalar      X    X     X        X
+  Role                        scalar      X    X     X        X
+  Item                        master      X    X
 =head1 http://jabber.org/protocol/pubsub
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Affiliations                child       X          X        X      X
   Configure                   child       X          X        X      X
   Create                      child       X          X        X      X
   Delete                      child       X          X        X      X
   Entities                    child       X          X        X      X
   Entity                      child       X          X        X      X
   Item                        child       X          X        X      X
   Items                       child       X          X        X      X
   Options                     child       X          X        X      X
   Publish                     child       X          X        X      X
   Purge                       child       X          X        X      X
   Retract                     child       X          X        X      X
   Subscribe                   child       X          X        X      X
   Unsubscribe                 child       X          X        X      X
   PubSub                      master      X    X
+  Affiliations                child       X          X        X      X
+  Configure                   child       X          X        X      X
+  Create                      child       X          X        X      X
+  Delete                      child       X          X        X      X
+  Entities                    child       X          X        X      X
+  Entity                      child       X          X        X      X
+  Item                        child       X          X        X      X
+  Items                       child       X          X        X      X
+  Options                     child       X          X        X      X
+  Publish                     child       X          X        X      X
+  Purge                       child       X          X        X      X
+  Retract                     child       X          X        X      X
+  Subscribe                   child       X          X        X      X
+  Unsubscribe                 child       X          X        X      X
+  PubSub                      master      X    X
 =head1 http://jabber.org/protocol/pubsub - affiliations objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Entity                      child       X          X        X      X
   Affiliations                master      X    X
+  Entity                      child       X          X        X      X
+  Affiliations                master      X    X
 =head1 http://jabber.org/protocol/pubsub - configure objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Configure                   master      X    X
+  Node                        scalar      X    X     X        X
+  Configure                   master      X    X
 =head1 http://jabber.org/protocol/pubsub - create objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Create                      master      X    X
+  Node                        scalar      X    X     X        X
+  Create                      master      X    X
 =head1 http://jabber.org/protocol/pubsub - delete objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Delete                      master      X    X
+  Node                        scalar      X    X     X        X
+  Delete                      master      X    X
 =head1 http://jabber.org/protocol/pubsub - entities objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Entity                      child       X          X        X      X
   Entities                    master      X    X
+  Entity                      child       X          X        X      X
+  Entities                    master      X    X
 =head1 http://jabber.org/protocol/pubsub - entity objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Affiliation                 scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Node                        scalar      X    X     X        X
   Subscription                scalar      X    X     X        X
   SubscribeOptions            child       X          X        X      X
   Entity                      master      X    X
+  Affiliation                 scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Node                        scalar      X    X     X        X
+  Subscription                scalar      X    X     X        X
+  SubscribeOptions            child       X          X        X      X
+  Entity                      master      X    X
 =head1 http://jabber.org/protocol/pubsub - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   ID                          scalar      X    X     X        X
   Payload                     raw         X    X     X        X
   Item                        master      X    X
+  ID                          scalar      X    X     X        X
+  Payload                     raw         X    X     X        X
+  Item                        master      X    X
 =head1 http://jabber.org/protocol/pubsub - items objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   MaxItems                    scalar      X    X     X        X
   Node                        scalar      X    X     X        X
   Item                        child       X          X        X      X
   Items                       master      X    X
+  MaxItems                    scalar      X    X     X        X
+  Node                        scalar      X    X     X        X
+  Item                        child       X          X        X      X
+  Items                       master      X    X
 =head1 http://jabber.org/protocol/pubsub - options objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   JID                         jid         X    X     X        X
   Node                        scalar      X    X     X        X
   Options                     master      X    X
+  JID                         jid         X    X     X        X
+  Node                        scalar      X    X     X        X
+  Options                     master      X    X
 =head1 http://jabber.org/protocol/pubsub - publish objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Item                        child       X          X        X      X
   Publish                     master      X    X
+  Node                        scalar      X    X     X        X
+  Item                        child       X          X        X      X
+  Publish                     master      X    X
 =head1 http://jabber.org/protocol/pubsub - purge objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Purge                       master      X    X
+  Node                        scalar      X    X     X        X
+  Purge                       master      X    X
 =head1 http://jabber.org/protocol/pubsub - retract objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Item                        child       X          X        X      X
   Retract                     master      X    X
+  Node                        scalar      X    X     X        X
+  Item                        child       X          X        X      X
+  Retract                     master      X    X
 =head1 http://jabber.org/protocol/pubsub - subscribe objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   JID                         jid         X    X     X        X
   Node                        scalar      X    X     X        X
   Subscribe                   master      X    X
+  JID                         jid         X    X     X        X
+  Node                        scalar      X    X     X        X
+  Subscribe                   master      X    X
 =head1 http://jabber.org/protocol/pubsub - subscribe-options objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Required                    flag        X    X     X        X
   SubscribeOptions            master      X    X
+  Required                    flag        X    X     X        X
+  SubscribeOptions            master      X    X
 =head1 http://jabber.org/protocol/pubsub - unsubscribe objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   JID                         jid         X    X     X        X
   Node                        scalar      X    X     X        X
   Unsubscribe                 master      X    X
+  JID                         jid         X    X     X        X
+  Node                        scalar      X    X     X        X
+  Unsubscribe                 master      X    X
 =head1 http://jabber.org/protocol/pubsub#event
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Delete                      child       X          X        X      X
   Items                       child       X          X        X      X
   Event                       master      X    X
+  Delete                      child       X          X        X      X
+  Items                       child       X          X        X      X
+  Event                       master      X    X
 =head1 http://jabber.org/protocol/pubsub#event - delete objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Delete                      master      X    X
+  Node                        scalar      X    X     X        X
+  Delete                      master      X    X
 =head1 http://jabber.org/protocol/pubsub#event - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   ID                          scalar      X    X     X        X
   Payload                     raw         X    X     X        X
   Item                        master      X    X
+  ID                          scalar      X    X     X        X
+  Payload                     raw         X    X     X        X
+  Item                        master      X    X
 =head1 http://jabber.org/protocol/pubsub#event - items objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Item                        child       X          X        X      X
   Items                       master      X    X
+  Node                        scalar      X    X     X        X
+  Item                        child       X          X        X      X
+  Items                       master      X    X
 =head1 http://jabber.org/protocol/pubsub#owner
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Action                      scalar      X    X     X        X
   Configure                   child       X          X        X      X
   Owner                       master      X    X
+  Action                      scalar      X    X     X        X
+  Configure                   child       X          X        X      X
+  Owner                       master      X    X
 =head1 http://jabber.org/protocol/pubsub#owner - configure objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Node                        scalar      X    X     X        X
   Configure                   master      X    X
+  Node                        scalar      X    X     X        X
+  Configure                   master      X    X
 =head1 http://jabber.org/protocol/si
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   ID                          scalar      X    X     X        X
   MimeType                    scalar      X    X     X        X
   Profile                     scalar      X    X     X        X
   Stream                      master      X    X
+  ID                          scalar      X    X     X        X
+  MimeType                    scalar      X    X     X        X
+  Profile                     scalar      X    X     X        X
+  Stream                      master      X    X
 =head1 http://jabber.org/protocol/si/profile/file-transfer
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Date                        scalar      X    X     X        X
   Desc                        scalar      X    X     X        X
   Hash                        scalar      X    X     X        X
   Name                        scalar      X    X     X        X
   Range                       flag        X    X     X        X
   RangeLength                 scalar      X    X     X        X
   RangeOffset                 scalar      X    X     X        X
   Size                        scalar      X    X     X        X
   File                        master      X    X
+  Date                        scalar      X    X     X        X
+  Desc                        scalar      X    X     X        X
+  Hash                        scalar      X    X     X        X
+  Name                        scalar      X    X     X        X
+  Range                       flag        X    X     X        X
+  RangeLength                 scalar      X    X     X        X
+  RangeOffset                 scalar      X    X     X        X
+  Size                        scalar      X    X     X        X
+  File                        master      X    X
 =head1 jabber:iq:agent - DEPRECATED
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Agents                      flag        X    X     X        X
   Description                 scalar      X    X     X        X
   GroupChat                   flag        X    X     X        X
   JID                         jid         X    X     X        X
   Name                        scalar      X    X     X        X
   Register                    flag        X    X     X        X
   Search                      flag        X    X     X        X
   Service                     scalar      X    X     X        X
   Transport                   scalar      X    X     X        X
   URL                         scalar      X    X     X        X
   Agent                       master      X    X
+  Agents                      flag        X    X     X        X
+  Description                 scalar      X    X     X        X
+  GroupChat                   flag        X    X     X        X
+  JID                         jid         X    X     X        X
+  Name                        scalar      X    X     X        X
+  Register                    flag        X    X     X        X
+  Search                      flag        X    X     X        X
+  Service                     scalar      X    X     X        X
+  Transport                   scalar      X    X     X        X
+  URL                         scalar      X    X     X        X
+  Agent                       master      X    X
 =head1 jabber:iq:agents - DEPRECATED
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Agent                       child                                  X
   Agents                      child       X          X        X
+  Agent                       child                                  X
+  Agents                      child       X          X        X
 =head1 jabber:iq:autoupdate
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Beta                        child                                  X
   Dev                         child                                  X
   Release                     child                                  X
   Releases                    child       X          X        X
+  Beta                        child                                  X
+  Dev                         child                                  X
+  Release                     child                                  X
+  Releases                    child       X          X        X
 =head1 jabber:iq:autoupdate - release objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Desc                        scalar      X    X     X        X
   Priority                    scalar      X    X     X        X
   URL                         scalar      X    X     X        X
   Version                     scalar      X    X     X        X
   Release                     master      X    X
+  Desc                        scalar      X    X     X        X
+  Priority                    scalar      X    X     X        X
+  URL                         scalar      X    X     X        X
+  Version                     scalar      X    X     X        X
+  Release                     master      X    X
 =head1 jabber:iq:browse - DEPRECATED
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Category                    scalar      X    X     X        X
   JID                         jid         X    X     X        X
   NS                          array       X    X     X        X
   Name                        scalar      X    X     X        X
   Type                        scalar      X    X     X        X
   Item                        child                                  X
   Items                       child       X          X        X
   Browse                      master      X    X
+  Category                    scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  NS                          array       X    X     X        X
+  Name                        scalar      X    X     X        X
+  Type                        scalar      X    X     X        X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  Browse                      master      X    X
 =head1 jabber:iq:browse - item objects - DEPRECATED
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Category                    scalar      X    X     X        X
   JID                         jid         X    X     X        X
   NS                          array       X    X     X        X
   Name                        scalar      X    X     X        X
   Type                        scalar      X    X     X        X
   Item                        child                                  X
   Items                       child       X          X        X
   Browse                      master      X    X
+  Category                    scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  NS                          array       X    X     X        X
+  Name                        scalar      X    X     X        X
+  Type                        scalar      X    X     X        X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  Browse                      master      X    X
 =head1 jabber:iq:conference
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   ID                          scalar      X    X     X        X
   Name                        scalar      X    X     X        X
   Nick                        scalar      X    X     X        X
   Privacy                     flag        X    X     X        X
   Secret                      scalar      X    X     X        X
   Conference                  master      X    X
+  ID                          scalar      X    X     X        X
+  Name                        scalar      X    X     X        X
+  Nick                        scalar      X    X     X        X
+  Privacy                     flag        X    X     X        X
+  Secret                      scalar      X    X     X        X
+  Conference                  master      X    X
 =head1 jabber:iq:filter - DEPRECATED
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Rule                        child                                  X
   Rules                       child       X          X        X
+  Rule                        child                                  X
+  Rules                       child       X          X        X
 =head1 jabber:iq:filter - rule objects - DEPRECATED
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Body                        scalar      X    X     X        X
   Continued                   scalar      X    X     X        X
   Drop                        scalar      X    X     X        X
   Edit                        scalar      X    X     X        X
   Error                       scalar      X    X     X        X
   From                        scalar      X    X     X        X
   Offline                     scalar      X    X     X        X
   Reply                       scalar      X    X     X        X
   Resource                    scalar      X    X     X        X
   Show                        scalar      X    X     X        X
   Size                        scalar      X    X     X        X
   Subject                     scalar      X    X     X        X
   Time                        scalar      X    X     X        X
   Type                        scalar      X    X     X        X
   Unavailable                 scalar      X    X     X        X
   Rule                        master      X    X
+  Body                        scalar      X    X     X        X
+  Continued                   scalar      X    X     X        X
+  Drop                        scalar      X    X     X        X
+  Edit                        scalar      X    X     X        X
+  Error                       scalar      X    X     X        X
+  From                        scalar      X    X     X        X
+  Offline                     scalar      X    X     X        X
+  Reply                       scalar      X    X     X        X
+  Resource                    scalar      X    X     X        X
+  Show                        scalar      X    X     X        X
+  Size                        scalar      X    X     X        X
+  Subject                     scalar      X    X     X        X
+  Time                        scalar      X    X     X        X
+  Type                        scalar      X    X     X        X
+  Unavailable                 scalar      X    X     X        X
+  Rule                        master      X    X
 =head1 jabber:iq:gateway
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Desc                        scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Prompt                      scalar      X    X     X        X
   Gateway                     master      X    X
+  Desc                        scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Prompt                      scalar      X    X     X        X
+  Gateway                     master      X    X
 =head1 jabber:iq:last
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Message                     scalar      X    X     X        X
   Seconds                     scalar      X    X     X        X
   Last                        master      X    X
+  Message                     scalar      X    X     X        X
+  Seconds                     scalar      X    X     X        X
+  Last                        master      X    X
 =head1 jabber:iq:oob
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Desc                        scalar      X    X     X        X
   URL                         scalar      X    X     X        X
   Oob                         master      X    X
+  Desc                        scalar      X    X     X        X
+  URL                         scalar      X    X     X        X
+  Oob                         master      X    X
 =head1 jabber:iq:pass
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Client                      scalar      X    X     X        X
   ClientPort                  scalar      X    X     X        X
   Close                       flag        X    X     X        X
   Expire                      scalar      X    X     X        X
   OneShot                     flag        X    X     X        X
   Proxy                       scalar      X    X     X        X
   ProxyPort                   scalar      X    X     X        X
   Server                      scalar      X    X     X        X
   ServerPort                  scalar      X    X     X        X
   Pass                        master      X    X
+  Client                      scalar      X    X     X        X
+  ClientPort                  scalar      X    X     X        X
+  Close                       flag        X    X     X        X
+  Expire                      scalar      X    X     X        X
+  OneShot                     flag        X    X     X        X
+  Proxy                       scalar      X    X     X        X
+  ProxyPort                   scalar      X    X     X        X
+  Server                      scalar      X    X     X        X
+  ServerPort                  scalar      X    X     X        X
+  Pass                        master      X    X
 =head1 jabber:iq:rpc
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   MethodCall                  child       X          X        X      X
   MethodResponse              child       X          X        X      X
+  MethodCall                  child       X          X        X      X
+  MethodResponse              child       X          X        X      X
 =head1 jabber:iq:rpc - array objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Data                        child                                  X
   Datas                       child       X          X        X
+  Data                        child                                  X
+  Datas                       child       X          X        X
 =head1 jabber:iq:rpc - data objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Value                       child       X          X        X      X
+  Value                       child       X          X        X      X
 =head1 jabber:iq:rpc - fault objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Value                       child       X          X        X      X
+  Value                       child       X          X        X      X
 =head1 jabber:iq:rpc - member objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Name                        scalar      X    X     X        X
   Value                       child       X          X        X      X
   Member                      master      X    X
+  Name                        scalar      X    X     X        X
+  Value                       child       X          X        X      X
+  Member                      master      X    X
 =head1 jabber:iq:rpc - methodCall objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   MethodName                  scalar      X    X     X        X
   Params                      child       X          X        X      X
   MethodCall                  master      X    X
+  MethodName                  scalar      X    X     X        X
+  Params                      child       X          X        X      X
+  MethodCall                  master      X    X
 =head1 jabber:iq:rpc - methodResponse objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Fault                       child       X          X        X      X
   Params                      child       X          X        X      X
+  Fault                       child       X          X        X      X
+  Params                      child       X          X        X      X
 =head1 jabber:iq:rpc - param objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Value                       child       X          X        X      X
+  Value                       child       X          X        X      X
 =head1 jabber:iq:rpc - params objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Param                       child                                  X
   Params                      child       X          X        X
+  Param                       child                                  X
+  Params                      child       X          X        X
 =head1 jabber:iq:rpc - struct objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Member                      child                                  X
   Members                     child       X          X        X
+  Member                      child                                  X
+  Members                     child       X          X        X
 =head1 jabber:iq:rpc - value objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Base64                      scalar      X    X     X        X
   Boolean                     scalar      X    X     X        X
   DateTime                    scalar      X    X     X        X
   Double                      scalar      X    X     X        X
   I4                          scalar      X    X     X        X
   Int                         scalar      X    X     X        X
   String                      scalar      X    X     X        X
   Value                       scalar      X    X     X        X
   Array                       child       X          X        X      X
   Struct                      child       X          X        X      X
   RPCValue                    master      X    X
+  Base64                      scalar      X    X     X        X
+  Boolean                     scalar      X    X     X        X
+  DateTime                    scalar      X    X     X        X
+  Double                      scalar      X    X     X        X
+  I4                          scalar      X    X     X        X
+  Int                         scalar      X    X     X        X
+  String                      scalar      X    X     X        X
+  Value                       scalar      X    X     X        X
+  Array                       child       X          X        X      X
+  Struct                      child       X          X        X      X
+  RPCValue                    master      X    X
 =head1 jabber:iq:search
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Email                       scalar      X    X     X        X
   Family                      scalar      X    X     X        X
   First                       scalar      X    X     X        X
   Given                       scalar      X    X     X        X
   Instructions                scalar      X    X     X        X
   Key                         scalar      X    X     X        X
   Last                        scalar      X    X     X        X
   Name                        scalar      X    X     X        X
   Nick                        scalar      X    X     X        X
   Truncated                   flag        X    X     X        X
   Item                        child                                  X
   Items                       child       X          X        X
   Search                      master      X    X
+  Email                       scalar      X    X     X        X
+  Family                      scalar      X    X     X        X
+  First                       scalar      X    X     X        X
+  Given                       scalar      X    X     X        X
+  Instructions                scalar      X    X     X        X
+  Key                         scalar      X    X     X        X
+  Last                        scalar      X    X     X        X
+  Name                        scalar      X    X     X        X
+  Nick                        scalar      X    X     X        X
+  Truncated                   flag        X    X     X        X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  Search                      master      X    X
 =head1 jabber:iq:search - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Email                       scalar      X    X     X        X
   Family                      scalar      X    X     X        X
   First                       scalar      X    X     X        X
   Given                       scalar      X    X     X        X
   JID                         jid         X    X     X        X
   Key                         scalar      X    X     X        X
   Last                        scalar      X    X     X        X
   Name                        scalar      X    X     X        X
   Nick                        scalar      X    X     X        X
   Item                        master      X    X
+  Email                       scalar      X    X     X        X
+  Family                      scalar      X    X     X        X
+  First                       scalar      X    X     X        X
+  Given                       scalar      X    X     X        X
+  JID                         jid         X    X     X        X
+  Key                         scalar      X    X     X        X
+  Last                        scalar      X    X     X        X
+  Name                        scalar      X    X     X        X
+  Nick                        scalar      X    X     X        X
+  Item                        master      X    X
 =head1 jabber:iq:time
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Display                     special     X    X     X        X
   TZ                          special     X    X     X        X
   UTC                         special     X    X     X        X
   Time                        master      X    X
+  Display                     special     X    X     X        X
+  TZ                          special     X    X     X        X
+  UTC                         special     X    X     X        X
+  Time                        master      X    X
 =head1 jabber:iq:version
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Name                        scalar      X    X     X        X
   OS                          special     X    X     X        X
   Ver                         special     X    X     X        X
   Version                     master      X    X
+  Name                        scalar      X    X     X        X
+  OS                          special     X    X     X        X
+  Ver                         special     X    X     X        X
+  Version                     master      X    X
 =head1 jabber:x:autoupdate
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   JID                         jid         X    X     X        X
   Autoupdate                  master      X    X
+  JID                         jid         X    X     X        X
+  Autoupdate                  master      X    X
 =head1 jabber:x:conference
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   JID                         jid         X    X     X        X
   Conference                  master      X    X
+  JID                         jid         X    X     X        X
+  Conference                  master      X    X
 =head1 jabber:x:data
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Form                        scalar      X    X     X        X
   Instructions                scalar      X    X     X        X
   Title                       scalar      X    X     X        X
   Type                        scalar      X    X     X        X
   Field                       child                                  X
   Fields                      child       X          X        X
   Item                        child                                  X
   Items                       child       X          X        X
   Reported                    child       X          X        X      X
   Data                        master      X    X
+  Form                        scalar      X    X     X        X
+  Instructions                scalar      X    X     X        X
+  Title                       scalar      X    X     X        X
+  Type                        scalar      X    X     X        X
+  Field                       child                                  X
+  Fields                      child       X          X        X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  Reported                    child       X          X        X      X
+  Data                        master      X    X
 =head1 jabber:x:data - field objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Desc                        scalar      X    X     X        X
   Label                       scalar      X    X     X        X
   Required                    flag        X    X     X        X
   Type                        scalar      X    X     X        X
   Value                       array       X    X     X        X
   Var                         scalar      X    X     X        X
   Option                      child                                  X
   Options                     child       X          X        X
   Field                       master      X    X
+  Desc                        scalar      X    X     X        X
+  Label                       scalar      X    X     X        X
+  Required                    flag        X    X     X        X
+  Type                        scalar      X    X     X        X
+  Value                       array       X    X     X        X
+  Var                         scalar      X    X     X        X
+  Option                      child                                  X
+  Options                     child       X          X        X
+  Field                       master      X    X
 =head1 jabber:x:data - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Field                       child                                  X
   Fields                      child       X          X        X
   Item                        master      X    X
+  Field                       child                                  X
+  Fields                      child       X          X        X
+  Item                        master      X    X
 =head1 jabber:x:data - option objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Label                       scalar      X    X     X        X
   Value                       scalar      X    X     X        X
   Option                      master      X    X
+  Label                       scalar      X    X     X        X
+  Value                       scalar      X    X     X        X
+  Option                      master      X    X
 =head1 jabber:x:data - reported objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Field                       child                                  X
   Fields                      child       X          X        X
   Reported                    master      X    X
+  Field                       child                                  X
+  Fields                      child       X          X        X
+  Reported                    master      X    X
 =head1 jabber:x:delay
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   From                        jid         X    X     X        X
   Message                     scalar      X    X     X        X
   Stamp                       timestamp   X    X     X        X
   Delay                       master      X    X
+  From                        jid         X    X     X        X
+  Message                     scalar      X    X     X        X
+  Stamp                       timestamp   X    X     X        X
+  Delay                       master      X    X
 =head1 jabber:x:encrypted
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Message                     scalar      X    X     X        X
   Encrypted                   master      X    X
+  Message                     scalar      X    X     X        X
+  Encrypted                   master      X    X
 =head1 jabber:x:event
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Composing                   flag        X    X     X        X
   Delivered                   flag        X    X     X        X
   Displayed                   flag        X    X     X        X
   ID                          scalar      X    X     X        X
   Offline                     flag        X    X     X        X
   Event                       master      X    X
+  Composing                   flag        X    X     X        X
+  Delivered                   flag        X    X     X        X
+  Displayed                   flag        X    X     X        X
+  ID                          scalar      X    X     X        X
+  Offline                     flag        X    X     X        X
+  Event                       master      X    X
 =head1 jabber:x:expire
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Seconds                     scalar      X    X     X        X
   Expire                      master      X    X
+  Seconds                     scalar      X    X     X        X
+  Expire                      master      X    X
 =head1 jabber:x:oob
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Desc                        scalar      X    X     X        X
   URL                         scalar      X    X     X        X
   Oob                         master      X    X
+  Desc                        scalar      X    X     X        X
+  URL                         scalar      X    X     X        X
+  Oob                         master      X    X
 =head1 jabber:x:roster
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Item                        child                                  X
   Items                       child       X          X        X
   Roster                      master      X    X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  Roster                      master      X    X
 =head1 jabber:x:roster - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Ask                         scalar      X    X     X        X
   Group                       array       X    X     X        X
   JID                         jid         X    X     X        X
   Name                        scalar      X    X     X        X
   Subscription                scalar      X    X     X        X
   Item                        master      X    X
+  Ask                         scalar      X    X     X        X
+  Group                       array       X    X     X        X
+  JID                         jid         X    X     X        X
+  Name                        scalar      X    X     X        X
+  Subscription                scalar      X    X     X        X
+  Item                        master      X    X
 =head1 jabber:x:signed
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Signature                   scalar      X    X     X        X
   Signed                      master      X    X
+  Signature                   scalar      X    X     X        X
+  Signed                      master      X    X
 …
+}
 sub GetX     { my $self = shift; $self->GetChild(@_);    }
+sub GetX     { my $self = shift; $self->GetChild(@_);    }
 sub DefinedX { my $self = shift; $self->DefinedChild(@_); }
 sub NewX     { my $self = shift; $self->NewChild(@_);    }
 sub AddX     { my $self = shift; $self->AddChild(@_);    }
+sub AddX     { my $self = shift; $self->AddChild(@_);    }
 sub RemoveX  { my $self = shift; $self->RemoveChild(@_); }
 …
 sub DefinedQuery { my $self = shift; $self->DefinedChild(@_); }
 sub NewQuery     { my $self = shift; $self->NewChild(@_);     }
 sub AddQuery     { my $self = shift; $self->AddChild(@_);     }
+sub AddQuery     { my $self = shift; $self->AddChild(@_);     }
 sub RemoveQuery  { my $self = shift; $self->RemoveChild(@_);  }
 …
     my $self = shift;
     my $value = shift;
     if (!defined($value) && ($TIMEZONE == 1))
+    {
 …
     my $self = shift;
     my $value = shift;
     if (defined($value))
+    {
 …
         my %result;
         my @xData = $item->GetX("jabber:x:data");
         if ($#xData == -1)
+        if ($#xData == -1)
+        {
             %result = $item->GetItem();

perl/modules/Jabber/lib/Net/Jabber/XDB.pm

rc2bed55	r7869e48
41	41	namspaces and modules see Net::Jabber::Data.
42	42
43		To initialize the XDB with a Jabber <xdb/> you must pass it the
	43	To initialize the XDB with a Jabber <xdb/> you must pass it the
44	44	XML::Parser Tree array. For example:
45	45

perl/modules/Jabber/lib/Net/XMPP.pm

ra8c55b5	r7869e48
40	40	like to utilize the XMPP Instant Messaging protocol. While not a
41	41	client in and of itself, it provides all of the necessary back-end
42		functions to make a CGI client or command-line perl client feasible
	42	functions to make a CGI client or command-line perl client feasible
43	43	and easy to use. Net::XMPP is a wrapper around the rest of the
44	44	official Net::XMPP::xxxxxx packages.

perl/modules/Jabber/lib/Net/XMPP/Client.pm

-                      rc2bed55
+                      r7869e48
                                       sepecified account for you, if it
                                       does not exist.
     Process(integer) - takes the timeout period as an argument.  If no
                        timeout is listed then the function blocks until
 …
    - Status ok, no data received.
                          undef - Status not ok, stop processing.
                        IMPORTANT: You need to check the output of every
                        Process.  If you get an undef then the connection
 …
     bless($self, $proto);
     $self->init(@_);
     $self->{SERVER}->{port} = 5222;
     $self->{SERVER}->{namespace} = "jabber:client";
 …
     $auth{password} = $args{password};
     $auth{resource} = $args{resource} if exists($args{resource});
     return $self->AuthSend(%auth);
+}
 …
     my $self = shift;
     my (%args) = @_;
     my %connect;
     $connect{hostname}       = $args{hostname};

perl/modules/Jabber/lib/Net/XMPP/Connection.pm

-                      r3bf5516
+                      r7869e48
     bless($self, $proto);
     $self->init(@_);
     $self->{SERVER}->{namespace} = "unknown";
 …
+{
     my $self = shift;
     $self->{ARGS} = {};
     while($#_ >= 0) { $self->{ARGS}->{ lc(pop(@_)) } = pop(@_); }
 …
                          debugtime  => $self->{DEBUG}->GetTime(),
                         );
     $self->{RCVDB}->{currentID} = 0;
 …
     $self->{DEBUG}->Log1("Connect: host($self->{SERVER}->{hostname}:$self->{SERVER}->{port}) namespace($self->{SERVER}->{namespace})");
     $self->{DEBUG}->Log1("Connect: timeout($self->{SERVER}->{timeout})");
     delete($self->{SESSION});
     $self->{SESSION} =
 …
     $self->{STREAM}->Disconnect($self->{SESSION}->{id})
         if ($self->{CONNECTED} == 1);
     $self->{STREAM}->SetCallBacks(node=>undef);
+    $self->{STREAM}->SetCallBacks(node=>undef);
     $self->{CONNECTED} = 0;
     $self->{DISCONNECTED} = 1;
 …
             &{$self->{CB}->{onauthfail}}()
                 if exists($self->{CB}->{onauthfail});
             if (!$self->{SERVER}->{allow_register} || $args{register} == 0)
+            {
 …
                     &{$self->{CB}->{onregisterfail}}()
                         if exists($self->{CB}->{onregisterfail});
                     $self->Disconnect();
                     &{$self->{CB}->{ondisconnect}}()
 …
                 if exists($self->{CB}->{onauth});
+        }
         while($self->Connected())
+        {

perl/modules/Jabber/lib/Net/XMPP/Debug.pm

rb7b2a76	r7869e48
151	151	my %args;
152	152	while($#_ >= 0) { $args{ lc pop(@_) } = pop(@_); }
153
	153
154	154	delete($args{file}) if (lc($args{file}) eq "stdout");
155	155

perl/modules/Jabber/lib/Net/XMPP/IQ.pm

-                      rc2bed55
+                      r7869e48
                $IQ->RemoveTo();
   RemoveFrom() - removes the from attribute from the <iq/>.
                  $IQ->RemoveFrom();
   RemoveID() - removes the id attribute from the <iq/>.
                $IQ->RemoveID();
   RemoveType() - removes the type attribute from the <iq/>.
                  $IQ->RemoveType();
   RemoveError() - removes the <error/> element from the <iq/>.
                   $IQ->RemoveError();
   RemoveErrorCode() - removes the code attribute from the <error/>
                       element in the <iq/>.
 …
 =head2 Test functions
   DefinedTo() - returns 1 if the to attribute is defined in the <iq/>,
+  DefinedTo() - returns 1 if the to attribute is defined in the <iq/>,
 otherwise.
 …
                   $test = $IQ->DefinedFrom();
   DefinedID() - returns 1 if the id attribute is defined in the <iq/>,
+  DefinedID() - returns 1 if the id attribute is defined in the <iq/>,
 otherwise.
 …
                   $test = $IQ->DefinedType();
   DefinedError() - returns 1 if <error/> is defined in the <iq/>,
+  DefinedError() - returns 1 if <error/> is defined in the <iq/>,
 otherwise.
 …
     $self->{FUNCS} = \%FUNCTIONS;
     $self->_init(@_);

perl/modules/Jabber/lib/Net/XMPP/JID.pm

-                      rc2bed55
+                      r7869e48
   Net::XMPP::JID is a companion to the Net::XMPP module.
   It provides the user a simple interface to set and retrieve all
+  It provides the user a simple interface to set and retrieve all
   parts of a Jabber ID (userid on a server).
 …
   GetUserID() - returns a string with the userid of the JID.
                 If the string is an address (bob%jabber.org) then
                 the function will return it as an address
+                the function will return it as an address
                 (bob@jabber.org).
   GetServer() - returns a string with the server of the JID.
   GetResource() - returns a string with the resource of the JID.
+  GetResource() - returns a string with the resource of the JID.
   GetJID()       - returns a string that represents the JID stored
 …
                              then both will be in the jid.  If all
                              you pass is a string, then that string
                              is used as the JID.  For valid settings
+                             is used as the JID.  For valid settings
                              read the specific Set functions below.
   SetUserID(string) - sets the userid.  Must be a valid userid or the
                       server will complain if you try to use this JID
                       to talk to the server.  If the string is an
+                      to talk to the server.  If the string is an
                       address then it will be converted to the %
                       form suitable for using as a User ID.
   SetServer(string) - sets the server.  Must be a valid host on the
+  SetServer(string) - sets the server.  Must be a valid host on the
                       network or the server will not be able to talk
                       to it.
 …
     my %jid;
     if ($#_ > 0 ) {
+    if ($#_ > 0 ) {
         while($#_ >= 0) { $jid{ lc pop(@_) } = pop(@_); }

perl/modules/Jabber/lib/Net/XMPP/Message.pm

-                      r8574801
+                      r7869e48
                $Mess->RemoveTo();
   RemoveFrom() - removes the from attribute from the <message/>.
                  $Mess->RemoveFrom();
   RemoveType() - removes the type attribute from the <message/>.
                  $Mess->RemoveType();
   RemoveSubject() - removes the <subject/> element from the
                     <message/>.
 …
   RemoveBody() - removes the <body/> element from the
                  <message/>.
                  $Mess->RemoveBody();
 …
                    $Mess->RemoveThread();
   RemoveError() - removes the <error/> element from the <message/>.
                   $Mess->RemoveError();
   RemoveErrorCode() - removes the code attribute from the <error/>
                       element in the <message/>.

perl/modules/Jabber/lib/Net/XMPP/Namespaces.pm

-                      rc2bed55
+                      r7869e48
   To repeat, here is an example call to add_ns():
     &add_ns(ns    => "mynamespace",
             tag   => "mytag",
 …
   DefinedXXXX(), RemoveXXXX(), AddXXXX() calls.  The basic options you
   can pass in are:
      type - This tells Stanza how to handle the call.  The possible
             values are:
            array - The value to set and returned is an an array
                    reference.  For example, <group/> in jabber:iq:roster.
 …
                ["Add"]
                ["Get","Add","Defined"]
             It all depends on how you want your API to look.
   Once more... The following:
     &add_ns(ns    => "mynamespace",
             tag   => "mytag",
 …
            );
+}
 #-----------------------------------------------------------------------------
 # __netxmpp__:iq:privacy:list:item
 …
     # XXX error check...
     $NS{$args{ns}}->{tag} = $args{tag} if exists($args{tag});
     $NS{$args{ns}}->{xpath} = $args{xpath};

perl/modules/Jabber/lib/Net/XMPP/Presence.pm

-                      rc2bed55
+                      r7869e48
   SetTo(string) - sets the to attribute.  You can either pass a string
   SetTo(JID)      or a JID object.  They must be valid JIDs or the
+  SetTo(JID)      or a JID object.  They must be valid JIDs or the
                   server will return an error message.
                   (ie.  bob@jabber.org/Silent Bob, etc...)
 …
                 $Pres->RemoveTo();
   RemoveFrom() -  removes the from attribute from the <presence/>.
                   $Pres->RemoveFrom();
   RemoveType() -  removes the type attribute from the <presence/>.
                   $Pres->RemoveType();
   RemoveStatus() -  removes the <status/> element from the <presence/>.
                     $Pres->RemoveStatus();
   RemovePriority() -  removes the <priority/> element from the
                       <presence/>.
                       $Pres->RemovePriority();
   RemoveShow() -  removes the <show/> element from the <presence/>.
                   $Pres->RemoveShow();
 =head2 Test functions
 …
     $self->{FUNCS} = \%FUNCTIONS;
     $self->_init(@_);

perl/modules/Jabber/lib/Net/XMPP/PrivacyLists.pm

-                      rc2bed55
+                      r7869e48
     $self->{CONNECTION} = $args{connection};
     bless($self, $proto);
     $self->init();
     return $self;
+}
 …
     my $self = shift;
     my $list = shift;
     my $iq = $self->{CONNECTION}->PrivacyListsGet(list=>$list);
     $self->handleIQ($iq);
 …
+    {
         my $query = $iq->GetChild("jabber:iq:privacy");
         my @lists = $query->GetLists();
         return unless ($#lists > -1);
         my @items = $lists[0]->GetItems();
         if (($#lists == 0) && ($#items > -1))
+        {
 …
     my $self = shift;
     my $list = shift;
     my $name = $list->GetName();
 …
+    {
         my %item = $item->GetItem();
         $self->addItem($name,%item);
+    }
 …
     my $self = shift;
     my $lists = shift;
     foreach my $list (@{$lists})
+    {
 …
+    {
         $self->{CONNECTION}->{DEBUG}->Log3("PrivacyLists::remove: deleting $list from the DB");
         delete($self->{LISTS}->{$list});
         delete($self->{LISTS}) if (scalar(keys(%{$self->{LISTS}})) == 0);

perl/modules/Jabber/lib/Net/XMPP/Protocol.pm

-                      ra8c55b5
+                      r7869e48
             comes back.  You can optionally specify a timeout so that
             you do not block forever.
     nonblock - send the packet with an ID, but then return that id and
                control to the master program.  Net::XMPP is still
 …
                combined with the XPath function because you can register
                a one shot function tied to the id you get back.
 =head2 Basic Functions
 …
                       groups=>["foo"]
                      );
     $Con->RosterDBRemove("bob\@jabber.org");
     $Con->RosterDBRemove(Net::XMPP::JID);
 …
     @jids = $Con->RosterDBJIDs();
     if ($Con->RosterDBGroupExists("foo")) { ...
     @groups = $Con->RosterDBGroups();
     @jids = $Con->RosterDBGroupJIDs("foo");
     @jids = $Con->RosterDBNonGroupJIDs();
     %hash = $Con->RosterDBQuery("bob\@jabber.org");
     %hash = $Con->RosterDBQuery(Net::XMPP::JID);
 …
                               then you must *NOT* specify a callback for
                               presence in the SetCallBacks function.
                                           Net::XMPP defines a few default
                                           callbacks for various types:
                                           "subscribe" -
                                             replies with subscribed
                                           "unsubscribe" -
                                             replies with unsubscribed
                                           "subscribed" -
                                             replies with subscribed
                                           "unsubscribed" -
                                             replies with unsubscribed
     SetMessageCallBacks(type=>function, - sets the callback functions for
 …
    - Status ok, no data received.
                          undef - Status not ok, stop processing.
                        IMPORTANT: You need to check the output of every
                        Process.  If you get an undef then the connection
 …
                             the has returned by RosterParse above, and
                             is the actual hash, not a reference.
     RosterDBRemove(jid) - Remove a JID from the roster DB. The JID is
                           either a string, or a Net::XMPP::JID object.
 …
     RosterDBJIDs() - returns a list of Net::XMPP::JID objects that
                      represents all of the JIDs in the DB.
     RosterDBGroups() - returns the complete list of roster groups in the
                        roster.
     RosterDBGroupExists(group) - return 1 if the group is a group in the
                                  roster DB, undef otherwise.
 …
                                that represents all of the JIDs in the
                                specified roster group.
     RosterDBNonGroupJIDs() - returns a list of Net::XMPP::JID objects
                              that represents all of the JIDs not in a
 …
                              the given key.  The available keys are:
                                name, ask, subsrcription and groups
                              The JID is either a string, or a
+                             The JID is either a string, or a
                              Net::XMPP::JID object.
 …
     my $id;
     my $tree;
     if (ref($object) !~ /^Net::XMPP/)
+    {
 …
+                }
+            }
             return if $direct_pass;
+        }
 …
 ###############################################################################
 sub SetXPathCallBacks
+{
+{
     my $self = shift;
     my (%xpaths) = @_;
 …
 ###############################################################################
 sub SetDirectXPathCallBacks
+{
+{
     my $self = shift;
     my (%xpaths) = @_;
 …
     $self->{DEBUG}->Log4("PresenceDBParse: pres(",$presence->GetXML(),")");
     my $type = $presence->GetType();
     $type = "" unless defined($type);
 …
         &{$self->{CB}->{update}}() if exists($self->{CB}->{update});
+    }
     #-------------------------------------------------------------------------
     # The loop finished... but was it done?
 …
         return( "system","SASL timed out authenticating");
+    }
     #-------------------------------------------------------------------------
     # Ok, it was done... but did we auth?
 …
         return ( "error", $self->{STREAM}->SASLClientError($sid));
+    }
     #-------------------------------------------------------------------------
     # Phew... Restart the <stream:stream> per XMPP
 …
     $self->{SESSION} = $self->{STREAM}->OpenStream($sid);
     $sid = $self->{SESSION}->{id};
     $self->{DEBUG}->Log1("AuthSASL: We got a new session. sid($sid)");
 …
     $iq->SetIQ(type=>"set");
     my $bind = $iq->NewChild(&ConstXMLNS("xmpp-bind"));
     if (defined($resource) && ($resource ne ""))
+    {
 …
     $iq->SetIQ(type=>"set");
     my $session = $iq->NewChild(&ConstXMLNS("xmpp-session"));
     my $result = $self->SendAndReceiveWithID($iq);
+}
 …
     my %args;
     while($#_ >= 0) { $args{ lc pop(@_) } = pop(@_); }
     my $iq = $self->_iq();
     $iq->SetIQ(type=>"get");
 …
     my %args;
     while($#_ >= 0) { $args{ lc pop(@_) } = pop(@_); }
     my $iq = $self->_iq();
     $iq->SetIQ(type=>"set");
 …
         return $id;
+    }
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 …
         $jid = $jid->GetJID();
+    }
     return unless exists($self->{ROSTERDB});
     return unless exists($self->{ROSTERDB}->{JIDS});
 …
         $jid = $jid->GetJID();
+    }
     return unless $self->RosterDBExists($jid);
     if (defined($key))
 …
+    }
     return %{$self->{ROSTERDB}->{JIDS}->{$jid}};
+}
+}
 …
+            }
+        }
         delete($self->{ROSTERDB}->{JIDS}->{$jid});
+    }
 …
         $self->TLSClientFailure($node);
+    }
     if ($tag eq "proceed")
+    {
 …
     $timeout = 120 unless defined($timeout);
     $timeout = 120 if ($timeout eq "");
     $self->TLSSendStartTLS();
 …
         $self->{TLS}->{error} = $message;
+    }
     $self->RemoveDirectXPathCallBacks('/[@xmlns="'.&ConstXMLNS("xmpp-tls").'"]'=>$TLS_CALLBACK);
+}
 …
+{
     my $self = shift;
     return $self->{TLS}->{secure};
+}
 …
+{
     my $self = shift;
     return $self->{TLS}->{done};
+}
 …
+{
     my $self = shift;
     return $self->{TLS}->{error};
+}
 …
     my $self = shift;
     my $node = shift;
     my $type = &XML::Stream::XPath($node,"*/name()");
 …
     my $self = shift;
     my $type = shift;
     $self->Send("<failure xmlns='".&ConstXMLNS('xmpp-tls')."'><${type}/></failure>");
+}
 …
         $self->SASLAnswerChallenge($node);
+    }
     if ($tag eq "failure")
+    {
         $self->SASLClientFailure($node);
+    }
     if ($tag eq "success")
+    {
 …
     my $challenge64 = &XML::Stream::XPath($node,"text()");
     my $challenge = MIME::Base64::decode_base64($challenge64);
     my $response = $self->SASLGetClient()->client_step($challenge);
 …
     return unless defined($mechanisms);
     my $sasl = new Authen::SASL(mechanism=>join(" ",@{$mechanisms}),
                                 callback=>{ user => $username,
 …
+{
     my $self = shift;
     return $self->{SASL}->{authed};
+}
 …
+{
     my $self = shift;
     return $self->{SASL}->{done};
+}
 …
+{
     my $self = shift;
     return $self->{SASL}->{error};
+}
 …
     my $self = shift;
     my $node = shift;
     my $type = &XML::Stream::XPath($node,"*/name()");
 …
     my $self = shift;
     my $node = shift;
     $self->{SASL}->{authed} = 1;
     $self->{SASL}->{done} = 1;
 …
+{
     my $self = shift;
     return $self->{SASL}->{client};
+}
 …
     my $self = shift;
     my $type = shift;
     $self->Send("<failure xmlns='".&ConstXMLNS('xmpp-sasl')."'><${type}/></failure>");
+}
 …
+}
 ##############################################################################
+#
 …
+{
     my $const = shift;
     return $XMLNS{$const};
+}

perl/modules/Jabber/lib/Net/XMPP/Roster.pm

-                      rc2bed55
+                      r7869e48
   Net::XMPP::Roster is a module that provides a developer an easy
   interface to an XMPP roster.  It provides high level functions to
   query, update, and manage a user's roster.
+  query, update, and manage a user's roster.
 =head1 DESCRIPTION
 …
   registers with the connection to receivce the correct packets so
   that it can track all roster updates, and presence packets.
 =head2 Basic Functions
 …
   These functions are only needed if you want to manually control
   the Roster.
   $Roster->add('bob@jabber.org',
                name=>"Bob",
 …
                 otherwise.  The jid can either be a string, or a
                 Net::XMPP::JID object.
   groupExists(group) - return 1 if the group exists in the database,
                        undef otherwise.
 …
     $self->{CONNECTION} = $args{connection};
     bless($self, $proto);
     $self->init();
     return $self;
+}
 …
     $jid = $jid->GetJID() if UNIVERSAL::isa($jid,"Net::XMPP::JID");
     return unless exists($self->{JIDS});
     return unless exists($self->{JIDS}->{$jid});
 …
     my $resource = $jid->GetResource();
     $resource = " " unless ($resource ne "");
     $jid = $jid->GetJID();
     $jid = "" unless defined($jid);
 …
+    {
         my %item;
         $item{priority} = $presence->GetPriority();
         $item{priority} = 0 unless defined($item{priority});
 …
+        }
+    }
     if ($type eq "group")
+    {
 …
     $jid = $jid->GetJID() if UNIVERSAL::isa($jid,"Net::XMPP::JID");
     if (defined($resource))
+    {
 …
         return $self->{JIDS}->{$jid}->{resources}->{$resource}->{priority};
+    }
     return unless exists($self->{JIDS}->{$jid}->{priorities});
     my @priorities = sort{ $b <=> $a } keys(%{$self->{JIDS}->{$jid}->{priorities}});
 …
     $jid = $jid->GetJID() if UNIVERSAL::isa($jid,"Net::XMPP::JID");
     return unless $self->exists($jid);
     if (defined($key))
 …
+    {
         $self->{CONNECTION}->{DEBUG}->Log3("Roster::remove: deleting $jid from the DB");
         if (defined($self->query($jid,"groups")))
+        {
 …
+            }
+        }
         delete($self->{JIDS}->{$jid});
         delete($self->{JIDS}) if (scalar(keys(%{$self->{JIDS}})) == 0);
 …
                     if ($self->{JIDS}->{$jid}->{priorities}->{$oldPriority}->[$index]->{resource} eq $resource);
+            }
             splice(@{$self->{JIDS}->{$jid}->{priorities}->{$oldPriority}},$loc,1);
 …
     my $jid = shift;
     my $resource = shift;
     $jid = $jid->GetJID() if UNIVERSAL::isa($jid,"Net::XMPP::JID");
 …
     $jid = $jid->GetJID() if UNIVERSAL::isa($jid,"Net::XMPP::JID");
     return unless $self->resourceExists($jid,$resource);
     if (defined($key))

perl/modules/Jabber/lib/Net/XMPP/Stanza.pm

-                      rc2bed55
+                      r7869e48
 =pod
   For more information on what these namespaces are for, visit
+  For more information on what these namespaces are for, visit
   http://www.jabber.org and browse the Jabber Programmers Guide.
 …
   ny:private:ns
   Name                        Type     Get  Set  Remove  Defined  Add
   ==========================  =======  ===  ===  ======  =======  ===
   Foo                         scalar    X    X     X        X
   Bar                         child                                X
+  Bar                         child                                X
   Bars                        child     X
   Test                        master    X    X
 …
     GetFoo(), SetFoo(), RemoveFoo(), DefinedFoo()
     AddBar()
     GetBars(), DefinedBars()
     GetTest(), SetMaster()
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Digest                      scalar      X    X     X        X
   Hash                        scalar      X    X     X        X
   Password                    scalar      X    X     X        X
   Resource                    scalar      X    X     X        X
   Sequence                    scalar      X    X     X        X
   Token                       scalar      X    X     X        X
   Username                    scalar      X    X     X        X
   Auth                        master      X    X
+  Digest                      scalar      X    X     X        X
+  Hash                        scalar      X    X     X        X
+  Password                    scalar      X    X     X        X
+  Resource                    scalar      X    X     X        X
+  Sequence                    scalar      X    X     X        X
+  Token                       scalar      X    X     X        X
+  Username                    scalar      X    X     X        X
+  Auth                        master      X    X
 =head1 jabber:iq:privacy
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Active                      scalar      X    X     X        X
   Default                     scalar      X    X     X        X
   List                        child                                  X
   Lists                       child       X          X        X
   Privacy                     master      X    X
+  Active                      scalar      X    X     X        X
+  Default                     scalar      X    X     X        X
+  List                        child                                  X
+  Lists                       child       X          X        X
+  Privacy                     master      X    X
 =head1 jabber:iq:privacy - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Action                      scalar      X    X     X        X
   IQ                          flag        X    X     X        X
   Message                     flag        X    X     X        X
   Order                       scalar      X    X     X        X
   PresenceIn                  flag        X    X     X        X
   PresenceOut                 flag        X    X     X        X
   Type                        scalar      X    X     X        X
   Value                       scalar      X    X     X        X
   Item                        master      X    X
+  Action                      scalar      X    X     X        X
+  IQ                          flag        X    X     X        X
+  Message                     flag        X    X     X        X
+  Order                       scalar      X    X     X        X
+  PresenceIn                  flag        X    X     X        X
+  PresenceOut                 flag        X    X     X        X
+  Type                        scalar      X    X     X        X
+  Value                       scalar      X    X     X        X
+  Item                        master      X    X
 =head1 jabber:iq:privacy - list objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Name                        scalar      X    X     X        X
   Item                        child                                  X
   Items                       child       X          X        X
   List                        master      X    X
+  Name                        scalar      X    X     X        X
+  Item                        child                                  X
+  Items                       child       X          X        X
+  List                        master      X    X
 =head1 jabber:iq:register
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Address                     scalar      X    X     X        X
   City                        scalar      X    X     X        X
   Date                        scalar      X    X     X        X
   Email                       scalar      X    X     X        X
   First                       scalar      X    X     X        X
   Instructions                scalar      X    X     X        X
   Key                         scalar      X    X     X        X
   Last                        scalar      X    X     X        X
   Misc                        scalar      X    X     X        X
   Name                        scalar      X    X     X        X
   Nick                        scalar      X    X     X        X
   Password                    scalar      X    X     X        X
   Phone                       scalar      X    X     X        X
   Registered                  flag        X    X     X        X
   Remove                      flag        X    X     X        X
   State                       scalar      X    X     X        X
   Text                        scalar      X    X     X        X
   URL                         scalar      X    X     X        X
   Username                    scalar      X    X     X        X
   Zip                         scalar      X    X     X        X
   Register                    master      X    X
+  Address                     scalar      X    X     X        X
+  City                        scalar      X    X     X        X
+  Date                        scalar      X    X     X        X
+  Email                       scalar      X    X     X        X
+  First                       scalar      X    X     X        X
+  Instructions                scalar      X    X     X        X
+  Key                         scalar      X    X     X        X
+  Last                        scalar      X    X     X        X
+  Misc                        scalar      X    X     X        X
+  Name                        scalar      X    X     X        X
+  Nick                        scalar      X    X     X        X
+  Password                    scalar      X    X     X        X
+  Phone                       scalar      X    X     X        X
+  Registered                  flag        X    X     X        X
+  Remove                      flag        X    X     X        X
+  State                       scalar      X    X     X        X
+  Text                        scalar      X    X     X        X
+  URL                         scalar      X    X     X        X
+  Username                    scalar      X    X     X        X
+  Zip                         scalar      X    X     X        X
+  Register                    master      X    X
 =head1 jabber:iq:roster
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Item                        child                                  X
   Items                       child       X
   Roster                      master      X    X
+  Item                        child                                  X
+  Items                       child       X
+  Roster                      master      X    X
 =head1 jabber:iq:roster - item objects
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Ask                         scalar      X    X     X        X
   Group                       array       X    X     X        X
   JID                         jid         X    X     X        X
   Name                        scalar      X    X     X        X
   Subscription                scalar      X    X     X        X
   Item                        master      X    X
+  Ask                         scalar      X    X     X        X
+  Group                       array       X    X     X        X
+  JID                         jid         X    X     X        X
+  Name                        scalar      X    X     X        X
+  Subscription                scalar      X    X     X        X
+  Item                        master      X    X
 =head1 urn:ietf:params:xml:ns:xmpp-bind
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   JID                         jid         X    X     X        X
   Resource                    scalar      X    X     X        X
   Bind                        master      X    X
+  JID                         jid         X    X     X        X
+  Resource                    scalar      X    X     X        X
+  Bind                        master      X    X
 =head1 urn:ietf:params:xml:ns:xmpp-session
 …
   Name                        Type       Get  Set  Remove  Defined  Add
   ==========================  =========  ===  ===  ======  =======  ===
   Session                     master      X    X
+  Session                     master      X    X
 …
     $self->{FUNCS} = \%FUNCTIONS;
     my $result = $self->_init(@_);
     return $result if defined($result);
     return $self;
+}
 …
+#
 ##############################################################################
 sub GetXML
+sub GetXML
+{
     my $self = shift;
 …
+{
     my $self = shift;
     return $self->{TAG};
+}
 …
     $node->remove_attrib("xmlns")
         if (exists($self->{SKIPXMLNS}) && ($keepXMLNS == 0));
     foreach my $child (@{$self->{CHILDREN}})
+    {
 …
     return $node;
+}
+}
 …
     my $xmlns = shift;
     my $tag = shift;
     return unless exists($Net::XMPP::Namespaces::NS{$xmlns});
 …
             if exists($Net::XMPP::Namespaces::NS{$xmlns});
+    }
     my $node = new XML::Stream::Node($tag);
     $node->put_attrib(xmlns=>$xmlns);
 …
     my $xmlns = shift;
     my $tag = shift;
     return unless exists($Net::XMPP::Namespaces::NS{$xmlns});
 …
             if exists($Net::XMPP::Namespaces::NS{$xmlns});
+    }
     my $node = new XML::Stream::Node($tag);
     $node->put_attrib(xmlns=>$xmlns);
 …
     #$self->_debug("_xpath_AUTOLOAD: setFuncs(",join(",",@setFuncs),")");
     my $type = (exists($funcs->{$var}->{type}) ?
                 $funcs->{$var}->{type} :
 …
     my $child = "";
     #-------------------------------------------------------------------------
     # When this is a master function... change the above variables...
 …
                         (ref($funcType) eq "ARRAY"));
+            }
             $child = \@newSetFuncs;
+        }
 …
+    {
         $child = $funcs->{$var}->{child};
         #$self->_debug("_xpath_AUTOLOAD: child($child)");
         if (exists($child->{ns}))
+        {
             my $addXMLNS = $child->{ns};
             my $addFuncs = $Net::XMPP::Namespaces::NS{$addXMLNS}->{xpath};
             my @calls =
 …
     my $funcs;
     my $coreFuncs = $self->{FUNCS};
     #eval "\$coreFuncs = \\%".$package."::FUNCTIONS";
 …
     #$self->_debug("_xpath: call($call) args(",join(",",@_),")");
     if ($call eq "Get")        { return $self->_xpath_get(@_)    ; }
     elsif ($call eq "Set")     { return $self->_xpath_set(@_);     }
 …
 ##############################################################################
+#
 # _xpath_get - returns the value stored in the node
+# _xpath_get - returns the value stored in the node
+#
 ##############################################################################
 …
     my $childtype = shift;
     my ($arg0) = shift;
     #$self->_debug("_xpath_get: self($self) type($type) xpath($xpath) childtype($childtype)");
     #$self->{TREE}->debug();
 …
     my $subType;
     ($type,$subType) = $self->_xpath_resolve_types($type);
     #-------------------------------------------------------------------------
 …
+    {
         my %fields;
         foreach my $func (sort {$a cmp $b} @{$childtype})
+        {
 …
         return %fields;
+    }
     #-------------------------------------------------------------------------
     # type == node
 …
     # XXX Remove this if there are no problems
     #if ($type eq "node")
     #{
+    #{
         #$self->_debug("_xpath_get: node: xmlns($arg0)") if defined($arg0);
 …
             #push(@results,$child)
             #     if (!defined($arg0) ||
             #         ($arg0 eq "") ||
+            #         ($arg0 eq "") ||
             #         ($child->GetTree(1)->get_attrib("xmlns") eq $arg0));
             #}
 …
         return $#nodes > -1;
+    }
     #-------------------------------------------------------------------------
     # type == array
 …
         return $nodes[0];
+    }
     #-------------------------------------------------------------------------
     # type == raw
 …
         return join("",@{$self->{RAWXML}}) if ($#{$self->{RAWXML}} > -1);
         foreach my $node (@nodes)
+        {
 …
         #$self->_debug("_xpath_set: val($val)") unless !defined($val);
         #$self->_debug("_xpath_set: path($path)");
         my $childPath = "";
         while(($path !~ /^\/?\@/) && ($path !~ /^\/?text\(\)/))
 …
             #$self->_debug("_xpath_set: path($path)");
             #$self->_debug("_xpath_set: childPath($childPath)");
             if (($type eq "scalar") || ($type eq "jid") || ($type eq "timestamp"))
+            {
                 my $tmpPath = $child;
                 $tmpPath = "$childPath/$child" if ($childPath ne "");
                 my @nodes = $self->{TREE}->XPath("$tmpPath");
                 #$self->_debug("_xpath_set: \$#nodes($#nodes)");
 …
                 return;
+            }
             $childPath .= "/" unless ($childPath eq "");
             $childPath .= $child;
 …
         my ($piece) = ($path =~ /^\/?([^\/]+)/);
         #$self->_debug("_xpath_set: piece($piece)");
 …
     my @nodes = $self->{TREE}->XPath($xpath);
     my $defined = ($#nodes > -1);
     #$self->_debug("_xpath_defined: nodes(",join(",",@nodes),")");
     #$self->_debug("_xpath_defined: ",$#nodes);
     if (!$defined && (($type eq "child") || ($type eq "children") || ($type eq "node")))
+    {
 …
             $ns = $childtype->{ns};
+        }
         foreach my $packet (@{$self->{CHILDREN}})
+        {
 …
 ##############################################################################
+#
 # _xpath_add - returns the value stored in the node
+# _xpath_add - returns the value stored in the node
+#
 ##############################################################################
 …
     #$self->_debug("_xpath_remove: nodes($#nodes)");
     if ($xpath =~ /\@(\S+)/)
+    {
         my $attrib = $1;
         #$self->_debug("_xpath_remove: attrib($attrib)");
         if ($nodePath eq "")
+        {
 …
         return;
+    }
     foreach my $node (@nodes)
+    {
 …
     my $self = shift;
     my $type = shift;
     my $subType = "";
     if (ref($type) eq "ARRAY")
 …
+        }
+    }
     #$self->_debug("_xpath_resolve_types: type($type) subtype($subType)");

perl/modules/Jabber/lib/XML/Stream.pm

-                      ra8d5a39
+                      r7869e48
         my $lc = lc($module);
         eval("\$HANDLERS{\$lc}->{startElement} = \\&XML::Stream::${module}::_handle_element;");
         eval("\$HANDLERS{\$lc}->{endElement}   = \\&XML::Stream::${module}::_handle_close;");
 …
     my $root = $self->GetRoot($sid);
     if ($root->{xmlns} ne $self->{SIDS}->{$serverid}->{namespace})
+    {
 …
+    }
     while($#_ >= 0) { $self->{SIDS}->{newconnection}->{ lc pop(@_) } = pop(@_); }
     my $timeout = exists($self->{SIDS}->{newconnection}->{timeout}) ?
                   delete($self->{SIDS}->{newconnection}->{timeout}) :
 …
     $self->debug(4,"Connect: timeout($timeout)");
     if (exists($self->{SIDS}->{newconnection}->{srv}))
 …
             my $res = Net::DNS::Resolver->new();
             my $query = $res->query($self->{SIDS}->{newconnection}->{srv}.".".$self->{SIDS}->{newconnection}->{hostname},"SRV");
             if ($query)
+            {
+            {
                 $self->{SIDS}->{newconnection}->{hostname} = ($query->answer)[0]->target();
                 $self->{SIDS}->{newconnection}->{port} = ($query->answer)[0]->port();
 …
         $self->{SIDS}->{newconnection}->{sock} =
             new FileHandle(">&STDOUT");
+    }
+    }
     #---------------------------------------------------------------------------
 …
     #---------------------------------------------------------------------------
     my %stream_args;
     if (($self->{SIDS}->{$currsid}->{connectiontype} eq "tcpip") ||
         ($self->{SIDS}->{$currsid}->{connectiontype} eq "http"))
 …
         $stream_args{to}= $self->{SIDS}->{$currsid}->{hostname}
             unless exists($self->{SIDS}->{$currsid}->{to});
         $stream_args{to} = $self->{SIDS}->{$currsid}->{to}
             if exists($self->{SIDS}->{$currsid}->{to});
 …
                 ($self->{SIDS}->{$currsid}->{myhostname} ne "")
                );
         $stream_args{from} = $self->{SIDS}->{$currsid}->{from}
             if exists($self->{SIDS}->{$currsid}->{from});
         $stream_args{id} = $self->{SIDS}->{$currsid}->{id}
             if (exists($self->{SIDS}->{$currsid}->{id}) &&
 …
         $stream_args{namespaces} = $self->{SIDS}->{$currsid}->{namespaces};
+    }
     my $stream =
         $self->StreamHeader(
 …
+        }
+    }
     return $self->GetRoot($sid);
+}
 …
     #---------------------------------------------------------------------------
     $self->{SIDS}->{$sid}->{streamfeatures}->{received} = 0;
     #---------------------------------------------------------------------------
     # First acitivty is the connection... duh. =)
 …
                 $self->debug(4,"Process: sid($sid) time(",time,") timeout(undef)");
+            }
             $self->Respond($sid)
                 if (exists($self->{SIDS}->{$sid}->{activitytimeout}) &&
 …
     $self->debug(3,"Send: sid($sid)");
     $self->debug(3,"Send: status($self->{SIDS}->{$sid}->{status})");
     $self->{SIDS}->{$sid}->{keepalive} = time;
 …
                 return;
+            }
             $self->debug(4,"Send: SENDWRITTEN($self->{SENDWRITTEN})");
 …
+        }
+    }
     #-------------------------------------------------------------------------
     # XMPP-TLS - 1.0
 …
+        }
+    }
     #-------------------------------------------------------------------------
     # XMPP-Bind - 1.0
 …
         $self->{SIDS}->{$sid}->{streamfeatures}->{'xmpp-bind'} = 1;
+    }
     #-------------------------------------------------------------------------
     # XMPP-Session - 1.0
 …
         $self->{SIDS}->{$sid}->{streamfeatures}->{'xmpp-session'} = 1;
+    }
+}
 …
         $self->TLSClientFailure($sid,$node);
+    }
     if ($tag eq "proceed")
+    {
 …
     $timeout = 120 unless defined($timeout);
     $timeout = 120 if ($timeout eq "");
     $self->TLSStartTLS($sid);
 …
         return;
+    }
     IO::Socket::SSL->start_SSL($self->{SIDS}->{$sid}->{sock},{SSL_verify_mode=>0x00});
 …
     $self->debug(1,"TLSClientProceed: SSL: We are secure")
         if ($self->{SIDS}->{$sid}->{sock});
     $self->{SIDS}->{$sid}->{tls}->{done} = 1;
     $self->{SIDS}->{$sid}->{tls}->{secure} = 1;
 …
     my $self = shift;
     my $sid = shift;
     return $self->{SIDS}->{$sid}->{tls}->{secure};
+}
 …
     my $self = shift;
     my $sid = shift;
     return $self->{SIDS}->{$sid}->{tls}->{done};
+}
 …
     my $self = shift;
     my $sid = shift;
     return $self->{SIDS}->{$sid}->{tls}->{error};
+}
 …
     my $sid = shift;
     my $node = shift;
     my $type = &XPath($node,"*/name()");
 …
     my $sid = shift;
     my $type = shift;
     $self->Send($sid,"<failure xmlns='".&ConstXMLNS('xmpp-tls')."'><${type}/></failure>");
+}
 …
         $self->SASLAnswerChallenge($sid,$node);
+    }
     if ($tag eq "failure")
+    {
         $self->SASLClientFailure($sid,$node);
+    }
     if ($tag eq "success")
+    {
 …
     my $challenge64 = &XPath($node,"text()");
     my $challenge = MIME::Base64::decode_base64($challenge64);
     #-------------------------------------------------------------------------
     # As far as I can tell, if the challenge contains rspauth, then we authed.
 …
     return unless defined($mechanisms);
     my $sasl = new Authen::SASL(mechanism=>join(" ",@{$mechanisms}),
                                 callback=>{
 …
     my $self = shift;
     my $sid = shift;
     return $self->{SIDS}->{$sid}->{sasl}->{authed};
+}
 …
     my $self = shift;
     my $sid = shift;
     return $self->{SIDS}->{$sid}->{sasl}->{done};
+}
 …
     my $self = shift;
     my $sid = shift;
     return $self->{SIDS}->{$sid}->{sasl}->{error};
+}
 …
     my $sid = shift;
     my $node = shift;
     my $type = &XPath($node,"*/name()");
 …
     my $sid = shift;
     my $node = shift;
     $self->{SIDS}->{$sid}->{sasl}->{authed} = 1;
     $self->{SIDS}->{$sid}->{sasl}->{done} = 1;
 …
     my $sid = shift;
     my $type = shift;
     $self->Send($sid,"<failure xmlns='".&ConstXMLNS('xmpp-sasl')."'><${type}/></failure>");
+}
 …
         # Make sure we are receiving a valid stream on the same namespace.
         #---------------------------------------------------------------------
         $self->debug(3,"_handle_root: ($self->{SIDS}->{$self->{SIDS}->{$sid}->{serverid}}->{namespace})");
         $self->{SIDS}->{$sid}->{status} =
 …
+        }
+    }
     #-------------------------------------------------------------------------
     # Sometimes we will get an error, so let's parse the tag assuming that we
 …
     my $stream_prefix = $self->StreamPrefix($sid);
     $self->debug(5,"_handle_root: stream_prefix($stream_prefix)");
     if ($tag eq $stream_prefix.":error")
+    {
 …
     $self->{SIDS}->{$sid}->{streamerror}->{type} = "unknown";
     $self->{SIDS}->{$sid}->{streamerror}->{node} = $node;
     #-------------------------------------------------------------------------
     # Check for older 0.9 streams and handle the errors for them.
 …
     my $tree = shift;
     my $path = shift;
     my $query = new XML::Stream::XPath::Query($path);
     my $result = $query->execute($tree);
 …
         my %attribs = $result->getAttribs();
         return %attribs if (scalar(keys(%attribs)) > 0);
         my @values = $result->getValues();
         @values = $result->getList() unless ($#values > -1);
 …
     my $tree = shift;
     my $path = shift;
     my $query = new XML::Stream::XPath::Query($path);
     my $result = $query->execute($tree);
 …
+{
     my $const = shift;
     return $XMLNS{$const};
+}
 …
     my $self = shift;
     my $sid = shift;
     return $self->ns2prefix($sid,&ConstXMLNS("stream"));
+}
 …
     $self->debug(1,"LoadSSL: Load the IO::Socket::SSL module");
     if (defined($SSL) && ($SSL == 1))
+    {
 …
         return 1;
+    }
     if (defined($SSL) && ($SSL == 0))
+    {
 …
         $stream .= " ".$ns->GetStream();
+    }
     $stream .= ">";

perl/modules/Jabber/lib/XML/Stream/Namespace.pm

-                      rc2bed55
+                      r7869e48
 =head1 NAME
 XML::Stream::Namespace - Object to make defining Namespaces easier in
+XML::Stream::Namespace - Object to make defining Namespaces easier in
                          XML::Stream.
 …
   GetAttributes() returns a hash ( attrib1=>"value1",attrib2=>"value2")
   GetStream() returns the following string:
     "xmlns:mynamespace='http://www.nynamespace.com/xmlns'
      mynamespace:attrib1='value1'
+    "xmlns:mynamespace='http://www.nynamespace.com/xmlns'
+     mynamespace:attrib1='value1'
      mynamespace:attrib2='value2'"
 …
   # of the stream to foo.bar.org:1234...
+  #
   #   <stream:stream
+  #   <stream:stream
   #    xmlns:stream="http://etherx.jabber.org/streams"
   #    to="foo.bar.org"
   #    xmlns="foo:bar"
+  #    xmlns="foo:bar"
   #    xmlns:mynamespace="http://www.mynamespace.org/xmlns"
   #    mynamespace:foo="bar"
   #    mynamespace:bob="vila">
+  #
 =head1 AUTHOR
 …
     $string .= "='".$self->GetAttributes($attrib)."'";
+  }
   return $string;
+}

perl/modules/Jabber/lib/XML/Stream/Node.pm

-                      rc2bed55
+                      r7869e48
   remove_child(node) - removes the child node from the current node.
   remove_cdata() - removes all of the cdata children from the current node.
 …
   XPath(path) - run XML::Stream::XPath on this node.
   XPathCheck(path) - run XML::Stream::XPath on this node and return 1 or 0
                      to see if it matches or not.
 …
     return $cdata;
+}
+}
 …
         splice(@{$self->{CHILDREN}},$index,1);
+    }
+}
+}
 …
     return () unless exists($self->{ATTRIBS});
     return %{$self->{ATTRIBS}};
+}
+}
 …
 sub put_attrib
+{
+{
     my $self = shift;
     my (%att) = @_;
 …
     my ($tag) = @_;
     $self->{TAG} = $tag;
+    $self->{TAG} = $tag;
+}
 …
     $self->debug(2,"Node: _handle_close: check2(",$#{$self->{SIDS}->{$sid}->{node}},")");
     if($#{$self->{SIDS}->{$sid}->{node}} == -1)
+    {
 …
+        {
             my $stream_prefix = $self->StreamPrefix($sid);
             if(defined($self->{SIDS}->{$sid}->{node}->[0]) &&
                ($self->{SIDS}->{$sid}->{node}->[0]->get_tag() =~ /^${stream_prefix}\:/))
 …
+                {
                     my $xmlns = $node->get_attrib("xmlns");
                     $self->ProcessSASLPacket($sid,$node)
                         if ($xmlns eq &XML::Stream::ConstXMLNS("xmpp-sasl"));

perl/modules/Jabber/lib/XML/Stream/Parser.pm

rc2bed55	r7869e48
324	324	$self->{CNAME}->[$self->{CURR}] = $name;
325	325	}
326
	326
327	327	$self->{XML} = substr($self->{XML},$close+1,length($self->{XML})-$close-1);
328	328	next;
…	…
337	337	return $self->returnData(0);
338	338	}
339
	339
340	340	&{$self->{HANDLER}->{characters}}($self,substr($self->{XML},9,$cdataclose-9));
341
	341
342	342	$self->{XML} = substr($self->{XML},$cdataclose+3,length($self->{XML})-$cdataclose-3);
343	343	next;
…	…
510	510	return unless ($self->{DOC} == 1);
511	511
512		if ($self->{STYLE} eq "debug")
	512	if ($self->{STYLE} eq "debug")
513	513	{
514	514	my $str = $cdata;
…	…
530	530	push @{$self->{TREE}[$#{$self->{TREE}}]}, 0;
531	531	push @{$self->{TREE}[$#{$self->{TREE}}]}, $cdata;
532		}
	532	}
533	533	}
534	534	}

perl/modules/Jabber/lib/XML/Stream/Tree.pm

-                      rc2bed55
+                      r7869e48
         push @{$self->{SIDS}->{$sid}->{tree}[$#{$self->{SIDS}->{$sid}->{tree}}]}, 0;
         push @{$self->{SIDS}->{$sid}->{tree}[$#{$self->{SIDS}->{$sid}->{tree}}]}, $cdata;
+    }
+    }
+}
 …
             if(defined($self->{SIDS}->{$sid}->{tree}->[0]) &&
                ($self->{SIDS}->{$sid}->{tree}->[0] =~ /^${stream_prefix}\:/))
+            {
+            {
                 my @tree = @{$self->{SIDS}->{$sid}->{tree}};
                 $self->{SIDS}->{$sid}->{tree} = [];
 …
                 my @tree = @{$self->{SIDS}->{$sid}->{tree}};
                 $self->{SIDS}->{$sid}->{tree} = [];
                 my @special =
                     &XML::Stream::XPath(
 …
                     return 1;
+                }
                 #---------------------------------------------------------------------
                 # Return the raw CDATA value without mark ups, or the value of the
 …
     my $str = "";
     if (ref($parseTree->[0]) eq "")
+    if (ref($parseTree->[0]) eq "")
+    {
         if ($parseTree->[0] eq "0")
 …
+        {
             $str .= ">";
             my $index = 1;
             while($index <= $#{$parseTree->[1]})
 …
                 $index += 2;
+            }
             $str .= $rawXML if defined($rawXML);
             $str .= "</".$parseTree->[0].">";

perl/modules/Jabber/lib/XML/Stream/XPath/Op.pm

-                      rc2bed55
+                      r7869e48
     $self->{TYPE} = shift;
     $self->{VALUE} = shift;
     return $self;
+}
 …
+        {
             push(@valid_elems,$elem);
+        }
+    }
     $$ctxt->setList(@valid_elems);
+        }
+    }
+    $$ctxt->setList(@valid_elems);
     if ($#valid_elems == -1)
+    {
 …
     my @valid_elems;
     foreach my $elem (@elems)
+    {
         push(@valid_elems,$self->descend($elem));
+    }
     $$ctxt->setList(@valid_elems);
 …
     my @valid_elems;
     if (($self->{VALUE} eq "*") || (&XML::Stream::GetXMLData("tag",$elem) eq $self->{VALUE}))
+    {
         push(@valid_elems,$elem);
+    }
     foreach my $child (&XML::Stream::GetXMLData("child array",$elem,"*"))
+    {
         push(@valid_elems,$self->descend($child));
+    }
     return @valid_elems;
+}
 …
+        }
+    }
     $$ctxt->setList(@valid_elems);
 …
     my $elem = shift;
     return &XML::Stream::GetXMLData("value",$elem);
+}
+}
 …
     $tmp_ctxt->setList($$ctxt->getList());
     $tmp_ctxt->in_context(0);
     if (!$self->{OP_L}->isValid(\$tmp_ctxt) || !$self->{OP_R}->isValid(\$tmp_ctxt))
+    {
 …
         @valid_elems = $$ctxt->getList();
+    }
     $$ctxt->setList(@valid_elems);
 …
     print $space,"    op_l: ";
     $self->{OP_L}->display($space."    ");
     print $space,"    op_r: ";
     $self->{OP_R}->display($space."    ");
 …
     $tmp_ctxt->setList($$ctxt->getList());
     $tmp_ctxt->in_context(0);
     if (!$self->{OP_L}->isValid(\$tmp_ctxt) || !$self->{OP_R}->isValid(\$tmp_ctxt))
+    {
 …
         @valid_elems = $$ctxt->getList();
+    }
     $$ctxt->setList(@valid_elems);
 …
     print $space,"    op_l: ";
     $self->{OP_L}->display($space."    ");
     print $space,"    op_r: ";
     $self->{OP_R}->display($space."    ");
 …
     my @values;
     my %attribs;
     foreach my $elem (@elems)
+    {
 …
         return;
+    }
     return 1;
+}
 …
     my $opl = $self->{OP_L}->isValid($ctxt);
     my $opr = $self->{OP_R}->isValid($ctxt);
     if ($opl && $opr)
+    {
 …
     print $space,"  op_l: \n";
     $self->{OP_L}->display($space."    ");
     print $space,"  op_r: \n";
     $self->{OP_R}->display($space."    ");
 …
         my $opl = $self->{OP_L}->isValid(\$tmp_ctxt_l);
         my $opr = $self->{OP_R}->isValid(\$tmp_ctxt_r);
         if ($opl || $opr)
+        {
             push(@valid_elems,$elem);
+        }
+    }
     $$ctxt->setList(@valid_elems);
+        }
+    }
+    $$ctxt->setList(@valid_elems);
     if ($#valid_elems == -1)
+    {
 …
     print "$space    op_l: ";
     $self->{OP_L}->display("$space    ");
     print "$space    op_r: ";
     $self->{OP_R}->display("$space    ");
 …
     my $self = shift;
     my $elem = shift;
     my $result;
     eval("\$result = &{\$XML::Stream::XPath::VALUES{\$self->{VALUE}}}(\$elem);");
 …
             push(@valid_elems,$elem);
             push(@valid_values,$text);
+        }
+        }
+    }
     $$ctxt->setList(@valid_elems);
     $$ctxt->setValues(@valid_values);
     if ($#valid_elems == -1)
+    {
 …
+        {
             push(@valid_elems,$elem);
+        }
+    }
     $$ctxt->setList(@valid_elems);
+        }
+    }
+    $$ctxt->setList(@valid_elems);
     if ($#valid_elems == -1)
+    {
 …
             push(@valid_elems,$elem);
             push(@valid_values,$text);
+        }
+        }
+    }
     $$ctxt->setList(@valid_elems);
     $$ctxt->setValues(@valid_values);
     if ($#valid_elems == -1)
+    {
 …
+        {
             push(@valid_elems,$elem);
+        }
+    }
     $$ctxt->setList(@valid_elems);
+        }
+    }
+    $$ctxt->setList(@valid_elems);
     if ($#valid_elems == -1)
+    {

perl/modules/Jabber/lib/XML/Stream/XPath/Query.pm

rc2bed55	r7869e48
37	37	bless($self,$proto);
38	38
39		$self->{TOKENS} = [ '/','[',']','@','"',"'",'=','!','(',')',':',' ',','];
	39	$self->{TOKENS} = [ '/','[',']','@','"',"'",'=','!','(',')',':',' ',','];
40	40	$self->{QUERY} = shift;
41
	41
42	42	if (!defined($self->{QUERY}) \|\| ($self->{QUERY} eq ""))
43	43	{
44	44	confess("No query string specified");
45	45	}
46
	46
47	47	$self->parseQuery();
48
	48
49	49	return $self;
50	50	}
…	…
52	52
53	53	sub getNextToken
54		{
	54	{
55	55	my $self = shift;
56	56	my $pos = shift;
…	…
104	104	my $token_start = ++$$pos;
105	105	my $ident;
106
	106
107	107	if (defined($token))
108	108	{
…	…
193	193	return;
194	194	}
195
	195
196	196	$$pos = $token_start;
197	197	my $val = $self->getNextIdentifier($pos);
…	…
234	234
235	235	$self->getOp($pos,$token);
236
	236
237	237	foreach my $arg ($op_pos..$#{$self->{OPS}})
238	238	{
…	…
241	241
242	242	splice(@{$self->{OPS}},$op_pos);
243
	243
244	244	}
245	245	elsif ($token eq ")")
…	…
261	261	confess("Found ',' but not in a function");
262	262	}
263
	263
264	264	}
265	265	elsif ($token eq "=")
…	…
280	280	}
281	281	$$pos++;
282
	282
283	283	my $tmp_op;
284	284	while(!defined($tmp_op))
…	…
307	307	confess("Token undefined");
308	308	}
309
	309
310	310	$loop = 0 unless $in_context;
311	311	}

perl/modules/Jabber/lib/XML/Stream/XPath/Value.pm

rc2bed55	r7869e48
96	96
97	97	sub getAttribs
98		{
	98	{
99	99	my $self = shift;
100	100	return unless (scalar(keys(%{$self->{ATTRIBS}})) > 0);

perl/modules/Twitter/lib/BarnOwl/Module/Twitter.pm

-                      rb8a3e00
+                      r7869e48
         my $twitter_args = { username   => $cfg->{user},
                              password   => $cfg->{password},
                              source     => 'barnowl',
+                             source     => 'barnowl',
                          };
         if (defined $cfg->{service}) {
 …
         my $handle = find_account($account);
         $handle->twitter(@_);
+    }
+    }
     else {
         # broadcast
 …
     summary     => 'Send a Twitter @ message',
     usage       => 'twitter-atreply USER [ACCOUNT]',
     description => 'Send a Twitter @reply Message to USER on ACCOUNT (defaults to default_sender,'
+    description => 'Send a Twitter @reply Message to USER on ACCOUNT (defaults to default_sender,'
     . "\nor first service if no default is provided)"
+    }

perl/modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm

r4ebbfbc	r7869e48
397	397	type => 'Twitter',
398	398	sender => $self->{cfg}->{user} \|\| $self->{user},
399		recipient => $who,
	399	recipient => $who,
400	400	direction => 'out',
401	401	body => $msg,

perl/modules/WordWrap/inc/Module/Install/Metadata.pm

-                      r1375a6a
+                      r7869e48
 sub _perl_version {
         my $v = $_[-1];
         $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
+        $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
         $v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
         $v =~ s/(\.\d\d\d)000$/$1/;
 …
 sub write_mymeta {
         my $self = shift;
         # If there's no existing META.yml there is nothing we can do
         return unless -f 'META.yml';

perlconfig.c

-                      r6401db3
+                      r7869e48
                    owl_new_sv(owl_pair_get_value(pair)),0);
+  }
   MSG2H(h, type);
   MSG2H(h, direction);
 …
   MSG2H(h, zwriteline);
   if (owl_message_get_header(m)) {
     MSG2H(h, header);
+    MSG2H(h, header);
+  }
   (void)hv_store(h, "time", strlen("time"), owl_new_sv(owl_message_get_timestr(m)),0);
 …
   SV *msgref, *srv;
   char *out;
   ENTER ;
   SAVETMPS;
   PUSHMARK(SP) ;
   msgref = owl_perlconfig_message2hashref(m);
   XPUSHs(sv_2mortal(msgref));
   PUTBACK ;
   count = call_pv(subname, G_SCALAR|G_EVAL);
   SPAGAIN ;
 …
     out = NULL;
+  }
   PUTBACK ;
   FREETMPS ;
 …
   XPUSHs(sv_2mortal(newSViv(success)));
   PUTBACK;
   call_sv(cb, G_DISCARD|G_EVAL);

perlglue.xs

-                      rb303ba2
+                      r7869e48
         CODE:
+        {
                 owl_function_adminmsg(header, body);
+        }
 const char *
+                owl_function_adminmsg(header, body);
+        }
+const char *
 get_data_dir ()
         CODE:
 …
         RETVAL
 const char *
+const char *
 get_config_dir ()
         CODE:
                 RETVAL = owl_global_get_confdir(&g);
         OUTPUT:
         RETVAL
 void
 popless_text(text)
+        RETVAL
+void
+popless_text(text)
         const char *text
         CODE:
 …
 void
 popless_ztext(text)
+popless_ztext(text)
         const char *text
         CODE:
 …
 void
 error(text)
+error(text)
         const char *text
         CODE:
 …
         CODE:
                 rv = owl_text_wordwrap(in, cols);
                 RETVAL = rv;
+                RETVAL = rv;
         OUTPUT:
                 RETVAL

popexec.c

-                      re146cd7
+                      r7869e48
   if (!pe) return FALSE;
   /* If pe->winactive is 0 then the vwin has closed.
+  /* If pe->winactive is 0 then the vwin has closed.
    * If pe->pid is 0 then the child has already been reaped.
    * if d->fd is -1 then the fd has been closed out.
 …
     owl_function_debugmsg("waitpid got child status: <%d>\n", status);
     pe->pid = 0;
     if (pe->winactive) {
+    if (pe->winactive) {
       owl_viewwin_append_text(pe->vwin, "\n");
+    }

regex.c

-                      rf271129
+                      r7869e48
   char *errbuf;
   const char *ptr;
   re->string=g_strdup(string);
 …
   char *quoted;
   int ret;
   quoted = owl_text_quote(string, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
   ret = owl_regex_create(re, quoted);
 …
     return(0);
+  }
   ret=regexec(&(re->re), string, 1, &match, 0);
   out=ret;

sepbar.c

r6eb3ed9	r7869e48
114	114	getyx(sepwin, y, x);
115	115	wmove(sepwin, y, owl_global_get_cols(&g)-1);
116
	116
117	117	wattroff(sepwin, A_BOLD);
118	118	wattroff(sepwin, A_REVERSE);

stubgen.pl

rca54fd6	r7869e48
29	29	print "int owl_global_get_$altvarname(const owl_global *g) {\n";
30	30	print " return owl_variable_get_int(owl_variable_get_var(&g->vars, \"$varname\"));\n}\n";
31		}
	31	}
32	32	}
33	33	}

style.c

r14be3a5	r7869e48
48	48
49	49	SV *sv = NULL;
50
	50
51	51	/* Call the perl object */
52	52	OWL_PERL_CALL_METHOD(s->perlobj,

t/completion.t

-                      re59d775
+                      r7869e48
     my $before_point = shift;
     my $after_point = shift;
     my $ctx = BarnOwl::Completion::Context->new($before_point,
                                                 $after_point);
 …
     my $after_point = shift;
     my $shift = shift;
     my $ctx = BarnOwl::Completion::Context->new($before_point,
                                                 $after_point);
 …
     my $words = shift;
     my $complete = shift || \&complete_zwrite;
     my $ctx = BarnOwl::Completion::Context->new($before, $after);
 …
     my $files = shift;
     my $expect = [ sort {$a->[1] cmp $b->[1]}
+    my $expect = [ sort {$a->[1] cmp $b->[1]}
         ((map {["$_/", defined($pfx)?"$pfx/$_/":"$_/", 0]} @$dirs),
          (map {["$_",  defined($pfx)?"$pfx/$_" :$_   , 1]} @$files))

tester.c

-                      r97cdbaf5
+                      r7869e48
                      owl_text_substitute("~/meep", "~", "/u/foo"));
   FAIL_UNLESS("skiptokens 1",
+  FAIL_UNLESS("skiptokens 1",
               !strcmp("bar quux", skiptokens("foo bar quux", 1)));
   FAIL_UNLESS("skiptokens 2",
+  FAIL_UNLESS("skiptokens 2",
               !strcmp("meep", skiptokens("foo 'bar quux' meep", 2)));
 …
   l = owl_dict_get_keys(&d);
   FAIL_UNLESS("get_keys result size", 3 == l->len);
   /* these assume the returned keys are sorted */
   FAIL_UNLESS("get_keys result val", 0 == strcmp("a", l->pdata[0]));

text.c

-                      rf271129
+                      r7869e48
   ptr1=in;
   end=in+strlen(in);
   while(ptr1<end) {
     /* look for an open bracket */
 …
     /* find the close bracket */
     ptr3=strchr(ptr2, '>');
     /* if there is no close, copy as you are and exit */
     if (!ptr3) {

util.c

-                      r7b89e8c
+                      r7869e48
   owl_string_vappendf_quoted(buf, tmpl, ap);
   va_end(ap);
   return g_string_free(buf, false);
+  return g_string_free(buf, false);
+}
 …
+{
   /* 32 chosen for first attempt because timestr will end up being
    * something like "Www Mmm dd hh:mm:ss AM yyyy UTC\0" */
+   * something like "Www Mmm dd hh:mm:ss AM yyyy UTC\0" */
   size_t timestr_size = 16;
   char *timestr = NULL;
 …
 CALLER_OWN char *owl_util_stripnewlines(const char *in)
+{
   char  *tmp, *ptr1, *ptr2, *out;
 …
 int owl_util_can_break_after(gunichar c)
+{
   if (c == ' ') return 1;
   if (c >= 0x3000 && c <= 0x312f) {
 …
 /*
  * There are three ways the signal could come to an end:
+ *
+ *
  * 1. The user explicitly disconnects it with the returned signal_id.
  *    - In that case, the disconnection unref's the closure, causing it

variable.c

-                      rd126a19
+                      r7869e48
   OWLVAR_BOOL( "logging" /* %OwlVarStub */, 0,
                "turn personal logging on or off",
+               "turn personal logging on or off",
                "If this is set to on, personal messages are\n"
                "logged in the directory specified\n"
 …
                "If this is set to on, class messages are\n"
                "logged in the directory specified\n"
                "by the 'classlogpath' variable.\n"
+               "by the 'classlogpath' variable.\n"
                "The filename in that directory is derived from\n"
                "the name of the class to which the message was sent.\n" ),
 …
   OWLVAR_PATH( "logpath" /* %OwlVarStub */, "~/zlog/people",
                "path for logging personal zephyrs",
+               "path for logging personal zephyrs",
                "Specifies a directory which must exist.\n"
                "Files will be created in the directory for each sender.\n"),
 …
                "This file will be logged to if 'debug' is set to 'on'.\n"
                "BarnOwl will append a dot and the current process's pid to the filename."),
   OWLVAR_PATH( "zsigproc" /* %OwlVarStub:zsigproc */, NULL,
                "name of a program to run that will generate zsigs",
 …
                "turn zaway on or off", "" ),
   OWLVAR_STRING( "zaway_msg" /* %OwlVarStub */,
+  OWLVAR_STRING( "zaway_msg" /* %OwlVarStub */,
                  OWL_DEFAULT_ZAWAYMSG,
                  "zaway msg for responding to zephyrs when away", "" ),
   OWLVAR_STRING( "zaway_msg_default" /* %OwlVarStub */,
+  OWLVAR_STRING( "zaway_msg_default" /* %OwlVarStub */,
                  OWL_DEFAULT_ZAWAYMSG,
                  "default zaway message", "" ),
 …
                     NULL, owl_variable_aaway_set, NULL),
   OWLVAR_STRING( "aaway_msg" /* %OwlVarStub */,
+  OWLVAR_STRING( "aaway_msg" /* %OwlVarStub */,
                  OWL_DEFAULT_AAWAYMSG,
                  "AIM away msg for responding when away", "" ),
   OWLVAR_STRING( "aaway_msg_default" /* %OwlVarStub */,
+  OWLVAR_STRING( "aaway_msg_default" /* %OwlVarStub */,
                  OWL_DEFAULT_AAWAYMSG,
                  "default AIM away message", "" ),
   OWLVAR_STRING( "view_home" /* %OwlVarStub */, "all",
                  "home view to switch to after 'X' and 'V'",
+                 "home view to switch to after 'X' and 'V'",
                  "SEE ALSO: view, filter\n" ),
 …
               "notifications of buddies as soon as you login, set it to 0 instead."),
   OWLVAR_INT_FULL( "typewinsize" /* %OwlVarStub:typwin_lines */,
+  OWLVAR_INT_FULL( "typewinsize" /* %OwlVarStub:typwin_lines */,
                    OWL_TYPWIN_SIZE,
                   "number of lines in the typing window",
+                  "number of lines in the typing window",
                    "This specifies the height of the window at the\n"
                    "bottom of the screen where commands are entered\n"
 …
+}
 /* note that changing the value of this will clobber
+/* note that changing the value of this will clobber
  * any user setting of this */
 int owl_variable_disable_ctrl_d_set(owl_variable *v, const void *newval)
 …
       owl_function_command_norv("bindkey editmulti C-d command edit:done");
+    }
+  }
   return owl_variable_int_set_default(v, newval);
+  }
+  return owl_variable_int_set_default(v, newval);
+}
 …
       break;
     case OWL_VARIABLE_STRING:
       if (!cur->validate_fn)
+      if (!cur->validate_fn)
         cur->validate_fn = owl_variable_string_validate_default;
       if (!cur->set_fn)
+      if (!cur->set_fn)
         cur->set_fn = owl_variable_string_set_default;
       if (!cur->set_fromstring_fn)
+      if (!cur->set_fromstring_fn)
         cur->set_fromstring_fn = owl_variable_string_set_fromstring_default;
       if (!cur->get_fn)
+      if (!cur->get_fn)
         cur->get_fn = owl_variable_get_default;
       if (!cur->get_tostring_fn)
         cur->get_tostring_fn = owl_variable_string_get_tostring_default;
+      if (!cur->get_tostring_fn)
+        cur->get_tostring_fn = owl_variable_string_get_tostring_default;
       if (!cur->delete_fn)
         cur->delete_fn = owl_variable_delete_default;
 …
       break;
     case OWL_VARIABLE_BOOL:
       if (!cur->validate_fn)
+      if (!cur->validate_fn)
         cur->validate_fn = owl_variable_bool_validate_default;
       if (!cur->set_fn)
+      if (!cur->set_fn)
         cur->set_fn = owl_variable_bool_set_default;
       if (!cur->set_fromstring_fn)
+      if (!cur->set_fromstring_fn)
         cur->set_fromstring_fn = owl_variable_bool_set_fromstring_default;
       if (!cur->get_fn)
+      if (!cur->get_fn)
         cur->get_fn = owl_variable_get_default;
       if (!cur->get_tostring_fn)
         cur->get_tostring_fn = owl_variable_bool_get_tostring_default;
+      if (!cur->get_tostring_fn)
+        cur->get_tostring_fn = owl_variable_bool_get_tostring_default;
       if (!cur->delete_fn)
         cur->delete_fn = owl_variable_delete_default;
 …
       break;
     case OWL_VARIABLE_INT:
       if (!cur->validate_fn)
+      if (!cur->validate_fn)
         cur->validate_fn = owl_variable_int_validate_default;
       if (!cur->set_fn)
+      if (!cur->set_fn)
         cur->set_fn = owl_variable_int_set_default;
       if (!cur->set_fromstring_fn)
+      if (!cur->set_fromstring_fn)
         cur->set_fromstring_fn = owl_variable_int_set_fromstring_default;
       if (!cur->get_fn)
+      if (!cur->get_fn)
         cur->get_fn = owl_variable_get_default;
       if (!cur->get_tostring_fn)
         cur->get_tostring_fn = owl_variable_int_get_tostring_default;
+      if (!cur->get_tostring_fn)
+        cur->get_tostring_fn = owl_variable_int_get_tostring_default;
       if (!cur->delete_fn)
         cur->delete_fn = owl_variable_delete_default;
 …
   if (!v->set_fromstring_fn) {
     if (msg) owl_function_error("Variable %s is read-only", owl_variable_get_name(v));
     return -1;
+    return -1;
+  }
   if (0 != v->set_fromstring_fn(v, value)) {
 …
       owl_function_makemsg("%s = <null>", owl_variable_get_name(v));
     g_free(tostring);
+  }
+  }
   return 0;
+}
 int owl_variable_set_string(owl_variable *v, const char *newval)
+{
 …
   return v->set_fn(v, newval);
+}
 int owl_variable_set_int(owl_variable *v, int newval)
+{
 …
   return v->set_fn(v, &newval);
+}
 int owl_variable_set_bool_on(owl_variable *v)
+{
 …
   } else {
     return g_strdup_printf("%d", *(const int*)val);
+  }
+  }
+}
 /* default functions for enums (a variant of integers) */
 int owl_variable_enum_validate(const owl_variable *v, const void *newval) {
+int owl_variable_enum_validate(const owl_variable *v, const void *newval) {
   char **enums;
   int nenums, val;

view.c

r219f52c	r7869e48
88	88	}
89	89
90		/* Returns the position in the view with a message closest
	90	/* Returns the position in the view with a message closest
91	91	* to the passed msgid. */
92	92	int owl_view_get_nearest_to_msgid(const owl_view *v, int targetid)

wcwidth.c

r49a8434	r7869e48
188	188	/* if we arrive here, ucs is not a combining or C0/C1 control character */
189	189
190		return 1 +
	190	return 1 +
191	191	(ucs >= 0x1100 &&
192	192	(ucs <= 0x115f \|\| /* Hangul Jamo init. consonants */

zephyr.c

-                      r9b3167b
+                      r7869e48
       subs = g_renew(ZSubscription_t, subs, subSize);
+    }
     /* add it to the list of subs */
     if ((tmp = strtok(start, ",\n\r")) == NULL)
 …
   else if (!strcasecmp(n->z_default_format, "New transaction [$1] entered in $2\nFrom: $3 ($5)\nSubject: $4") ||
            !strcasecmp(n->z_default_format, "New transaction [$1] entered in $2\nFrom: $3\nSubject: $4")) {
     msg = g_strdup_printf("New transaction [%s] entered in %s\nFrom: %s (%s)\nSubject: %s",
                           fields[1], fields[2], fields[3], fields[5], fields[4]);
 …
   ZNotice_t notice;
   char *zsender = NULL;
   memset(&notice, 0, sizeof(notice));
 …
   if (!zsig) zsig="";
   notice.z_kind=ACKED;
   notice.z_port=0;
 …
   /* ret=ZSendNotice(&notice, ZAUTH); */
   ret=ZSrvSendNotice(&notice, ZAUTH, send_zephyr_helper);
   /* free then check the return */
   g_free(notice.z_message);
 …
+{
   char *tmp;
   /* if it's an HMACK ignore it */
   if (retnotice->z_kind == HMACK) return;
 …
+}
 #endif
 void owl_zephyr_zaway(const owl_message *m)
+{
 …
   char *tmpbuff, *myuser, *to;
   owl_zwrite *z;
   /* bail if it doesn't look like a message we should reply to.  Some
    * of this defined by the way zaway(1) works
 …
   char *line, *subsfile;
   int linesdeleted;
   line=owl_zephyr_makesubline(class, inst, recip);
   line[strlen(line)-1]='\0';
   subsfile = owl_zephyr_dotfile(".zephyr.subs", filename);
   linesdeleted = owl_util_file_deleteline(subsfile, line, 1);
   if (linesdeleted > 0) {
 …
   char *filename;
   FILE *file;
   filename = owl_zephyr_dotfile(".anyone", NULL);
   file = fopen(filename, "a");
 …
   } else {
     return ("UNKNOWN");
+  }
+  }
+}
 #else
 …
   return 0;
+}
 /* Strip a local realm fron the zephyr user name.
  * The caller must free the return

zwrite.c

-                      r919cbf2
+                      r7869e48
   int badargs = 0;
   char *msg = NULL;
   /* start with null entries */
   z->cmd=NULL;
 …
   if (z->noping) return;
   if (strcasecmp(z->class, "message")) {
     return;

Context Navigation

Legend:

Download in other formats: