# HG changeset patch # User Eric Warmenhoven # Date 1002311531 0 # Node ID 0ba75351a01b7f97dd4da72b5eb4eb16dd4132b8 # Parent 18b68d5cc7d870eed5724cd538896836e32a89b4 [gaim-migrate @ 2443] core. committer: Tailor Script diff -r 18b68d5cc7d8 -r 0ba75351a01b acconfig.h --- a/acconfig.h Fri Oct 05 06:37:34 2001 +0000 +++ b/acconfig.h Fri Oct 05 19:52:11 2001 +0000 @@ -19,10 +19,6 @@ #undef NEED_GNOMESUPPORT_H #undef ZEPHYR_INT32 #undef ZEPHYR_USES_KERBEROS -#undef DEVEL #ifndef STATIC_PROTO_INIT #undef STATIC_PROTO_INIT #endif - - - diff -r 18b68d5cc7d8 -r 0ba75351a01b configure.ac --- a/configure.ac Fri Oct 05 06:37:34 2001 +0000 +++ b/configure.ac Fri Oct 05 19:52:11 2001 +0000 @@ -41,11 +41,6 @@ CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I\$(top_srcdir)" AC_ARG_ENABLE(distrib,,,enable_distrib=no) -AC_ARG_ENABLE(devel,,,enable_devel=no) -if test "$enable_devel" = "yes" ; then - CFLAGS="$CFLAGS -Wall" - AC_DEFINE(DEVEL) -fi AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes") AC_ARG_ENABLE(multi, [ --disable-multi disable multiple connections],,enable_multi=yes) AC_ARG_ENABLE(prpls, [ --disable-prpls don't build dynamic protocol plugins],,enable_prpls=yes) @@ -100,7 +95,7 @@ AC_ARG_ENABLE(plugins, [ --disable-plugins compile without plugin support],,enable_plugins=yes) AC_ARG_ENABLE(perl, [ --disable-perl compile without perl scripting],,enable_perl=yes) -AC_ARG_ENABLE(debug, [ --enable-debug compile with debugging support],,enable_debug=$enable_devel) +AC_ARG_ENABLE(debug, [ --enable-debug compile with debugging support],,enable_debug=no) AC_ARG_ENABLE(screensaver, [ --disable-screensaver compile without X screensaver extension],,enable_xss=yes) AC_ARG_WITH(krb4, [ --with-krb4=PREFIX Compile Zephyr plugin with Kerberos 4 support],kerberos="$withval",kerberos="no") diff -r 18b68d5cc7d8 -r 0ba75351a01b src/core.c --- a/src/core.c Fri Oct 05 06:37:34 2001 +0000 +++ b/src/core.c Fri Oct 05 19:52:11 2001 +0000 @@ -37,8 +37,6 @@ #include "gaim.h" -#if DEVEL - static gint UI_fd = -1; struct UI { GIOChannel *channel; @@ -173,15 +171,12 @@ return fd; } -#endif /* DEVEL */ - int core_main() { /* GMainLoop *loop; */ -#if DEVEL GIOChannel *channel; UI_fd = open_socket(); @@ -191,7 +186,6 @@ channel = g_io_channel_unix_new(UI_fd); g_io_add_watch(channel, G_IO_IN, socket_readable, NULL); g_io_channel_unref(channel); -#endif /* loop = g_main_new(TRUE); @@ -203,10 +197,8 @@ void core_quit() { -#ifdef DEVEL char buf[1024]; close(UI_fd); sprintf(buf, "%s/gaim_%s.%d", g_get_tmp_dir(), g_get_user_name(), getpid()); unlink(buf); -#endif }