Modified QUERY-ENUM-VALUES to return nicknames if optional argument is :NICKNAME

diff --git a/glib/genums.lisp b/glib/genums.lisp
index 40fba65d1e616b4dad9f93576dfa4477a211b724..9bbdfe661f2d26a8645fd8051608f5bc93992804 100644 (file)
--- a/glib/genums.lisp
+++ b/glib/genums.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: genums.lisp,v 1.21 2006/09/05 13:20:08 espen Exp $
+;; $Id: genums.lisp,v 1.22 2006/09/28 10:20:12 espen Exp $

 
 (in-package "GLIB")
   
 
 (in-package "GLIB")
   


@@ -38,9 +38,11 @@ (defun map-enum-values (values symbolic-p)
    #'(lambda (enum-value)
        (with-slots (nickname name value) enum-value
          (list
    #'(lambda (enum-value)
        (with-slots (nickname name value) enum-value
          (list

-         (if symbolic-p              
-             (intern (substitute #\- #\_ (string-upcase nickname)) "KEYWORD")
-           name)
+         (cond
+          ((eq symbolic-p :nickname) nickname)
+          (symbolic-p        
+           (intern (substitute #\- #\_ (string-upcase nickname)) "KEYWORD"))
+          (t name))

          value)))
    values))
 
          value)))
    values))