summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--info.c39
1 files changed, 1 insertions, 38 deletions
diff --git a/info.c b/info.c
index 54da8a5a3..4c693e9b0 100644
--- a/info.c
+++ b/info.c
@@ -196,47 +196,12 @@ void show_dive_info(struct dive *dive)
dive && dive->notes ? dive->notes : "", -1);
}
-static int delete_dive_info(struct dive *dive)
-{
- int success;
- GtkWidget *dialog;
-
- if (!dive)
- return 0;
-
- dialog = gtk_dialog_new_with_buttons(_("Delete Dive"),
- GTK_WINDOW(main_window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- NULL);
-
- gtk_widget_show_all(dialog);
- success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
- if (success) {
- delete_dive(dive);
- mark_divelist_changed(TRUE);
- dive_list_update_dives();
- }
-
- gtk_widget_destroy(dialog);
-
- return success;
-}
-
static void info_menu_edit_cb(GtkMenuItem *menuitem, gpointer user_data)
{
if (amount_selected)
edit_multi_dive_info(NULL);
}
-static void info_menu_delete_cb(GtkMenuItem *menuitem, gpointer user_data)
-{
- /* this needs to delete all the selected dives as well, I guess? */
- delete_dive_info(current_dive);
- amount_selected = 0;
-}
-
static void add_menu_item(GtkMenu *menu, const char *label, const char *icon, void (*cb)(GtkMenuItem *, gpointer))
{
GtkWidget *item;
@@ -255,10 +220,8 @@ static void add_menu_item(GtkMenu *menu, const char *label, const char *icon, vo
static void populate_popup_cb(GtkTextView *entry, GtkMenu *menu, gpointer user_data)
{
- if (amount_selected) {
- add_menu_item(menu, _("Delete"), GTK_STOCK_DELETE, info_menu_delete_cb);
+ if (amount_selected)
add_menu_item(menu, _("Edit"), GTK_STOCK_EDIT, info_menu_edit_cb);
- }
}
static GtkEntry *text_value(GtkWidget *box, const char *label)