moparisthebest/hexchat
1
0
Fork 0
mirror of https://github.com/moparisthebest/hexchat synced 2024-11-26 19:22:22 -05:00
Code Issues Releases Wiki Activity

Fix root user warning running before g_type_init

Browse Source 
closes #504
This commit is contained in:
TingPing 2013-04-05 10:12:33 -04:00
parent 7746ff9a12
commit d964af8142
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/cfgfiles.c
View File

@ -827,15 +827,6 @@ load_config (void)
} else } 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_dir, 0700);
g_mkdir (prefs.hex_dcc_completed_dir, 0700); g_mkdir (prefs.hex_dcc_completed_dir, 0700);

9
src/fe-gtk/fe-gtk.c
View File

@ -264,6 +264,15 @@ fe_args (int argc, char *argv[])
gdk_window_add_filter (gdk_get_default_root_window (), (GdkFilterFunc)root_event_cb, NULL); gdk_window_add_filter (gdk_get_default_root_window (), (GdkFilterFunc)root_event_cb, NULL);
#endif #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; return -1;
} }

13
src/fe-text/fe-text.c
View File

@ -486,8 +486,6 @@ fe_args (int argc, char *argv[])
g_option_context_add_main_entries (context, gopt_entries, GETTEXT_PACKAGE); g_option_context_add_main_entries (context, gopt_entries, GETTEXT_PACKAGE);
g_option_context_parse (context, &argc, &argv, &error); g_option_context_parse (context, &argc, &argv, &error);
g_type_init ();
if (error) if (error)
{ {
if (error->message) if (error->message)
@ -537,6 +535,17 @@ fe_args (int argc, char *argv[])
g_free (arg_cfgdir); 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; return -1;
} }