Changes in / [ebed81c:8dbecd23]

Files:

• bitlbee.h (modified) (1 diff)
• doc/CHANGES (modified) (1 diff)
• doc/user-guide/misc.xml (modified) (1 diff)
• protocols/oscar/rxhandlers.c (modified) (1 diff)
• protocols/purple/purple.c (modified) (1 diff)
• root_commands.c (modified) (1 diff)

bitlbee.h

@@ -36 +36 @@
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "3.5"
+#define BITLBEE_VERSION "3.4.2"
 #define VERSION BITLBEE_VERSION
 #define BITLBEE_VER(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 5, 0)
+#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 4, 2)
 #define BITLBEE_ABI_VERSION_CODE 1
 

doc/CHANGES

@@ -3 +3 @@
 
 https://github.com/bitlbee/bitlbee/commits/master
-
-Version 3.5:
-
-- ui:
-  * "chat list": shows a list of existing server-side chatrooms. With some
-    protocols, this is often the only way to add new channels.
-    See 'help chat list' for details. (jgeboski)
-  * "plugins": lists the installed plugins and their versions (jgeboski)
-  * Add 'nick_lowercase' and 'nick_underscores' settings.
-  * "handle_unknown" can be set per-account, not just globally
-
-- jabber:
-  * Add "always_use_nicks" channel setting, for non-anonymous MUCs (trac #415)
-    See 'help set always_use_nicks' for possible side effects.
-  * Properly handle rejected file transfers
-  * Don't send parts in a chat if someone is still connected from other devices
-  * hipchat: support personal oauth tokens (manually generated ones)
-
-- twitter:
-  * Hide muted tweets / no-retweets, add mute/unmute commands (Flexo)
-  * Show full version of extended tweets (with slightly more than 140 chars)
-
-- purple:
-  * Support setting chat room topics (EionRobb)
-  * Support for extra groupchat settings. Shows an error if any required
-    ones are missing. Look for purple_ prefixed settings in "chan #... set"
-  * SIPE: persistent chats can be joined now, thanks to the "chat list" command
-    and the above ("purple_uri" channel setting)
-  * Fix a file transfer crash bug (Mainly affected telegram)
-  * Honor protocol flag to not require a password (used in hangouts, telegram)
-  * Set the contacts' nicks to the %full_name for a few whitelisted protocols
-    (hangouts, funyahoo, icq, line)
-  * LINE: added a hack to save its auth token, to avoid re-auth every time
-  * Show self-messages in groupchat backlogs (before join)
-
-- yahoo:
-  * Removed because they killed their old protocol on a two month notice.
-    Use EionRobb's funyahoo purple plugin, or better yet, don't use yahoo.
-
-- Stuff for enterprise deployments (all done by Sevas)
-  * Locked down accounts, useful when pregenerating user config files. An
-    account that is marked with the locked="true" attribute can't be removed
-    and its username/password can't be changed.
-  * Locked down settings. Same as above, but for individual account settings.
-  * AllowAccountAdd setting in bitlbee.conf, to disable adding new accounts.
-  * PAM and LDAP authentication backends (not compiled by default)
-
-- For packagers:
-  * Enabled debug symbols in non-debug builds, disabled stripping by default.
-    This is closer to the default behavior of autotools, and --debug=1 is mostly
-    to set the DEBUG macro and disable optimization.
-
-- For plugin devs:
-  * Plugins should now include an "init_plugin_info" function which will be used
-    for ABI version checking in the future. It's optional for now, but will be
-    enforced later. See the commit log of d28fe1c for details. (jgeboski)
-
-Finished ... 200XX
 
 Version 3.4.2:

doc/user-guide/misc.xml

@@ -499 +499 @@
 </sect1>
 
-<sect1 id="whatsnew030500">
-<title>New stuff in BitlBee 3.5</title>
-
-<simplelist>
-        <member>New commands: <emphasis>chat list</emphasis> and <emphasis>plugins</emphasis>. New settings: <emphasis>nick_lowercase</emphasis>, <emphasis>nick_underscores</emphasis></member>
-        <member><emphasis>twitter:</emphasis> Hide muted tweets / no-retweets, add mute/unmute commands. Show full version of extended tweets.</member>
-        <member><emphasis>jabber:</emphasis> <emphasis>always_use_nicks</emphasis> channel setting. Don't send parts in a chat if someone is still connected from other devices. Personal oauth token login for hipchat.</member>
-        <member><emphasis>purple:</emphasis> Setting /topic. Fixes for SIPE and LINE. Don't ask for password if not needed (hangouts, telegram). Set nicks to %full_name for a few protocols (hangouts, funyahoo, icq, line)</member>
-</simplelist>
-
-<para>
-See the full changelog for details!
-</para>
-
-</sect1>
-
 </chapter>

protocols/oscar/rxhandlers.c

@@ -236 +236 @@
 
         g_return_val_if_fail(conn, -1);
-        g_return_val_if_fail(!checkdisallowed(family, type), -1);
+        g_return_val_if_fail(checkdisallowed(family, type), -1);
 
         if (!(newcb = (struct aim_rxcblist_s *) g_new0(struct aim_rxcblist_s, 1))) {

protocols/purple/purple.c

@@ -1197 +1197 @@
 }
 
-/* Handles write_im and write_chat. Removes echoes of locally sent messages.
- *
- * PURPLE_MESSAGE_DELAYED is used for chat backlogs - if a message has both
- * that flag and _SEND, it's a self-message from before joining the channel.
- * Those are safe to display. The rest (with just _SEND) may be echoes. */
+/* Handles write_im and write_chat. Removes echoes of locally sent messages */
 static void prplcb_conv_msg(PurpleConversation *conv, const char *who, const char *message, PurpleMessageFlags flags, time_t mtime)
 {
-        if ((!(flags & PURPLE_MESSAGE_SEND)) || (flags & PURPLE_MESSAGE_DELAYED)) {
-                handle_conv_msg(conv, who, message, (flags & PURPLE_MESSAGE_SEND) ? OPT_SELFMESSAGE : 0, mtime);
+        if (!(flags & PURPLE_MESSAGE_SEND)) {
+                handle_conv_msg(conv, who, message, 0, mtime);
         }
 }

root_commands.c

@@ -1064 +1064 @@
                 format = "%s\t%s\t%s";
         } else {
-                format = "%-24.24s  %-40.40s  %s";
+                format = "%-16.16s  %-40.40s  %s";
         }