--- gaim-0.52/configure.old Thu Jun 6 10:28:40 2002 +++ gaim-0.52/configure Thu Jun 6 10:31:25 2002 @@ -9684,7 +9684,7 @@ STATIC_PRPLS="oscar toc" fi; if test "x$STATIC_PRPLS" = "xall" ; then - STATIC_PRPLS="gg icq irc jabber msn napster oscar toc yahoo zephyr" + STATIC_PRPLS="gg icq irc jabber napster oscar toc yahoo zephyr" fi STATIC_LINK_LIBS= @@ -9699,7 +9699,6 @@ icq) static_icq=yes ;; irc) static_irc=yes ;; jabber) static_jabber=yes ;; - msn) static_msn=yes ;; napster) static_napster=yes ;; oscar) static_oscar=yes ;; toc) static_toc=yes ;; @@ -9741,14 +9740,6 @@ STATIC_JABBER_FALSE= fi -if test "x$static_msn" = "xyes"; then - STATIC_MSN_TRUE= - STATIC_MSN_FALSE='#' -else - STATIC_MSN_TRUE='#' - STATIC_MSN_FALSE= -fi - if test "x$static_napster" = "xyes"; then STATIC_NAPSTER_TRUE= STATIC_NAPSTER_FALSE='#' @@ -13735,7 +13726,7 @@ fi done -ac_config_files="$ac_config_files Makefile doc/Makefile intl/Makefile m4/Makefile pixmaps/Makefile plugins/Makefile po/Makefile.in sounds/Makefile src/Makefile src/protocols/Makefile src/protocols/gg/Makefile src/protocols/icq/Makefile src/protocols/irc/Makefile src/protocols/jabber/Makefile src/protocols/msn/Makefile src/protocols/napster/Makefile src/protocols/oscar/Makefile src/protocols/toc/Makefile src/protocols/yahoo/Makefile src/protocols/zephyr/Makefile gaim.spec" +ac_config_files="$ac_config_files Makefile doc/Makefile intl/Makefile m4/Makefile pixmaps/Makefile plugins/Makefile po/Makefile.in sounds/Makefile src/Makefile src/protocols/Makefile src/protocols/gg/Makefile src/protocols/icq/Makefile src/protocols/irc/Makefile src/protocols/jabber/Makefile src/protocols/napster/Makefile src/protocols/oscar/Makefile src/protocols/toc/Makefile src/protocols/yahoo/Makefile src/protocols/zephyr/Makefile gaim.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -14066,7 +14057,6 @@ "src/protocols/icq/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocols/icq/Makefile" ;; "src/protocols/irc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocols/irc/Makefile" ;; "src/protocols/jabber/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocols/jabber/Makefile" ;; - "src/protocols/msn/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocols/msn/Makefile" ;; "src/protocols/napster/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocols/napster/Makefile" ;; "src/protocols/oscar/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocols/oscar/Makefile" ;; "src/protocols/toc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocols/toc/Makefile" ;; --- gaim-0.52/src/protocols/Makefile.in.old Sun Feb 17 14:13:49 2002 +++ gaim-0.52/src/protocols/Makefile.in Thu Jun 6 10:41:00 2002 @@ -147,7 +147,7 @@ pkgcfg = @pkgcfg@ sedpath = @sedpath@ -DIST_SUBDIRS = gg icq irc jabber msn napster oscar toc yahoo zephyr +DIST_SUBDIRS = gg icq irc jabber napster oscar toc yahoo zephyr @PRPLS_TRUE@SUBDIRS = $(DIST_SUBDIRS) @PRPLS_FALSE@SUBDIRS = $(STATIC_PRPLS) --- gaim-0.52/src/protocols/Makefile.am.old Wed Oct 3 01:04:44 2001 +++ gaim-0.52/src/protocols/Makefile.am Thu Jun 6 10:40:43 2002 @@ -1,4 +1,4 @@ -DIST_SUBDIRS = gg icq irc jabber msn napster oscar toc yahoo zephyr +DIST_SUBDIRS = gg icq irc jabber napster oscar toc yahoo zephyr if PRPLS --- gaim-0.52/pixmaps/Makefile.am.old Tue Dec 11 04:35:46 2001 +++ gaim-0.52/pixmaps/Makefile.am Thu Jun 6 10:50:27 2002 @@ -67,8 +67,6 @@ moneymouth.xpm \ mrt.xpm \ msgpend.png \ - msn_away.xpm \ - msn_online.xpm \ napster.xpm \ no_icon.xpm \ normal.xpm \ --- gaim-0.52/pixmaps/Makefile.in.old Sun Feb 17 14:13:24 2002 +++ gaim-0.52/pixmaps/Makefile.in Thu Jun 6 10:50:06 2002 @@ -147,7 +147,7 @@ pkgcfg = @pkgcfg@ sedpath = @sedpath@ -EXTRA_DIST = ab.xpm about_small.xpm add.xpm add_small.xpm admin_icon.xpm aimicon.xpm angel.xpm aol_icon.xpm available-away.xpm available-chat.xpm available-dnd.xpm available-xa.xpm available.xpm away.png away_big.xpm away_icon.xpm away_small.xpm bgcolor.xpm big.xpm bigsmile.xpm block.xpm bold.xpm burp.xpm cancel.xpm close.xpm close_small.xpm connect.png crazy4.xpm crossedlips.xpm cry.xpm dt_icon.xpm download.xpm embarrassed.xpm exit_small.xpm farted.xpm fgcolor.xpm fontface.xpm fontface2.xpm free_icon.xpm gaim.xpm gg_suncloud.xpm gg_sunred.xpm gg_sunwhitered.xpm gg_sunyellow.xpm gnome_add.xpm gnome_preferences.xpm gnome_remove.xpm gnomeicu-away.xpm gnomeicu-dnd.xpm gnomeicu-ffc.xpm gnomeicu-na.xpm gnomeicu-occ.xpm gnomeicu-offline.xpm gnomeicu-online.xpm group.xpm import_small.xpm irc_icon.xpm italic.xpm join.xpm kiss.xpm link.xpm login_icon.xpm logo.xpm logout_icon.xpm logout_menu.xpm luke03.xpm moneymouth.xpm mrt.xpm msgpend.png msn_away.xpm msn_online.xpm napster.xpm no_icon.xpm normal.xpm offline.png ok.xpm oneeye.xpm online.png panic.xpm plugins_small.xpm pounce_small.xpm prefs_small.xpm refresh.xpm sad.xpm save.xpm save_small.xpm scream.xpm search_small.xpm send_small.xpm small.xpm smile.xpm smile8.xpm smile_icon.xpm speaker.xpm status-away.xpm status-here.xpm status-idle.xpm strike.xpm tb_forward.xpm tb_redo.xpm tb_refresh.xpm tb_search.xpm tb_undo.xpm think.xpm tmp_send.xpm tongue.xpm underline.xpm warn.xpm wink.xpm wood.xpm yell.xpm +EXTRA_DIST = ab.xpm about_small.xpm add.xpm add_small.xpm admin_icon.xpm aimicon.xpm angel.xpm aol_icon.xpm available-away.xpm available-chat.xpm available-dnd.xpm available-xa.xpm available.xpm away.png away_big.xpm away_icon.xpm away_small.xpm bgcolor.xpm big.xpm bigsmile.xpm block.xpm bold.xpm burp.xpm cancel.xpm close.xpm close_small.xpm connect.png crazy4.xpm crossedlips.xpm cry.xpm dt_icon.xpm download.xpm embarrassed.xpm exit_small.xpm farted.xpm fgcolor.xpm fontface.xpm fontface2.xpm free_icon.xpm gaim.xpm gg_suncloud.xpm gg_sunred.xpm gg_sunwhitered.xpm gg_sunyellow.xpm gnome_add.xpm gnome_preferences.xpm gnome_remove.xpm gnomeicu-away.xpm gnomeicu-dnd.xpm gnomeicu-ffc.xpm gnomeicu-na.xpm gnomeicu-occ.xpm gnomeicu-offline.xpm gnomeicu-online.xpm group.xpm import_small.xpm irc_icon.xpm italic.xpm join.xpm kiss.xpm link.xpm login_icon.xpm logo.xpm logout_icon.xpm logout_menu.xpm luke03.xpm moneymouth.xpm mrt.xpm msgpend.png napster.xpm no_icon.xpm normal.xpm offline.png ok.xpm oneeye.xpm online.png panic.xpm plugins_small.xpm pounce_small.xpm prefs_small.xpm refresh.xpm sad.xpm save.xpm save_small.xpm scream.xpm search_small.xpm send_small.xpm small.xpm smile.xpm smile8.xpm smile_icon.xpm speaker.xpm status-away.xpm status-here.xpm status-idle.xpm strike.xpm tb_forward.xpm tb_redo.xpm tb_refresh.xpm tb_search.xpm tb_undo.xpm think.xpm tmp_send.xpm tongue.xpm underline.xpm warn.xpm wink.xpm wood.xpm yell.xpm @DISTRIB_TRUE@gaimdistpixdir = $(datadir)/pixmaps/gaim --- gaim-0.52/po/POTFILES.in.old Tue Nov 6 18:46:18 2001 +++ gaim-0.52/po/POTFILES.in Thu Jun 6 11:00:10 2002 @@ -2,7 +2,6 @@ src/protocols/icq/gaim_icq.c src/protocols/irc/irc.c src/protocols/jabber/jabber.c -src/protocols/msn/msn.c src/protocols/napster/napster.c src/protocols/oscar/oscar.c src/protocols/toc/toc.c