diff options
| author | TingPing <tingping@tingping.se> | 2013-04-05 10:12:33 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2013-04-05 10:12:33 -0400 |
| commit | d964af81428a6d768aeb96906eb0538a30d919ca (patch) | |
| tree | dd11a42043d858ddf86ff387f3f0517a78b1b413 | |
| parent | 7746ff9a122fdecc512e560b2a0608cc949ff2b6 (diff) | |
Fix root user warning running before g_type_init
closes #504
| -rw-r--r-- | src/common/cfgfiles.c | 9 | ||||
| -rw-r--r-- | src/fe-gtk/fe-gtk.c | 9 | ||||
| -rw-r--r-- | src/fe-text/fe-text.c | 13 |
3 files changed, 20 insertions, 11 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index aa0fb1a7..ac9120e1 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -827,15 +827,6 @@ load_config (void) } else { -#ifndef WIN32 -#ifndef __EMX__ - /* OS/2 uses UID 0 all the time */ - if (getuid () == 0) - fe_message (_("* Running IRC as root is stupid! You should\n" - " create a User Account and use that to login.\n"), FE_MSG_WARN|FE_MSG_WAIT); -#endif -#endif /* !WIN32 */ - g_mkdir (prefs.hex_dcc_dir, 0700); g_mkdir (prefs.hex_dcc_completed_dir, 0700); diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index 896ab143..deefb788 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -264,6 +264,15 @@ fe_args (int argc, char *argv[]) gdk_window_add_filter (gdk_get_default_root_window (), (GdkFilterFunc)root_event_cb, NULL); #endif +#ifndef WIN32 +#ifndef __EMX__ + /* OS/2 uses UID 0 all the time */ + if (getuid () == 0) + fe_message (_("* Running IRC as root is stupid! You should\n" + " create a User Account and use that to login.\n"), FE_MSG_WARN|FE_MSG_WAIT); +#endif +#endif /* !WIN32 */ + return -1; } diff --git a/src/fe-text/fe-text.c b/src/fe-text/fe-text.c index 371ce5b8..f5f7e6f8 100644 --- a/src/fe-text/fe-text.c +++ b/src/fe-text/fe-text.c @@ -486,8 +486,6 @@ fe_args (int argc, char *argv[]) g_option_context_add_main_entries (context, gopt_entries, GETTEXT_PACKAGE); g_option_context_parse (context, &argc, &argv, &error); - g_type_init (); - if (error) { if (error->message) @@ -537,6 +535,17 @@ fe_args (int argc, char *argv[]) g_free (arg_cfgdir); } + g_type_init (); + +#ifndef WIN32 +#ifndef __EMX__ + /* OS/2 uses UID 0 all the time */ + if (getuid () == 0) + fe_message (_("* Running IRC as root is stupid! You should\n" + " create a User Account and use that to login.\n"), FE_MSG_WARN|FE_MSG_WAIT); +#endif +#endif /* !WIN32 */ + return -1; } |