# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1213067338 0
# Node ID a4a6dc0b743d6a5f866ca96b6980e479a34f34f0
# Parent  528d24d928b8ee44b0bf3e3acc7872335957e8da
(newsticker--next-item-image)
(newsticker--previous-item-image, newsticker--previous-feed-image)
(newsticker--next-feed-image, newsticker--mark-read-image)
(ewsticker--mark-immortal-image, newsticker--narrow-image)
(newsticker--get-all-image, newsticker--update-image)
(newsticker--browse-image): Check xpm images are available.
(newsticker--mark-read-image, newsticker--mark-immortal-image)
(newsticker--narrow-image, newsticker--get-all-image): Doc fix.

diff -r 528d24d928b8 -r a4a6dc0b743d lisp/net/newsticker-reader.el
--- a/lisp/net/newsticker-reader.el	Tue Jun 10 03:08:37 2008 +0000
+++ b/lisp/net/newsticker-reader.el	Tue Jun 10 03:08:58 2008 +0000
@@ -8,7 +8,7 @@
 ;; Filename:    newsticker-reader.el
 ;; URL:         http://www.nongnu.org/newsticker
 ;; Time-stamp:  "7. Juni 2008, 15:34:08 (ulf)"
-;; CVS-Version: $Id: newsticker-reader.el,v 1.1 2008/06/08 15:35:57 u11 Exp $
+;; CVS-Version: $Id: newsticker-reader.el,v 1.2 2008/06/08 18:09:06 miles Exp $
 
 ;; ======================================================================
 
@@ -264,8 +264,9 @@
 ;;; Toolbar
 ;; ======================================================================
 (defconst newsticker--next-item-image
-  (if (fboundp 'create-image)
-      (create-image "/* XPM */
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
+       (create-image "/* XPM */
 static char * next_xpm[] = {
 \"24 24 42 1\",
 \" 	c None\",
@@ -335,12 +336,13 @@
 \"                        \",
 \"                        \"};
 "
-                 'xpm t)
-   "Image for the next item button."))
+                     'xpm t))
+  "Image for the next item button.")
 
 (defconst newsticker--previous-item-image
-  (if (fboundp 'create-image)
-      (create-image "/* XPM */
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
+       (create-image "/* XPM */
 static char * previous_xpm[] = {
 \"24 24 39 1\",
 \" 	c None\",
@@ -407,12 +409,13 @@
 \"                        \",
 \"                        \"};
 "
-                 'xpm t)
-   "Image for the previous item button."))
+                     'xpm t))
+  "Image for the previous item button.")
 
 (defconst newsticker--previous-feed-image
-  (if (fboundp 'create-image)
-      (create-image "/* XPM */
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
+       (create-image "/* XPM */
 static char * prev_feed_xpm[] = {
 \"24 24 52 1\",
 \" 	c None\",
@@ -492,12 +495,13 @@
 \"                        \",
 \"                        \"};
 "
-                 'xpm t)
-   "Image for the previous feed button."))
+                     'xpm t))
+  "Image for the previous feed button.")
 
 (defconst newsticker--next-feed-image
-  (if (fboundp 'create-image)
-      (create-image "/* XPM */
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
+       (create-image "/* XPM */
 static char * next_feed_xpm[] = {
 \"24 24 57 1\",
 \" 	c None\",
@@ -582,12 +586,13 @@
 \"                        \",
 \"                        \"};
 "
-                 'xpm t)
-   "Image for the next feed button."))
+                     'xpm t))
+  "Image for the next feed button.")
 
 (defconst newsticker--mark-read-image
-  (if (fboundp 'create-image)
-      (create-image "/* XPM */
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
+       (create-image "/* XPM */
 static char * mark_read_xpm[] = {
 \"24 24 44 1\",
 \" 	c None\",
@@ -659,12 +664,13 @@
 \"                        \",
 \"                        \"};
 "
-                 'xpm t)
-   "Image for the next feed button."))
+                    'xpm t))
+   "Image for the mark read button.")
 
 (defconst newsticker--mark-immortal-image
-  (if (fboundp 'create-image)
-      (create-image "/* XPM */
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
+       (create-image "/* XPM */
 static char * mark_immortal_xpm[] = {
 \"24 24 93 2\",
 \"  	c None\",
@@ -785,12 +791,13 @@
 \"                                                \",
 \"                                                \"};
 "
-                 'xpm t)
-   "Image for the next feed button."))
+                     'xpm t))
+  "Image for the mark immortal button.")
 
 (defconst newsticker--narrow-image
-  (if (fboundp 'create-image)
-      (create-image "/* XPM */
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
+       (create-image "/* XPM */
 static char * narrow_xpm[] = {
 \"24 24 48 1\",
 \" 	c None\",
@@ -866,12 +873,13 @@
 \"                        \",
 \"                        \"};
 "
-                 'xpm t)
-   "Image for the next feed button."))
+                     'xpm t))
+  "Image for the narrow image button.")
 
 (defconst newsticker--get-all-image
-  (if (fboundp 'create-image)
-      (create-image "/* XPM */
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
+       (create-image "/* XPM */
 static char * get_all_xpm[] = {
 \"24 24 70 1\",
 \" 	c None\",
@@ -969,12 +977,13 @@
 \"                        \",
 \"                        \"};
 "
-                 'xpm t)
-   "Image for the next feed button."))
+                     'xpm t))
+  "Image for the get all image button.")
 
 (defconst newsticker--update-image
-  (if (fboundp 'create-image)
-      (create-image "/* XPM */
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
+       (create-image "/* XPM */
 static char * update_xpm[] = {
 \"24 24 37 1\",
 \" 	c None\",
@@ -1039,12 +1048,13 @@
 \"                        \",
 \"                        \"};
 "
-                 'xpm t)
-   "Image for the update button."))
+                     'xpm t))
+   "Image for the update button.")
 
 (defconst newsticker--browse-image
-  (if (fboundp 'create-image)
-      (create-image "/* XPM */
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
+       (create-image "/* XPM */
 static char * visit_xpm[] = {
 \"24 24 39 1\",
 \" 	c None\",
@@ -1111,8 +1121,8 @@
 \"            .           \",
 \"                        \"};
 "
-                 'xpm t)
-   "Image for the browse button."))
+                     'xpm t))
+  "Image for the browse button.")
 
 (provide 'newsticker-reader)