X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=info.c;h=f718e85dc48b8b2242f60b11d26e8199d37fd6a9;hp=5a620e751694a40ea8f1569a894ed6af4af6812a;hb=5487606fda75f133e26900aede1430b8929f8e18;hpb=70f903c457a3b82cdaa62e232124cdbba5c11bc5

diff --git a/info.c b/info.c
index 5a620e7..f718e85 100644
--- a/info.c
+++ b/info.c
@@ -43,7 +43,7 @@ static int text_changed(const char *old, const char *new)
 		(!old && strcmp("",new));
 }
 
-static char *skip_space(char *str)
+static const char *skip_space(const char *str)
 {
 	if (str) {
 		while (isspace(*str))
@@ -60,13 +60,14 @@ static char *skip_space(char *str)
  * The "master" string is the string of the current dive - we only consider it
  * changed if the old string is either empty, or matches that master string.
  */
-static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp, char *master)
+static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp, const char *master)
 {
 	char *old = *textp;
+	const char *old_text;
 	const gchar *new;
 	GtkEntry *entry;
 
-	old = skip_space(old);
+	old_text = skip_space(old);
 	master = skip_space(master);
 
 	/*
@@ -75,8 +76,8 @@ static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp,
 	 * we're editing another dive's info that already had a
 	 * valid value).
 	 */
-	if (master && old)
-		if (strcmp(master, old))
+	if (master && old_text)
+		if (strcmp(master, old_text))
 			return NULL;
 
 	entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box)));
@@ -174,9 +175,17 @@ static void info_menu_delete_cb(GtkMenuItem *menuitem, gpointer user_data)
 	delete_dive_info(current_dive);
 }
 
-static void add_menu_item(GtkMenu *menu, const char *label, void (*cb)(GtkMenuItem *, gpointer))
+static void add_menu_item(GtkMenu *menu, const char *label, const char *icon, void (*cb)(GtkMenuItem *, gpointer))
 {
-	GtkWidget *item = gtk_menu_item_new_with_label(label);
+	GtkWidget *item;
+	if (icon) {
+		GtkWidget *image;
+		item = gtk_image_menu_item_new_with_label(label);
+		image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU);
+		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+	} else {
+		item = gtk_menu_item_new_with_label(label);
+	}
 	g_signal_connect(item, "activate", G_CALLBACK(cb), NULL);
 	gtk_widget_show(item); /* Yes, really */
 	gtk_menu_prepend(menu, item);
@@ -184,8 +193,8 @@ static void add_menu_item(GtkMenu *menu, const char *label, void (*cb)(GtkMenuIt
 
 static void populate_popup_cb(GtkTextView *entry, GtkMenu *menu, gpointer user_data)
 {
-	add_menu_item(menu, "Delete", info_menu_delete_cb);
-	add_menu_item(menu, "Edit", info_menu_edit_cb);
+	add_menu_item(menu, "Delete", GTK_STOCK_DELETE, info_menu_delete_cb);
+	add_menu_item(menu, "Edit", GTK_STOCK_EDIT, info_menu_edit_cb);
 }
 
 static GtkEntry *text_value(GtkWidget *box, const char *label)
@@ -464,12 +473,12 @@ void update_equipment_data(struct dive *dive, struct dive *master)
 {
 	if (dive == master)
 		return;
-	if (memcmp(remember_cyl, master->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS)) {
+	if (memcmp(remember_cyl, master->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS) &&
+		cylinder_none(dive->cylinder))
 		memcpy(dive->cylinder, master->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS);
-	}
-	if (memcmp(remember_ws, master->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS)) {
+	if (memcmp(remember_ws, master->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS) &&
+		weightsystem_none(dive->weightsystem))
 		memcpy(dive->weightsystem, master->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS);
-	}
 }
 
 int edit_multi_dive_info(int nr, int *indices)