From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Nov 2011 00:09:15 +0000 (-0700)
Subject: Fix 'init_ui()' so that it can change argc/argv
X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=commitdiff_plain;h=e4bfb6597279ca3d9aa3678a617f5f0aef298278

Fix 'init_ui()' so that it can change argc/argv

That's what gtk_init() does with gtk-specific arguments.  IOW, if you do
things like

   subsurface --g-fatal-warnings dives.xml

to get a real abort on gtk warnings, gtk_init needs to be able to
actually change argc/argv.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/dive.h b/dive.h
index 58b6611..eda8d6b 100644
--- a/dive.h
+++ b/dive.h
@@ -257,7 +257,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 b160508..676c0d0 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;
@@ -755,7 +755,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 5fed4cd..471abc7 100644
--- a/main.c
+++ b/main.c
@@ -217,7 +217,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];