diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2012-09-17 21:27:43 -0400 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2012-09-17 21:44:28 -0400 |
| commit | 3835faa8fb02df8edb299278f4258389d3e99bda (patch) | |
| tree | 6ac1697a5f7343157f73ad5063b2cefa23395e20 /display-gtk.h | |
| parent | febae4d165866ca4a4e28347aebe446d65ed44e5 (diff) | |
| parent | d7465129bb7fc912ec89671051192983b80711c4 (diff) | |
| download | subsurface-3835faa8fb02df8edb299278f4258389d3e99bda.tar.gz | |
Merge branch 'defaultfile'
By now the default file code seems quite matured, so in preparation for
2.0 we'll bring it back into master.
I made a few small clean-ups during the merge, but the merge itself is
very much straight forward.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'display-gtk.h')
| -rw-r--r-- | display-gtk.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/display-gtk.h b/display-gtk.h index dd7e2c4a0..9d0ea4ed3 100644 --- a/display-gtk.h +++ b/display-gtk.h @@ -49,8 +49,7 @@ extern const char *subsurface_USB_name(void); extern const char *subsurface_icon_name(void); extern void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar, GtkWidget *vbox, GtkUIManager *ui_manager); - -extern const char *divelist_font; +extern void quit(GtkWidget *w, gpointer data); extern visible_cols_t visible_cols; |