diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2012-10-31 16:53:05 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2012-10-31 16:53:05 -0700 |
| commit | 072b4f743c19566ad55bb4b30e0844082cccfbd1 (patch) | |
| tree | 17a746fc7991f5caa041e29c61a6109ae51a5c6a /display-gtk.h | |
| parent | 2d4fee79853f1d81585beb62d36b68f1602fce5d (diff) | |
| parent | ee5c31d2921c0b8970303a1230586391dd06df4a (diff) | |
| download | subsurface-072b4f743c19566ad55bb4b30e0844082cccfbd1.tar.gz | |
Merge branch 'dc-device-selector'
Bring the device selector (when downloading from a dive computer) into
master.
Diffstat (limited to 'display-gtk.h')
| -rw-r--r-- | display-gtk.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/display-gtk.h b/display-gtk.h index 7b2ce5f2e..f4961b301 100644 --- a/display-gtk.h +++ b/display-gtk.h @@ -45,12 +45,14 @@ extern const void *subsurface_get_conf(char *name, pref_type_t type); extern void subsurface_flush_conf(void); extern void subsurface_close_conf(void); -extern const char *subsurface_USB_name(void); +extern int subsurface_fill_device_list(GtkListStore *store); extern const char *subsurface_icon_name(void); extern void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar, GtkWidget *vbox, GtkUIManager *ui_manager); extern void quit(GtkWidget *w, gpointer data); +extern int is_default_dive_computer_device(const char *name); + extern visible_cols_t visible_cols; extern const char *divelist_font; |