diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | README | 10 | ||||
| -rw-r--r-- | libdivecomputer.c | 2 | ||||
| -rw-r--r-- | main.c | 2 | ||||
| -rw-r--r-- | parse-xml.c | 4 | ||||
| -rw-r--r-- | save-xml.c | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore index aeb949b3d..14742cce9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *.o -/divelog +/subsurface @@ -8,8 +8,8 @@ LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a OBJS = main.o dive.o profile.o info.o equipment.o divelist.o \ parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o -divelog: $(OBJS) - $(CC) $(LDFLAGS) -o divelog $(OBJS) \ +subsurface: $(OBJS) + $(CC) $(LDFLAGS) -o subsurface $(OBJS) \ `xml2-config --libs` \ `pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0` \ $(LIBDIVECOMPUTERARCHIVE) @@ -18,7 +18,7 @@ You also need to have libdivecomputer installed, which goes something like this: Usage: make - ./divelog dives/*.xml + ./subsurface dives/*.xml to see my dives (with no notes or commentary). @@ -26,15 +26,15 @@ Or, if you have a dive computer supported by libdivecomputer (and connected to /dev/ttyUSB0), you can just do make - ./divelog + ./subsurface and select "Import" from the File menu, tell it what dive computer you have, and hit "OK". There's a lot of duplicates in the XML files that come as an example, -and divelog will de-duplicate the ones that are exactly the same (just -because they were imported multiple times). But at least two of the -dives have duplicates that were edited by Dirk in the Suunto Dive +and subsurface will de-duplicate the ones that are exactly the same +(just because they were imported multiple times). But at least two of +the dives have duplicates that were edited by Dirk in the Suunto Dive Manager, so they don't trigger the "exact duplicates" match. WARNING! I wasn't kidding when I said that I've done this by reading diff --git a/libdivecomputer.c b/libdivecomputer.c index 2b62fa365..49c4f3695 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -40,7 +40,7 @@ static void error(const char *fmt, ...) va_start(args, fmt); error = g_error_new_valist( - g_quark_from_string("divelog"), + g_quark_from_string("subsurface"), DIVE_ERROR_PARSE, fmt, args); va_end(args); report_error(error); @@ -19,7 +19,7 @@ struct DiveList dive_list; GConfClient *gconf; struct units output_units; -#define GCONF_NAME(x) "/apps/diveclog/" #x +#define GCONF_NAME(x) "/apps/subsurface/" #x static int sortfn(const void *_a, const void *_b) { diff --git a/parse-xml.c b/parse-xml.c index 82149cf8a..6bb78fdf6 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -521,7 +521,7 @@ static void fahrenheit(char *buffer, void *_temperature) * pressures are in PSI. But the tank working pressure is in * bar. WTF^2? * - * Crazy stuff like this is why diveclog has everything in + * Crazy stuff like this is why subsurface has everything in * these inconvenient typed structures, and you have to say * "pressure->mbar" to get the actual value. Exactly so that * you can never have unit confusion. @@ -1357,7 +1357,7 @@ void parse_xml_file(const char *filename, GError **error) fprintf(stderr, "Failed to parse '%s'.\n", filename); if (error != NULL) { - *error = g_error_new(g_quark_from_string("divelog"), + *error = g_error_new(g_quark_from_string("subsurface"), DIVE_ERROR_PARSE, "Failed to parse '%s'", filename); diff --git a/save-xml.c b/save-xml.c index 47a8a7ebb..42bd17e9f 100644 --- a/save-xml.c +++ b/save-xml.c @@ -236,7 +236,7 @@ void save_dives(const char *filename) /* Flush any edits of current dives back to the dives! */ update_dive(current_dive); - fprintf(f, "<dives>\n<program name='diveclog' version='%d'></program>\n", VERSION); + fprintf(f, "<dives>\n<program name='subsurface' version='%d'></program>\n", VERSION); for (i = 0; i < dive_table.nr; i++) save_dive(f, get_dive(i)); fprintf(f, "</dives>\n"); |