X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=gtk-gui.c;h=679b1e4dbd41f969d38584797831491a694e4441;hb=a2c2c7e1a84a98bd05505f699c3c17baf50304ce;hp=0bc79954f49124b413cd84dbb08737f659a817df;hpb=b0ba22a06879697efa7c429b9df8e13feaa02480;p=ext%2Fsubsurface.git
diff --git a/gtk-gui.c b/gtk-gui.c
index 0bc7995..679b1e4 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -31,21 +31,43 @@ static GtkWidget *dive_profile;
visible_cols_t visible_cols = {TRUE, FALSE};
-static const char *default_dive_computer;
+static const char *default_dive_computer_vendor;
+static const char *default_dive_computer_product;
+static const char *default_dive_computer_device;
-static int is_default_dive_computer(const char *name)
+static int is_default_dive_computer(const char *vendor, const char *product)
{
- return default_dive_computer && !strcmp(name, default_dive_computer);
+ return default_dive_computer_vendor && !strcmp(vendor, default_dive_computer_vendor) &&
+ default_dive_computer_product && !strcmp(product, default_dive_computer_product);
}
-static void set_default_dive_computer(const char *name)
+static int is_default_dive_computer_device(const char *name)
+{
+ return default_dive_computer_device && !strcmp(name, default_dive_computer_device);
+}
+
+static void set_default_dive_computer(const char *vendor, const char *product)
+{
+ if (!vendor || !*vendor)
+ return;
+ if (!product || !*product)
+ return;
+ if (is_default_dive_computer(vendor, product))
+ return;
+ default_dive_computer_vendor = vendor;
+ default_dive_computer_product = product;
+ subsurface_set_conf("dive_computer_vendor", PREF_STRING, vendor);
+ subsurface_set_conf("dive_computer_product", PREF_STRING, product);
+}
+
+static void set_default_dive_computer_device(const char *name)
{
if (!name || !*name)
return;
- if (is_default_dive_computer(name))
+ if (is_default_dive_computer_device(name))
return;
- default_dive_computer = name;
- subsurface_set_conf("dive_computer", PREF_STRING, name);
+ default_dive_computer_device = name;
+ subsurface_set_conf("dive_computer_device", PREF_STRING, name);
}
void repaint_dive(void)
@@ -624,13 +646,13 @@ static const gchar* ui_string = " \
\
\
\
- \
- \
\
- \
+ \
\
\