diff options
| author | TingPing <tingping@tingping.se> | 2013-04-27 06:32:30 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2013-04-27 06:32:30 -0400 |
| commit | 565a4927242ad84430b247f3e3939cf75ceb986d (patch) | |
| tree | ea8b7d4eab39e8a471bf1e389f14db3dfd86da04 | |
| parent | 6982bbfef96cb6e42ca8f5f330b5fa4665ca388c (diff) | |
Reverts commit d964af81428a6d768aeb96906eb0538a30d919ca
| -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 | 15 |
3 files changed, 10 insertions, 23 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index e9486771..525e6acd 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -830,6 +830,15 @@ 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 7ad7254b..72794fe5 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -264,15 +264,6 @@ 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 883a178c..bff86bfd 100644 --- a/src/fe-text/fe-text.c +++ b/src/fe-text/fe-text.c @@ -485,7 +485,7 @@ fe_args (int argc, char *argv[]) context = g_option_context_new (NULL); g_option_context_add_main_entries (context, gopt_entries, GETTEXT_PACKAGE); g_option_context_parse (context, &argc, &argv, &error); - + if (error) { if (error->message) @@ -535,19 +535,6 @@ fe_args (int argc, char *argv[]) g_free (arg_cfgdir); } -#if ! GLIB_CHECK_VERSION (2, 36, 0) - g_type_init (); -#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; } |