commit 5e9f52f6d1f3356bc6df75a675e1a2d5cdbf9d77
author Linus Nielsen Feltzing <linus@haxx.se> Wed Jul 06 08:30:55 2005 +0000
committer Linus Nielsen Feltzing <linus@haxx.se> Wed Jul 06 08:30:55 2005 +0000
tree fdd432eeec3a8db8be220ed85f9b9b2de4480b63
parent 50d9e3fba9cf1136fdf49293632aac7be00c795d

Some interface updates and code policing in the alarm setting screen, take 2


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7038 a1c6a512-1295-4272-9138-f99709370657

apps/alarm_menu.c

diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c
index a1b9947..e8b4219 100644
--- a/apps/alarm_menu.c
+++ b/apps/alarm_menu.c
@@ -92,16 +92,9 @@
                 rtc_init();
                 rtc_set_alarm(h,m);
                 rtc_enable_alarm(true);
-<<<<<<< alarm_menu.c
                 splash(HZ*2, true, str(LANG_ALARM_MOD_TIME_TO_GO),
                        togo / 60, togo % 60);
 		done = true;
-=======
-                lcd_puts(0,1,str(LANG_ALARM_MOD_SHUTDOWN));
-                lcd_update();
-                sleep(HZ);
-                done = true;
->>>>>>> 1.7
             } else {
                 splash(HZ, true, str(LANG_ALARM_MOD_ERROR));
                 update = true;
@@ -152,13 +145,6 @@
         case BUTTON_STOP:
         case BUTTON_MENU:
 #endif
-<<<<<<< alarm_menu.c
-=======
-            lcd_clear_display();
-            lcd_puts(0,0,str(LANG_ALARM_MOD_DISABLE));
-            lcd_update();
-            sleep(HZ);
->>>>>>> 1.7
             rtc_enable_alarm(false);
             splash(HZ*2, true, str(LANG_ALARM_MOD_DISABLE));
             done = true;