Mercurial > pidgin.yaz

changeset 11720:4d8023465af4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 14011] I feel dumb for forgetting to change these files. Good thing we have CruiseControl here to email us when we break the build! committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 22 Oct 2005 20:49:55 +0000
parents 109ee3bfeac5
children 2d98b2759fa1
files Makefile.mingw configure.ac pixmaps/status/default/Makefile.am pixmaps/status/default/trepia.png plugins/crazychat/configure.ac po/POTFILES.in src/protocols/Makefile.am
diffstat 7 files changed, 1 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.mingw	Sat Oct 22 20:48:18 2005 +0000
+++ b/Makefile.mingw	Sat Oct 22 20:49:55 2005 +0000
@@ -21,7 +21,6 @@
 IRC = $(GAIM_PROTOS)/irc
 JABBER = $(GAIM_PROTOS)/jabber
 NAPSTER = $(GAIM_PROTOS)/napster
-TREPIA = $(GAIM_PROTOS)/trepia
 GG = $(GAIM_PROTOS)/gg
 NOVELL = $(GAIM_PROTOS)/novell
 SILC = $(GAIM_PROTOS)/silc
--- a/configure.ac	Sat Oct 22 20:48:18 2005 +0000
+++ b/configure.ac	Sat Oct 22 20:49:55 2005 +0000
@@ -221,7 +221,6 @@
 		silc)		static_silc=yes ;;
 		simple)		static_simple=yes ;;
 		toc)		static_toc=yes ;;
-		trepia)		static_trepia=yes ;;
 		yahoo)		static_yahoo=yes ;;
 		zephyr)		static_zephyr=yes ;;
 		*)			echo "Invalid static protocol $i!!" ; exit ;;
@@ -239,7 +238,6 @@
 AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes")
 AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes")
 AM_CONDITIONAL(STATIC_TOC, test "x$static_toc" = "xyes")
-AM_CONDITIONAL(STATIC_TREPIA, test "x$static_trepia" = "xyes")
 AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
 AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
 AC_SUBST(STATIC_LINK_LIBS)
@@ -271,7 +269,6 @@
 		silc)		dynamic_silc=yes ;;
 		simple)		dynamic_simple=yes ;;
 		toc)		dynamic_toc=yes ;;
-		trepia)		dynamic_trepia=yes ;;
 		yahoo)		dynamic_yahoo=yes ;;
 		zephyr)		dynamic_zephyr=yes ;;
 		*)			echo "Invalid dynamic protocol $i!!" ; exit ;;
@@ -289,7 +286,6 @@
 AM_CONDITIONAL(DYNAMIC_SILC, test "x$dynamic_silc" = "xyes" -a "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes")
 AM_CONDITIONAL(DYNAMIC_SIMPLE, test "x$dynamic_simple" = "xyes")
 AM_CONDITIONAL(DYNAMIC_TOC, test "x$dynamic_toc" = "xyes")
-AM_CONDITIONAL(DYNAMIC_TREPIA, test "x$dynamic_trepia" = "xyes")
 AM_CONDITIONAL(DYNAMIC_YAHOO, test "x$dynamic_yahoo" = "xyes")
 AM_CONDITIONAL(DYNAMIC_ZEPHYR, test "x$dynamic_zephyr" = "xyes")
 
@@ -1445,7 +1441,6 @@
 		   src/protocols/silc/Makefile
 		   src/protocols/simple/Makefile
 		   src/protocols/toc/Makefile
-		   src/protocols/trepia/Makefile
 		   src/protocols/yahoo/Makefile
 		   src/protocols/zephyr/Makefile
 		   gaim.pc
--- a/pixmaps/status/default/Makefile.am	Sat Oct 22 20:48:18 2005 +0000
+++ b/pixmaps/status/default/Makefile.am	Sat Oct 22 20:49:55 2005 +0000
@@ -36,7 +36,6 @@
 	secure.png \
 	silc.png \
 	simple.png \
-	trepia.png \
 	voice.png \
 	wireless.png \
 	yahoo.png \
Binary file pixmaps/status/default/trepia.png has changed
--- a/plugins/crazychat/configure.ac	Sat Oct 22 20:48:18 2005 +0000
+++ b/plugins/crazychat/configure.ac	Sat Oct 22 20:49:55 2005 +0000
@@ -255,7 +255,6 @@
 		silc)		static_silc=yes ;;
 		simple)		static_simple=yes ;;
 		toc)		static_toc=yes ;;
-		trepia)		static_trepia=yes ;;
 		yahoo)		static_yahoo=yes ;;
 		zephyr)		static_zephyr=yes ;;
 		*)			echo "Invalid static protocol $i!!" ; exit ;;
@@ -273,7 +272,6 @@
 AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes")
 AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes")
 AM_CONDITIONAL(STATIC_TOC, test "x$static_toc" = "xyes")
-AM_CONDITIONAL(STATIC_TREPIA, test "x$static_trepia" = "xyes")
 AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
 AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
 AC_SUBST(STATIC_LINK_LIBS)
@@ -305,7 +303,6 @@
 		silc)		dynamic_silc=yes ;;
 		simple)		dynamic_simple=yes ;;
 		toc)		dynamic_toc=yes ;;
-		trepia)		dynamic_trepia=yes ;;
 		yahoo)		dynamic_yahoo=yes ;;
 		zephyr)		dynamic_zephyr=yes ;;
 		*)			echo "Invalid dynamic protocol $i!!" ; exit ;;
@@ -323,7 +320,6 @@
 AM_CONDITIONAL(DYNAMIC_SILC, test "x$dynamic_silc" = "xyes" -a "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes")
 AM_CONDITIONAL(DYNAMIC_SIMPLE, test "x$dynamic_simple" = "xyes")
 AM_CONDITIONAL(DYNAMIC_TOC, test "x$dynamic_toc" = "xyes")
-AM_CONDITIONAL(DYNAMIC_TREPIA, test "x$dynamic_trepia" = "xyes")
 AM_CONDITIONAL(DYNAMIC_YAHOO, test "x$dynamic_yahoo" = "xyes")
 AM_CONDITIONAL(DYNAMIC_ZEPHYR, test "x$dynamic_zephyr" = "xyes")
 
@@ -1487,7 +1483,6 @@
 		   src/protocols/silc/Makefile
 		   src/protocols/simple/Makefile
 		   src/protocols/toc/Makefile
-		   src/protocols/trepia/Makefile
 		   src/protocols/yahoo/Makefile
 		   src/protocols/zephyr/Makefile
 		   gaim.pc
--- a/po/POTFILES.in	Sat Oct 22 20:48:18 2005 +0000
+++ b/po/POTFILES.in	Sat Oct 22 20:49:55 2005 +0000
@@ -123,7 +123,6 @@
 src/protocols/silc/silc.c
 src/protocols/silc/util.c
 src/protocols/toc/toc.c
-src/protocols/trepia/trepia.c
 src/protocols/yahoo/yahoo.c
 src/protocols/yahoo/yahoo_filexfer.c
 src/protocols/yahoo/yahoo_profile.c
--- a/src/protocols/Makefile.am	Sat Oct 22 20:48:18 2005 +0000
+++ b/src/protocols/Makefile.am	Sat Oct 22 20:49:55 2005 +0000
@@ -1,3 +1,3 @@
-DIST_SUBDIRS = bonjour gg irc jabber msn napster novell oscar sametime silc toc simple trepia yahoo zephyr
+DIST_SUBDIRS = bonjour gg irc jabber msn napster novell oscar sametime silc toc simple yahoo zephyr
 
 SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)