Merge branch 'add-info-stats-page' of git://github.com/dirkhh/subsurface

* 'add-info-stats-page' of git://github.com/dirkhh/subsurface:
  Add Info & Stats page to the notebook
  Even more places with pressure and volume conversions
  Further cleanup of pressure and volume conversions
  Use unit functions to get column headers, add unit function for pressure
  More consistency improvements
  Add new helper function to get temperature and unit

diff --git a/dive.h b/dive.h
index 2fae0c92ef24d1fd5ae3e08b93f87512cd4f277b..cf11e1f89384bb34176e9eb5c14879cb89f73be1 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -287,7 +287,7 @@ extern void add_event(struct dive *dive, int time, int type, int flags, int valu
 
 /* UI related protopypes */
 
-extern void init_ui(int argc, char **argv);
+extern void init_ui(int *argcp, char ***argvp);
 
 extern void run_ui(void);
 

diff --git a/gtk-gui.c b/gtk-gui.c
index dd79f7311f4b8a71c1dd24333d5a2abd6d227339..339b13f4c37c67cbec6681525425d261700f8fe3 100644 (file)
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -739,7 +739,7 @@ static int get_from_registry(HKEY hkey, const char *key)
 }
 #endif
 
-void init_ui(int argc, char **argv)
+void init_ui(int *argcp, char ***argvp)
 {
        GtkWidget *win;
        GtkWidget *notebook;
@@ -756,7 +756,7 @@ void init_ui(int argc, char **argv)
                "GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, 0
        };
 
-       gtk_init(&argc, &argv);
+       gtk_init(argcp, argvp);
        settings = gtk_settings_get_default();
        gtk_settings_set_long_property(settings, "gtk_tooltip_timeout", 10, "subsurface setting");
 

diff --git a/main.c b/main.c
index 680bf217126388154db9b40a0d744ca5768b6e7b..9aaa5d1f42ca61b384fb37740a7ebbbefe9472dc 100644 (file)
--- a/main.c
+++ b/main.c
@@ -218,7 +218,7 @@ int main(int argc, char **argv)
 
        parse_xml_init();
 
-       init_ui(argc, argv);
+       init_ui(&argc, &argv);
        
        for (i = 1; i < argc; i++) {
                const char *a = argv[i];