From: tfheen <tfheen@8da78d58-1cd3-0310-bee5-d77bd1b3e8bf>
Date: Tue, 4 Jan 2011 09:48:25 +0000 (+0000)
Subject: update for VS
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f310678e9b1bbcbdef4ec686287e1a403f90c396;p=dotfiles

update for VS

git-svn-id: file:///svn/tfheen/trunk/dotfiles@1453 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf
---

diff --git a/gnus b/gnus
index 67ee6c1..5785fc0 100644
--- a/gnus
+++ b/gnus
@@ -71,8 +71,13 @@
 ;						     (nntp-end-of-line "\n")
 ;						     (nntp-rlogin-parameters
 ;						      ("telnet" "nntp.linpro.no" "nntp"))))
-  (add-to-list 'gnus-secondary-select-methods '(nnimap "ox.linpro"
-				    (nnimap-address "ox.linpro.no")
+;  (add-to-list 'gnus-secondary-select-methods '(nnimap "ox.linpro"
+;				    (nnimap-address "ox.linpro.no")
+;				    (nnimap-server-port 993)
+;				    (nnimap-stream ssl)
+;                                    (nnimap-authinfo-file "~/.imap-authinfo.gpg")))
+  (add-to-list 'gnus-secondary-select-methods '(nnimap "Varnish"
+				    (nnimap-address "imap.gmail.com")
 				    (nnimap-server-port 993)
 				    (nnimap-stream ssl)
                                     (nnimap-authinfo-file "~/.imap-authinfo.gpg")))
@@ -400,14 +405,10 @@ inserts \" characters."
 	(progn
 	  (if (string-match "Collabora" (second (tfheen-gnus-get-current-select-method)))
 	      (setq mode "Collabora"))
-	  (if (string-match "linpro" (second (tfheen-gnus-get-current-select-method)))
-	      (setq mode "RL"))))
+	  (if (string-match "Varnish" (second (tfheen-gnus-get-current-select-method)))
+	      (setq mode "Varnish"))))
 	mode))
 
-(defun tfheen-qurzaw-rl-p ()
-  "Return t if we should be in Redpill Linpro mode, nil otherwise"
-    (and (string-match "qurzaw" system-name) (not (string-match "err\\.no" (second (tfheen-gnus-get-current-select-method)))) t))
-
 (defun tfheen-gnus-get-current-select-method ()
   "Return the select method of the summary buffer as defined by gnus-summary-buffer"
   (save-excursion
@@ -420,19 +421,19 @@ inserts \" characters."
     ; Default-verdier
     (".*" 
      (address (cond 
-		((equal (tfheen-qurzaw-personality-mode) "RL") "tfheen@redpill-linpro.com")
+		((equal (tfheen-qurzaw-personality-mode) "Varnish") "tfheen@varnish-software.com")
 		((equal (tfheen-qurzaw-personality-mode) "Collabora") "tollef.fog.heen@collabora.co.uk")
 		(t "tfheen@err.no")))
 
 ;     (Organization "Private")
      (Bcc (concat "tfheen+outgoing" (char-to-string 64) 
 		  (cond
-		   ((equal (tfheen-qurzaw-personality-mode) "RL") "redpill-linpro.com")
+		   ((equal (tfheen-qurzaw-personality-mode) "Varnish") "varnish-software.com")
 		   ((equal (tfheen-qurzaw-personality-mode) "Collabora") "collabora.co.uk")
 		   (t "err.no"))))
 
      (signature-file (cond
-		   ((equal (tfheen-qurzaw-personality-mode) "RL") "~/.signature-rl")
+		   ((equal (tfheen-qurzaw-personality-mode) "Varnish") "~/.signature-rl")
 		   ((equal (tfheen-qurzaw-personality-mode) "Collabora") "~/.signature-collabora")
 		   (t "~/.signature"))))
 
@@ -697,7 +698,7 @@ on multiple mail-followup-to headers"
 
 (add-hook 'message-header-setup-hook 'message-subject-strip-any-re)
 (setq gnus-treat-display-smileys nil
-      gnus-ignored-from-addresses "tfheen@\\(\\(redpill-\\)?linpro.\\(no\\|com\\)\\|ubuntu.com\\|add\\.no\\|idi\\.ntnu\\.no\\|debian\\.org\\|stud\\.ntnu\\.no\\|hardware\\.no\\|raw\\.no\\|err.no\\|samfundet\\.no\\|uka\\.no\\|pvv\\.\\(org\\|ntnu.no\\)\\)\\|tollef@add\\.no\\|tollef-[^@]*@add\\.no")
+      gnus-ignored-from-addresses "tfheen@\\(\\(redpill-\\)?linpro.\\(no\\|com\\)\\|varnish-?cache.com\\|ubuntu.com\\|add\\.no\\|idi\\.ntnu\\.no\\|debian\\.org\\|stud\\.ntnu\\.no\\|hardware\\.no\\|raw\\.no\\|err.no\\|samfundet\\.no\\|uka\\.no\\|pvv\\.\\(org\\|ntnu.no\\)\\)\\|tollef@add\\.no\\|tollef-[^@]*@add\\.no")
 
 (cw/requiring-package (deuglify))
 
@@ -708,7 +709,7 @@ on multiple mail-followup-to headers"
   (setq tfheen-spam-folder (lambda () (if (string-match "nnimap\\+mail\\.err\\.no" gnus-newsgroup-name)
 					  (format-time-string "nnimap+mail.err.no:spam.%Y")
 					(format-time-string "spam.%Y")))))
-  
+
 (defun tfheen-mark-as-spam ()
   (interactive)
   (let ((buf (get-buffer-create "*Spam mark*"))
@@ -868,4 +869,4 @@ Argument REVERSE means reverse order."
 (setq imap-store-password t)
 
 (cw/requiring-package (nnir)
-  (setq nnir-search-engine 'imap))
\ No newline at end of file
+  (setq nnir-search-engine 'imap))