From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Nov 2011 19:39:55 +0000 (-0700)
Subject: Merge branch 'add-info-stats-page' of git://github.com/dirkhh/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=55352a051cfa7ac519e397cd3d18851e5050517b;hp=619ab9e828d4db7b0c4089018b09892c9d04ece9;p=ext%2Fsubsurface.git

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 2fae0c9..cf11e1f 100644
--- 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 dd79f73..339b13f 100644
--- 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 680bf21..9aaa5d1 100644
--- 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];