mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Linus Torvalds 2011-11-01 17:09:15 -07:00
parent 43601f6546
commit e4bfb65972
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dive.h
View file

@ -257,7 +257,7 @@ extern void add_event(struct dive *dive, int time, int type, int flags, int valu
/* UI related protopypes */ /* UI related protopypes */
extern void init_ui(int argc, char **argv); extern void init_ui(int *argcp, char ***argvp);
extern void run_ui(void); extern void run_ui(void);

4
gtk-gui.c
View file

@ -739,7 +739,7 @@ static int get_from_registry(HKEY hkey, const char *key)
} }
#endif #endif
void init_ui(int argc, char **argv) void init_ui(int *argcp, char ***argvp)
{ {
GtkWidget *win; GtkWidget *win;
GtkWidget *notebook; GtkWidget *notebook;
@ -755,7 +755,7 @@ void init_ui(int argc, char **argv)
"GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, 0 "GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, 0
}; };
gtk_init(&argc, &argv); gtk_init(argcp, argvp);
settings = gtk_settings_get_default(); settings = gtk_settings_get_default();
gtk_settings_set_long_property(settings, "gtk_tooltip_timeout", 10, "subsurface setting"); gtk_settings_set_long_property(settings, "gtk_tooltip_timeout", 10, "subsurface setting");

2
main.c
View file

@ -217,7 +217,7 @@ int main(int argc, char **argv)
parse_xml_init(); parse_xml_init();
init_ui(argc, argv); init_ui(&argc, &argv);
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
const char *a = argv[i]; const char *a = argv[i];