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 58b6611f84e1f566e434bb623d627a6c489d2dce..eda8d6b34d33b4424aabb74df958e7172438b005 100644 (file)
--- 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 b160508383b66c8d287e1900baf23966c4f99f05..676c0d063a4d1356d60e32c48d125c7aa79bb18a 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;
@@ -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 5fed4cd6ed0e5b74b140e7bf8a8971eab9f24c45..471abc7b4acee1f1c1f4ddca9c6a16784d19630d 100644 (file)
--- 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];