   ;; Disable fringe indicators:
   (setf (cdr (assoc 'continuation fringe-indicator-alist)) nil))
 
+(defadvice circe-command-SAY (after pjones:circe-unignore-target)
+  (let ((buf (buffer-name)))
+    (when (pjones:ignored-buffer-p buf)
+      (pjones:track-buffer buf)
+      (message "This buffer will now be tracked."))))
+(ad-activate 'circe-command-SAY)
 
+(add-hook 'circe-channel-mode-hook 'pjones:circe-channel-mode-hook)
 (add-hook 'circe-chat-mode-hook 'pjones:circe-chat-mode-hook)
 (add-hook 'lui-mode-hook 'pjones:lui-mode-hook)
 (add-hook 'circe-server-connected-hook 'enable-circe-notifications)
 
 ;###############################################################################
 ;;; Stolen code below.....
-
-(defadvice circe-command-SAY (after jjf-circe-unignore-target)
-  (let ((ignored (tracking-ignored-p (current-buffer) nil)))
-    (when ignored
-      (setq tracking-ignored-buffers
-            (remove ignored tracking-ignored-buffers))
-      (message "This buffer will now be tracked."))))
-
-(ad-activate 'circe-command-SAY)
 
 ;; Taken from: https://github.com/jorgenschaefer/circe/wiki/Configuration
 (defun circe-network-connected-p (network)

     :user "pjones/bitlbee"    :nick "pjones"
     :pass ,pjones-irc-password)))

(defun pjones:circe-notifications-notify-function (nick body channel)
  "Handle notifications from circe.


 '(circe-notifications-alert-style 'libnotify)
 '(circe-notifications-notify-function 'pjones:circe-notifications-notify-function)

 '(tracking-ignored-buffers '((pjones:ignored-buffer-p)))
 '(tracking-faces-priorities '(circe-highlight-nick-face))
 '(tracking-position 'end)
 '(tracking-frame-behavior t)

 '(lui-track-bar-behavior 'after-sending)
 '(lui-time-stamp-format "%H:%M")
