commit 328e53593160f069674429dbaaa0444adc04a590
author adamdunkels <adamdunkels> mer. août 20 20:54:46 2003 +0000
committer adamdunkels <adamdunkels> mer. août 20 20:54:46 2003 +0000
tree d5504575827a9545a858e1087783d541ef3b2208
parent 506d6c427c28319b52b0a53c0b21a514def5b44f

Now loads page directly when pressing enter after typing the URL

contiki/apps/www.c

diff --git a/contiki/apps/www.c b/contiki/apps/www.c
index 039b6d6..d0a2562 100644
--- a/contiki/apps/www.c
+++ b/contiki/apps/www.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: www.c,v 1.16 2003/08/15 18:48:35 adamdunkels Exp $
+ * $Id: www.c,v 1.17 2003/08/20 20:54:46 adamdunkels Exp $
  *
  */
 
@@ -229,7 +229,7 @@
        "Hyperlink activate" and "Hyperlink hover", and the resolver's
        signal. */
     dispatcher_listen(ctk_signal_window_close);
-    dispatcher_listen(ctk_signal_button_activate);
+    dispatcher_listen(ctk_signal_widget_activate);
     dispatcher_listen(ctk_signal_hyperlink_activate);
     dispatcher_listen(ctk_signal_hyperlink_hover);
     dispatcher_listen(resolv_signal_found);
@@ -426,7 +426,7 @@
 
   
   w = (struct ctk_widget *)data;
-  if(s == ctk_signal_button_activate) {
+  if(s == ctk_signal_widget_activate) {
     if(w == (struct ctk_widget *)&backbutton) {
       scrolly = 0;
       run = 1;
@@ -442,7 +442,8 @@
       run = 1;
       open_url();
       CTK_WIDGET_FOCUS(&mainwindow, &downbutton);
-    } else if(w == (struct ctk_widget *)&gobutton) {
+    } else if(w == (struct ctk_widget *)&gobutton ||
+	      w == (struct ctk_widget *)&urlentry) {
       scrolly = 0;
 #if WWW_CONF_PAGEVIEW
       starty = 0;