X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=abook.c;h=c80ea53f034609cea3d33bed60e9cdcd84dad831;hb=3990095c4ac65c7f6e10b2fa074f763d048a92eb;hp=5277123c377b3769bf0a95ddfb5e77e7f0df7fab;hpb=3212da92838c056bcc1cafa57beaf26086e2ac96;p=pkg%2Fabook.git

diff --git a/abook.c b/abook.c
index 5277123..c80ea53 100644
--- a/abook.c
+++ b/abook.c
@@ -47,7 +47,6 @@ init_abook()
 	set_filenames();
 	init_options();
 
-	signal(SIGINT, quit_abook);
 	signal(SIGKILL, quit_abook);
 	signal(SIGTERM, quit_abook);
 	
@@ -85,15 +84,9 @@ quit_abook()
 {
 	if( options_get_int("autosave") )
 		save_database();
-	else {
-		statusline_addstr("Save database (y/N)");
-		switch( getch() ) {
-			case 'y':
-			case 'Y':
-				save_database();
-			default: break;
-		}
-	}
+	else if( statusline_ask_boolean("Save database", TRUE) )
+		save_database();
+
 	close_config();
 	close_database();
 
@@ -327,14 +320,14 @@ quit_mutt_query(int status)
 
 
 void
-launch_mutt()
+launch_mutt(int item)
 {
 	int i;
 	char email[MAX_EMAIL_LEN];
 	char *cmd;
 	char *tmp = options_get_str("mutt_command");
 
-	if( list_is_empty() )
+	if( !is_valid_item(item) )
 		return;
 
 	cmd = strconcat(tmp, " '", NULL );
@@ -363,21 +356,20 @@ launch_mutt()
 	system(cmd);	
 
 	free(cmd);
-	refresh_screen();
 }
 
 void
-launch_lynx()
+launch_wwwbrowser(int item)
 {
 	char *cmd = NULL;
 
-	if( list_is_empty() )
+	if( !is_valid_item(item) )
 		return;
 
-	if( database[list_current_item()][URL] )
+	if( database[item][URL] )
 		cmd = mkstr("%s '%s'",
 				options_get_str("www_command"),
-				safe_str(database[list_current_item()][URL]));
+				safe_str(database[item][URL]));
 	else
 		return;
 
@@ -385,7 +377,6 @@ launch_lynx()
 		system(cmd);
 
 	free(cmd);
-	refresh_screen();
 }
 
 void *