# HG changeset patch # User Herman Bloggs # Date 1042756664 0 # Node ID a4d30084fe1cdfc2d93fe876ef47f09a03612498 # Parent 13f41fc1fa8ffce079cae8245c9831098984bd67 [gaim-migrate @ 4575] win32 fix in ui_main committer: Tailor Script diff -r 13f41fc1fa8f -r a4d30084fe1c src/aim.c --- a/src/aim.c Thu Jan 16 22:32:48 2003 +0000 +++ b/src/aim.c Thu Jan 16 22:37:44 2003 +0000 @@ -490,22 +490,24 @@ g_free(data); return TRUE; } -#endif +#endif /* _WIN32 */ + static int ui_main() { #ifndef _WIN32 GIOChannel *channel; int UI_fd; -#endif char name[256]; GList *icons = NULL; GdkPixbuf *icon = NULL; char *icon_path; +#endif + smiley_theme_probe(); if (current_smiley_theme == NULL && smiley_themes) load_smiley_theme(smiley_themes->data, TRUE); - +#ifndef _WIN32 /* use the nice PNG icon for all the windows */ icon_path = g_build_filename(DATADIR, "pixmaps", "gaim.png", NULL); icon = gdk_pixbuf_new_from_file(icon_path, NULL); @@ -519,7 +521,6 @@ } g_snprintf(name, sizeof(name), "%s" G_DIR_SEPARATOR_S "gaim_%s.%d", g_get_tmp_dir(), g_get_user_name(), gaim_session); -#ifndef _WIN32 UI_fd = gaim_connect_to_session(0); if (UI_fd < 0) return 1; @@ -530,7 +531,6 @@ return 0; } - static void set_first_user(char *name) { struct aim_user *u; @@ -836,9 +836,7 @@ load_prefs(); core_main(); -#ifndef _WIN32 ui_main(); -#endif #ifdef USE_SM session_init(argv[0], opt_session_arg);