Merge remote-tracking branch 'upstream/master' into upstream

[pkg/abook.git] / ui.c

diff --git a/ui.c b/ui.c
index 8fd38ae0ecb6b2ce69ebacb16be44157e138f0c3..e8798858270654eeccb9daa5a6dbee2e0b1479e9 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -139,7 +139,7 @@ ui_init_curses()
                ui_enable_mouse(TRUE);
        }
        keypad(stdscr, TRUE);
-       if(opt_get_bool(BOOL_USE_COLORS)) {
+       if(opt_get_bool(BOOL_USE_COLORS) && has_colors()) {
                start_color();
                use_default_colors();
                ui_init_color_pairs_user();
@@ -556,9 +556,9 @@ get_commands()
                                                refresh_list();
                                        }
                                } else if(event.bstate & BUTTON4_PRESSED) {
-                                       scroll_up();
+                                       scroll_list_up();
                                } else if(event.bstate & BUTTON5_PRESSED) {
-                                       scroll_down();
+                                       scroll_list_down();
                                }
                        }
                }
@@ -653,7 +653,7 @@ ui_remove_items()
        if(list_is_empty())
                return;
 
-       if(statusline_ask_boolean(_("Remove selected item(s)"), TRUE))
+       if(statusline_ask_boolean(_("Remove selected item(s)"), FALSE))
                remove_selected_items();
 
        clear_statusline();
@@ -663,7 +663,7 @@ ui_remove_items()
 void
 ui_merge_items()
 {
-       if(statusline_ask_boolean(_("Merge selected items"), TRUE))
+       if(statusline_ask_boolean(_("Merge selected items"), FALSE))
                merge_selected_items();
 
        clear_statusline();
@@ -672,7 +672,7 @@ ui_merge_items()
 
 void           ui_remove_duplicates()
 {
-       if(statusline_ask_boolean(_("Remove duplicates"), TRUE))
+       if(statusline_ask_boolean(_("Remove duplicates"), FALSE))
                remove_duplicates();
        
        clear_statusline();