--- a/handlers.py	Mon Feb 09 22:17:10 2009 +0200
+++ b/handlers.py	Mon Feb 09 23:49:57 2009 +0200
@@ -9,12 +9,14 @@
 import urls, channels, helpers
 import preferences as prefs
 from preferences import preferences
+import config
 
 # load templates from here
 templates = template.TemplateLoader("templates",
     _helper_class   = helpers.Helpers,
     urls            = urls,
-    channel_list    = channels.channel_list,
+    channel_list    = config.LOG_CHANNELS,
+    config          = config,
 )
 
 # our LogSearch thing
@@ -162,8 +164,8 @@
         lines           = lines,
     )
 
-@preferences.handler(prefs.formatter)
-def channel_search (request, channel, formatter, q=None, count=None, skip=None) :
+@preferences.handler(prefs.formatter, prefs.count)
+def channel_search (request, channel, formatter, count, q=None, skip=0, max=None) :
     """
         Display the search form for the channel for GET, or do the search for POST
     """
@@ -185,6 +187,9 @@
         prefs           = request.prefs,
         channel         = channel,
         search_query    = q,
+        count           = count,
+        skip            = skip,
+        max             = max,
         lines           = lines,
     )