# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1334587209 14400
# Node ID 294978923007c196b496f9190defadeb6a84e8fe
# Parent  8d0124cdcce13de328946553218442620686c2eb# Parent  e653e3c197fe73a0f4a2dc5fbc3d34e6b7bee11f
Merge.

diff -r e653e3c197fe -r 294978923007 weechat/alias.conf
--- a/weechat/alias.conf	Mon Apr 16 10:16:47 2012 -0400
+++ b/weechat/alias.conf	Mon Apr 16 10:40:09 2012 -0400
@@ -1,5 +1,5 @@
 #
-# alias.conf -- weechat v0.3.6
+# alias.conf -- weechat v0.3.7
 #
 
 [cmd]
diff -r e653e3c197fe -r 294978923007 weechat/aspell.conf
--- a/weechat/aspell.conf	Mon Apr 16 10:16:47 2012 -0400
+++ b/weechat/aspell.conf	Mon Apr 16 10:40:09 2012 -0400
@@ -1,5 +1,5 @@
 #
-# aspell.conf -- weechat v0.3.6
+# aspell.conf -- weechat v0.3.7
 #
 
 [look]
diff -r e653e3c197fe -r 294978923007 weechat/buffers.conf
--- a/weechat/buffers.conf	Mon Apr 16 10:16:47 2012 -0400
+++ b/weechat/buffers.conf	Mon Apr 16 10:40:09 2012 -0400
@@ -1,5 +1,5 @@
 #
-# buffers.conf -- weechat v0.3.6
+# buffers.conf -- weechat v0.3.7
 #
 
 [color]
diff -r e653e3c197fe -r 294978923007 weechat/logger.conf
--- a/weechat/logger.conf	Mon Apr 16 10:16:47 2012 -0400
+++ b/weechat/logger.conf	Mon Apr 16 10:40:09 2012 -0400
@@ -1,5 +1,5 @@
 #
-# logger.conf -- weechat v0.3.6
+# logger.conf -- weechat v0.3.7
 #
 
 [look]
diff -r e653e3c197fe -r 294978923007 weechat/plugins.conf
--- a/weechat/plugins.conf	Mon Apr 16 10:16:47 2012 -0400
+++ b/weechat/plugins.conf	Mon Apr 16 10:40:09 2012 -0400
@@ -1,5 +1,5 @@
 #
-# plugins.conf -- weechat v0.3.6
+# plugins.conf -- weechat v0.3.7
 #
 
 [var]
@@ -55,6 +55,7 @@
 python.growl.show_upgrade_ended = "on"
 python.growl.sticky = "off"
 python.growl.sticky_away = "on"
+ruby.check_license = "on"
 tcl.check_license = "on"
 
 [desc]
diff -r e653e3c197fe -r 294978923007 weechat/python/autoload/growl.py
--- a/weechat/python/autoload/growl.py	Mon Apr 16 10:16:47 2012 -0400
+++ b/weechat/python/autoload/growl.py	Mon Apr 16 10:40:09 2012 -0400
@@ -24,12 +24,13 @@
 
 SCRIPT_NAME = 'growl'
 SCRIPT_AUTHOR = 'Sorin Ionescu <sorin.ionescu@gmail.com>'
-SCRIPT_VERSION = '1.0.4'
+SCRIPT_VERSION = '1.0.5'
 SCRIPT_LICENSE = 'MIT'
 SCRIPT_DESC = 'Sends Growl notifications upon events.'
 
 
 # Changelog
+# 2011-12-30: v1.0.5 Fixed a NoneType error.
 # 2011-10-11: v1.0.4 Handle import errors better.
 # 2011-10-10: v1.0.3 Handle Growl exceptions.
 # 2011-10-04: v1.0.2 Growl 1.3 requires GNTP.
@@ -461,9 +462,9 @@
         'WeeChat'
     ]
     if len(hostname) == 0:
-        hostname = None
+        hostname = ''
     if len(password) == 0:
-        password = None
+        password = ''
     growl = GrowlNotifier(
         applicationName=name,
         hostname=hostname,
diff -r e653e3c197fe -r 294978923007 weechat/relay.conf
--- a/weechat/relay.conf	Mon Apr 16 10:16:47 2012 -0400
+++ b/weechat/relay.conf	Mon Apr 16 10:40:09 2012 -0400
@@ -1,5 +1,5 @@
 #
-# relay.conf -- weechat v0.3.6
+# relay.conf -- weechat v0.3.7
 #
 
 [look]
@@ -17,7 +17,9 @@
 text_selected = white
 
 [network]
+allowed_ips = ""
 bind_address = ""
+compression_level = 6
 max_clients = 5
 password = ""
 
diff -r e653e3c197fe -r 294978923007 weechat/rmodifier.conf
--- a/weechat/rmodifier.conf	Mon Apr 16 10:16:47 2012 -0400
+++ b/weechat/rmodifier.conf	Mon Apr 16 10:40:09 2012 -0400
@@ -1,5 +1,5 @@
 #
-# rmodifier.conf -- weechat v0.3.6
+# rmodifier.conf -- weechat v0.3.7
 #
 
 [look]
diff -r e653e3c197fe -r 294978923007 weechat/urlgrab.conf
--- a/weechat/urlgrab.conf	Mon Apr 16 10:16:47 2012 -0400
+++ b/weechat/urlgrab.conf	Mon Apr 16 10:40:09 2012 -0400
@@ -1,5 +1,5 @@
 #
-# urlgrab.conf -- weechat v0.3.6
+# urlgrab.conf -- weechat v0.3.7
 #
 
 [color]
diff -r e653e3c197fe -r 294978923007 weechat/weechat.conf
--- a/weechat/weechat.conf	Mon Apr 16 10:16:47 2012 -0400
+++ b/weechat/weechat.conf	Mon Apr 16 10:40:09 2012 -0400
@@ -1,5 +1,5 @@
 #
-# weechat.conf -- weechat v0.3.6
+# weechat.conf -- weechat v0.3.7
 #
 
 [debug]
@@ -78,6 +78,7 @@
 save_config_on_exit = on
 save_layout_on_exit = none
 scroll_amount = 3
+scroll_bottom_after_switch = off
 scroll_page_percent = 100
 search_text_not_found_alert = on
 separator_horizontal = "-"
@@ -143,6 +144,7 @@
 status_time = *16
 
 [completion]
+base_word_until_cursor = on
 default_template = "%(nicks)|%(irc_channels)"
 nick_add_space = on
 nick_completer = ":"
@@ -156,8 +158,9 @@
 
 [history]
 display_default = 5
+max_buffer_lines_minutes = 0
+max_buffer_lines_number = 4096
 max_commands = 100
-max_lines = 4096
 max_visited_buffers = 50
 
 [proxy]
diff -r e653e3c197fe -r 294978923007 weechat/xfer.conf
--- a/weechat/xfer.conf	Mon Apr 16 10:16:47 2012 -0400
+++ b/weechat/xfer.conf	Mon Apr 16 10:40:09 2012 -0400
@@ -1,5 +1,5 @@
 #
-# xfer.conf -- weechat v0.3.6
+# xfer.conf -- weechat v0.3.7
 #
 
 [look]