[PATCH] Trim the device name in the download dialog, if necessary

[Lubomir I. Ivanov]

From: "Lubomir I. Ivanov" <neolit123 at gmail.com>

On Windows, device names can end up being <drive-letter> (<drive-label>).
In such a case we are only interested in the <drive-letter> part, when
passing this value to libdivecomputer.

This patch provides a method to trim all text in parentheses and also
any leading and trailing whitespace.

An important addition is enabling back the user to enter a device
manually even it's absent in the combo box list. This device is
then stored and retrieved as the default device, but not stored
in the device list (dc_device_selector()).

As a side effect this change prevents the download dialog closing,
when a user-entered device is not one of the found devices via
subsurface_fill_device_list().

Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
---
 gtk-gui.c | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/gtk-gui.c b/gtk-gui.c
index fb992f6..24c0343 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -1382,7 +1382,11 @@ static GtkComboBox *dc_device_selector(GtkWidget *vbox)
 	renderer = gtk_cell_renderer_text_new();
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo_box), renderer, TRUE);
 
-	gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), default_index);
+	if (default_index != -1)
+		gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), default_index);
+	else
+		gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box))),
+		                   default_dive_computer_device);
 
 	return GTK_COMBO_BOX(combo_box);
 }
@@ -1499,6 +1503,7 @@ static GtkWidget *import_dive_computer(device_data_t *data, GtkDialog *dialog)
 void download_dialog(GtkWidget *w, gpointer data)
 {
 	int result;
+	char *devname, *ns, *ne;
 	GtkWidget *dialog, *button, *hbox, *vbox, *label, *info = NULL;
 	GtkComboBox *computer, *device;
 	GtkTreeIter iter;
@@ -1553,17 +1558,26 @@ repeat:
 		devicedata.descriptor = descriptor;
 		devicedata.vendor = vendor;
 		devicedata.product = product;
-
-		if (!gtk_combo_box_get_active_iter(device, &iter))
-			break;
-
-		model = gtk_combo_box_get_model(device);
-		gtk_tree_model_get(model, &iter,
-				0, &devicedata.devname,
-				-1);
 		set_default_dive_computer(vendor, product);
-		set_default_dive_computer_device(devicedata.devname);
+
+		/* get the device name from the combo box entry and set as default */
+		devname = strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(device)))));
+		set_default_dive_computer_device(devname);
+		/* clear leading and trailing white space from the device name and also
+		 * everything after (and including) the first '(' char. */
+		ns = devname;
+		while (*ns == ' ' || *ns == '\t')
+			ns++;
+		ne = ns;
+		while (*ne && *ne != '(')
+			ne++;
+		*ne = '\0';
+		if (ne > ns)
+			while (*(--ne) == ' ' || *ne == '\t')
+				*ne = '\0';
+		devicedata.devname = ns;
 		info = import_dive_computer(&devicedata, GTK_DIALOG(dialog));
+		free((void *)devname);
 		if (info)
 			goto repeat;
 		report_dives(TRUE);
-- 
1.7.11.msysgit.0