diff options
| -rw-r--r-- | config.h.mingw | 1 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/buddy_chat.c | 4 | ||||
| -rw-r--r-- | src/main.c | 4 |
4 files changed, 0 insertions, 16 deletions
diff --git a/config.h.mingw b/config.h.mingw index 7482fb6e65..ecb4cd8c83 100644 --- a/config.h.mingw +++ b/config.h.mingw @@ -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 diff --git a/configure.ac b/configure.ac index aaa2c6663d..59c3e79052 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,6 @@ AC_TRY_COMPILE([ 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(DEBUG_CFLAGS) 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 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 diff --git a/src/buddy_chat.c b/src/buddy_chat.c index 73117b0323..2f6c06639e 100644 --- a/src/buddy_chat.c +++ b/src/buddy_chat.c @@ -335,7 +335,6 @@ join_chat() 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 @@ join_chat() 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 */ diff --git a/src/main.c b/src/main.c index eacb364a2b..f3e96cb11b 100644 --- a/src/main.c +++ b/src/main.c @@ -326,10 +326,6 @@ void show_login() 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", |