For URL view, don't prompt user to select url if there is only one. Display

<U>RL View prompt if message contains url(s). -Ben

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index af65cc0220f274552519f34db7646e0e96f8639e..4c6d03e37aeed457ebec4e493972c4760357eddc 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 1.361  1999/09/03 17:50:26  playcow
+For URL view, don't prompt user to select url if there is only one.  Display
+<U>RL View prompt if message contains url(s). -Ben
+
 Revision 1.360  1999/09/02 02:09:59  ajc
 * msgbase.c: new function serialize_message() for future use
 
@@ -1227,3 +1231,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
 
+

diff --git a/citadel/messages.c b/citadel/messages.c
index ba2cf2a83cc4d16f001be612fc1ef8023a9dc3a3..3b0cc34d1965961807eabc6c13dcbde29d725e59 100644 (file)
--- a/citadel/messages.c
+++ b/citadel/messages.c
@@ -921,7 +921,8 @@ void list_urls() {
                printf("%3d %s\n", i+1, urls[i]);
        }
 
-       i = intprompt("Display which one", 1, 1, num_urls);
+       if((i = num_urls) != 1)
+               i = intprompt("Display which one", 1, 1, num_urls);
 
        sprintf(cmd, rc_url_cmd, urls[i-1]);
        system(cmd);
@@ -1053,7 +1054,10 @@ RMSGREAD:        fflush(stdout);
                        printf(") ");
 
                        if (is_mail==1) keyopt("<R>eply ");
-                       keyopt("<B>ack <A>gain <Q>uote <N>ext <S>top <?>Help/others -> ");
+                       keyopt("<B>ack <A>gain <Q>uote <N>ext <S>top ");
+                       if (rc_url_cmd[0] && num_urls) keyopt("<U>RL View ");
+                       keyopt("<?>Help/others -> ");
+                       
                        do {
                                lines_printed = 2;
                                e=(inkey()&127); e=tolower(e);