Mercurial > pidgin
changeset 7783:565369d12874
[gaim-migrate @ 8428]
I just deprecated the shit out of NO_MULTI.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 07 Dec 2003 08:55:37 +0000 |
| parents | 795b71216887 |
| children | 136c65e68fb1 |
| files | config.h.mingw configure.ac src/buddy_chat.c src/main.c |
| diffstat | 4 files changed, 0 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/config.h.mingw Sun Dec 07 08:15:05 2003 +0000 +++ b/config.h.mingw Sun Dec 07 08:55:37 2003 +0000 @@ -74,7 +74,6 @@ /* #undef USE_GNOME */ /* #undef USE_PIXBUF */ #define USE_SCREENSAVER 1 -/* #undef NO_MULTI */ /* #define DEBUG 1 */ #define GAIM_PLUGINS 1 #define USE_PERL 1
--- a/configure.ac Sun Dec 07 08:15:05 2003 +0000 +++ b/configure.ac Sun Dec 07 08:55:37 2003 +0000 @@ -94,7 +94,6 @@ AC_ARG_ENABLE(distrib,,,enable_distrib=no) 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) AC_ARG_WITH(static-prpls, [ --with-static-prpls link in certain protocols statically],[STATIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`],STATIC_PRPLS="") if test "x$STATIC_PRPLS" = "xall" ; then @@ -924,11 +923,6 @@ AC_SUBST(LDADD) AC_SUBST(LIBS) -if test "x$enable_multi" != "xyes" ; then - AC_DEFINE(NO_MULTI, 1, [Define if multiple connections is disabled.]) - enable_multi=no -fi - if test "x$enable_plugins" = "xyes" ; then AC_DEFINE(GAIM_PLUGINS, 1, [Define if plugins are enabled.]) AM_CONDITIONAL(PLUGINS, test "x$enable_plugins" = "xyes") @@ -1041,7 +1035,6 @@ echo $PACKAGE $VERSION echo -echo Allow Multiple Connections.... : $enable_multi echo Build Protocol Plugins........ : $enable_prpls echo Protocols to link statically.. : $STATIC_PRPLS echo Protocols to build dynamically : $DYNAMIC_PRPLS
--- a/src/buddy_chat.c Sun Dec 07 08:15:05 2003 +0000 +++ b/src/buddy_chat.c Sun Dec 07 08:55:37 2003 +0000 @@ -335,7 +335,6 @@ gtk_container_set_border_width(GTK_CONTAINER(fbox), 5); gtk_container_add(GTK_CONTAINER(frame), fbox); -#ifndef NO_MULTI rowbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(fbox), rowbox, TRUE, TRUE, 0); @@ -348,9 +347,6 @@ gtk_container_add(GTK_CONTAINER(fbox), jc_vbox); gtk_container_set_border_width(GTK_CONTAINER(jc_vbox), 0); -#else - joinchatgc = gaim_connections_get_all()->data; -#endif rebuild_jc(); /* buttons */
--- a/src/main.c Sun Dec 07 08:15:05 2003 +0000 +++ b/src/main.c Sun Dec 07 08:55:37 2003 +0000 @@ -326,10 +326,6 @@ G_CALLBACK(gaim_gtk_accounts_window_show), mainwindow); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); -#ifdef NO_MULTI - gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE); -#endif - button = gaim_pixbuf_button_from_stock(_("Preferences"), GTK_STOCK_PREFERENCES, GAIM_BUTTON_VERTICAL); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); g_signal_connect(G_OBJECT(button), "clicked",