summaryrefslogtreecommitdiff
path: root/src/ui.c
diff options
context:
space:
mode:
authorAlessio Treglia <quadrispro@ubuntu.com>2010-04-14 12:24:35 +0200
committerAlessio Treglia <quadrispro@ubuntu.com>2010-04-14 12:24:35 +0200
commita9a833c10711f1ec7060322030f11e64f44fca2c (patch)
tree2c0d84e44be6ed79c04b79540d55618ba73479aa /src/ui.c
parentc2e54e51031fa4b2512b851d13f5781118269d6b (diff)
parent6d9871f7c7de6caca9eb78683bcba499119e1469 (diff)
Merge commit 'upstream/1.0.0'
Diffstat (limited to 'src/ui.c')
-rw-r--r--src/ui.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/ui.c b/src/ui.c
index 92e83c7..6fdd2e4 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -198,6 +198,9 @@ ui_set_scan_devices (SimpleScan *ui, GList *devices)
if (n_delete >= 0) {
gint i;
+ /* Update label */
+ gtk_list_store_set (GTK_LIST_STORE (ui->priv->device_model), &iter, 1, device->label, -1);
+
for (i = 0; i < n_delete; i++) {
gtk_tree_model_iter_nth_child (ui->priv->device_model, &iter, NULL, index);
gtk_list_store_remove (GTK_LIST_STORE (ui->priv->device_model), &iter);
@@ -255,13 +258,11 @@ ui_set_selected_device (SimpleScan *ui, const gchar *device)
{
GtkTreeIter iter;
- /* If doesn't exist add with label set to device name */
- if (!find_scan_device (ui, device, &iter)) {
- gtk_list_store_append (GTK_LIST_STORE (ui->priv->device_model), &iter);
- gtk_list_store_set (GTK_LIST_STORE (ui->priv->device_model), &iter, 0, device, 1, device, -1);
- }
+ if (!find_scan_device (ui, device, &iter))
+ return;
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (ui->priv->device_combo), &iter);
+ ui->priv->user_selected_device = TRUE;
}
@@ -1343,11 +1344,11 @@ ui_load (SimpleScan *ui)
gtk_list_store_append (GTK_LIST_STORE (ui->priv->paper_size_model), &iter);
gtk_list_store_set (GTK_LIST_STORE (ui->priv->paper_size_model), &iter, 0, 0, 1, 0, 2, "Automatic", -1);
gtk_list_store_append (GTK_LIST_STORE (ui->priv->paper_size_model), &iter);
- gtk_list_store_set (GTK_LIST_STORE (ui->priv->paper_size_model), &iter, 0, 2050, 1, 1480, 2, "A6", -1);
+ gtk_list_store_set (GTK_LIST_STORE (ui->priv->paper_size_model), &iter, 0, 1050, 1, 1480, 2, "A6", -1);
gtk_list_store_append (GTK_LIST_STORE (ui->priv->paper_size_model), &iter);
gtk_list_store_set (GTK_LIST_STORE (ui->priv->paper_size_model), &iter, 0, 1480, 1, 2100, 2, "A5", -1);
gtk_list_store_append (GTK_LIST_STORE (ui->priv->paper_size_model), &iter);
- gtk_list_store_set (GTK_LIST_STORE (ui->priv->paper_size_model), &iter, 0, 2100, 1, 1970, 2, "A4", -1);
+ gtk_list_store_set (GTK_LIST_STORE (ui->priv->paper_size_model), &iter, 0, 2100, 1, 2970, 2, "A4", -1);
gtk_list_store_append (GTK_LIST_STORE (ui->priv->paper_size_model), &iter);
gtk_list_store_set (GTK_LIST_STORE (ui->priv->paper_size_model), &iter, 0, 2159, 1, 2794, 2, "Letter", -1);
gtk_list_store_append (GTK_LIST_STORE (ui->priv->paper_size_model), &iter);