--- a/handlers.py	Mon Feb 09 13:19:00 2009 +0200
+++ b/handlers.py	Mon Feb 09 13:45:06 2009 +0200
@@ -63,12 +63,12 @@
         Redirect to the appropriate channel_view
     """
    
-    return http.Redirect(urls.channel_view.build(request, channel=channel))
+    return http.Redirect(urls.channel.build(request, channel=channel))
 
 @preferences.handler(prefs.formatter)
-def channel_view (request, channel, count, formatter) :
+def channel_last (request, channel, count, formatter) :
     """
-        The main channel view page, display the most important info, and all requisite links
+        The main channel view page, displaying the most recent lines
     """
     
     # get latest events
@@ -77,7 +77,7 @@
     # lines
     lines = formatter.format_html(lines)
 
-    return templates.render_to_response("channel_view",
+    return templates.render_to_response("channel_last",
         req             = request,
         prefs           = request.prefs,
         channel         = channel,
@@ -85,22 +85,6 @@
         lines           = lines,
     )
 
-def channel_last (request, channel, count, format) :
-    """
-        Display the last x lines of channel messages in various formats
-    """
-
-    if format == 'txt' :
-        # XXX: formatting
-#        return http.Response('\n'.join(str(channel.source.get_latest(count))), 'text/plain')
-         pass
-
-    elif format == 'html' :
-        pass
-
-    else :
-        raise http.ResponseError("Unknown filetype %r" % format)
-
 @preferences.handler(prefs.timezone)
 def channel_calendar (request, channel, year, month, timezone) :
     """