[Emacs-diffs] Changes to emacs/lisp/net/newsticker-reader.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/06/10 03:08:58

Index: newsticker-reader.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/newsticker-reader.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- newsticker-reader.el        8 Jun 2008 18:09:06 -0000       1.2
+++ newsticker-reader.el        10 Jun 2008 03:08:58 -0000      1.3
@@ -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.2 2008/06/08 18:09:06 miles Exp $
+;; CVS-Version: $Id: newsticker-reader.el,v 1.3 2008/06/10 03:08:58 gm Exp $
 
 ;; ======================================================================
 
@@ -264,7 +264,8 @@
 ;;; Toolbar
 ;; ======================================================================
 (defconst newsticker--next-item-image
-  (if (fboundp 'create-image)
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
       (create-image "/* XPM */
 static char * next_xpm[] = {
 \"24 24 42 1\",
@@ -335,11 +336,12 @@
 \"                        \",
 \"                        \"};
 "
-                 '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)
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
       (create-image "/* XPM */
 static char * previous_xpm[] = {
 \"24 24 39 1\",
@@ -407,11 +409,12 @@
 \"                        \",
 \"                        \"};
 "
-                 '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)
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
       (create-image "/* XPM */
 static char * prev_feed_xpm[] = {
 \"24 24 52 1\",
@@ -492,11 +495,12 @@
 \"                        \",
 \"                        \"};
 "
-                 '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)
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
       (create-image "/* XPM */
 static char * next_feed_xpm[] = {
 \"24 24 57 1\",
@@ -582,11 +586,12 @@
 \"                        \",
 \"                        \"};
 "
-                 '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)
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
       (create-image "/* XPM */
 static char * mark_read_xpm[] = {
 \"24 24 44 1\",
@@ -659,11 +664,12 @@
 \"                        \",
 \"                        \"};
 "
-                 '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)
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
       (create-image "/* XPM */
 static char * mark_immortal_xpm[] = {
 \"24 24 93 2\",
@@ -785,11 +791,12 @@
 \"                                                \",
 \"                                                \"};
 "
-                 'xpm t)
-   "Image for the next feed button."))
+                     'xpm t))
+  "Image for the mark immortal button.")
 
 (defconst newsticker--narrow-image
-  (if (fboundp 'create-image)
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
       (create-image "/* XPM */
 static char * narrow_xpm[] = {
 \"24 24 48 1\",
@@ -866,11 +873,12 @@
 \"                        \",
 \"                        \"};
 "
-                 '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)
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
       (create-image "/* XPM */
 static char * get_all_xpm[] = {
 \"24 24 70 1\",
@@ -969,11 +977,12 @@
 \"                        \",
 \"                        \"};
 "
-                 '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)
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
       (create-image "/* XPM */
 static char * update_xpm[] = {
 \"24 24 37 1\",
@@ -1039,11 +1048,12 @@
 \"                        \",
 \"                        \"};
 "
-                 'xpm t)
-   "Image for the update button."))
+                     'xpm t))
+   "Image for the update button.")
 
 (defconst newsticker--browse-image
-  (if (fboundp 'create-image)
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p 'xpm)
       (create-image "/* XPM */
 static char * visit_xpm[] = {
 \"24 24 39 1\",
@@ -1111,8 +1121,8 @@
 \"            .           \",
 \"                        \"};
 "
-                 'xpm t)
-   "Image for the browse button."))
+                     'xpm t))
+  "Image for the browse button.")
 
 (provide 'newsticker-reader)