pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits

[Gaim-commits] CVS: gaim autogen.sh,1.22,1.23

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv6971

Modified Files:
	autogen.sh 
Log Message:
GIVE US OUR CHANGELOG BACK!


Index: autogen.sh
===================================================================
RCS file: /cvsroot/gaim/gaim/autogen.sh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- autogen.sh	20 Aug 2002 08:54:56 -0000	1.22
+++ autogen.sh	26 Aug 2002 04:04:10 -0000	1.23
@@ -43,8 +43,16 @@
 echo "Generating configuration files for Gaim, please wait...."
 echo;
 
+# Backup the po/ChangeLog. This should prevent the annoying
+# gettext ChangeLog modifications.
+
+cp -p po/ChangeLog po/ChangeLog.save
+
 echo "Running gettextize, please ignore non-fatal messages...."
 $SETUP_GETTEXT
+
+# Restore the po/ChangeLog file.
+mv po/ChangeLog.save po/ChangeLog
 
 echo "Running libtoolize, please ignore non-fatal messages...."
 echo n | libtoolize --copy --force || exit;

[Gaim-commits] CVS: gaim ChangeLog,1.523,1.524

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv6877

Modified Files:
	ChangeLog 
Log Message:
I'm stroking Robot101's ego. ;)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -d -r1.523 -r1.524
--- ChangeLog	25 Aug 2002 23:47:15 -0000	1.523
+++ ChangeLog	26 Aug 2002 04:03:47 -0000	1.524
@@ -36,6 +36,8 @@
 	* Added support for automake 1.6.
 	* Buddy Ticker made a plugin.
 	* Read proxy environment variables.  (Thanks, Christian Hammond)
+	* Fixed security vulnerability with manual browser option (Thanks,
+	  Robert McQueen)
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

[Gaim-commits] CVS: gaim/src Makefile.am,1.48,1.49

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv4483/src

Modified Files:
	Makefile.am 
Log Message:
Chip--correct any of this if I'm wrong.  I only know it works for me.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- Makefile.am	25 Aug 2002 06:08:15 -0000	1.48
+++ Makefile.am	26 Aug 2002 03:49:28 -0000	1.49
@@ -36,8 +36,7 @@
 
 LIBS = @LIBS@ $(GTK_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS)
 
-EXTRA_DIST =	applet.h \
-		convo.h \
+EXTRA_DIST =	convo.h \
 		core.h \
 		gaim.h \
 		getopt.c \

[Gaim-commits] CVS: gaim/po POTFILES.in,1.14,1.15

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv1711/po

Modified Files:
	POTFILES.in 
Log Message:
de DA da!


Index: POTFILES.in
===================================================================
RCS file: /cvsroot/gaim/gaim/po/POTFILES.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- POTFILES.in	21 May 2002 23:07:15 -0000	1.14
+++ POTFILES.in	26 Aug 2002 03:36:26 -0000	1.15
@@ -12,7 +12,6 @@
 src/protocols/zephyr/zephyr.c
 src/about.c
 src/aim.c
-src/applet.c
 src/away.c
 src/buddy.c
 src/buddy_chat.c

[Gaim-commits] CVS: gaim/m4 Makefile.am,1.3,1.4 gnome-pthread-check.m4,1.1,NONE

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/m4
In directory usw-pr-cvs1:/tmp/cvs-serv601/m4

Modified Files:
	Makefile.am 
Removed Files:
	gnome-pthread-check.m4 
Log Message:
It's important to me that you know you are free.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/m4/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	3 May 2002 23:58:59 -0000	1.3
+++ Makefile.am	26 Aug 2002 03:31:56 -0000	1.4
@@ -1,3 +1 @@
-EXTRA_DIST = gnome-x-checks.m4 gnome-gnorba-check.m4 \
-             gnome-pthread-check.m4 gnome.m4 gnome-orbit-check.m4 \
-             esd.m4 artsc.m4 ac_var_timezone_externals.m4
+EXTRA_DIST = esd.m4 artsc.m4 ac_var_timezone_externals.m4

--- gnome-pthread-check.m4 DELETED ---

[Gaim-commits] CVS: gaim Makefile.am,1.34,1.35

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv32249

Modified Files:
	Makefile.am 
Log Message:
I guess we don't need this anymore?  ChipX86?


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Makefile.am	25 Aug 2002 04:59:34 -0000	1.34
+++ Makefile.am	26 Aug 2002 03:28:50 -0000	1.35
@@ -1,4 +1,4 @@
-EXTRA_DIST = config.rpath gaim.spec.in gaim.desktop \
+EXTRA_DIST = gaim.spec.in gaim.desktop \
 	HACKING gaim2blt.pl licq2gaim.pl setup-gettext
 
 pixmapdir = $(datadir)/gnome/apps/Internet

[Gaim-commits] CVS: gaim gaim.spec.in,1.52,1.52.2.1

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv23287

Modified Files:
      Tag: gtk1-stable
	gaim.spec.in 
Log Message:
no more .xpm


Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.52
retrieving revision 1.52.2.1
diff -u -d -r1.52 -r1.52.2.1
--- gaim.spec.in	25 Jun 2002 01:25:44 -0000	1.52
+++ gaim.spec.in	26 Aug 2002 02:41:27 -0000	1.52.2.1
@@ -74,7 +74,7 @@
 %{prefix}/man/man1/gaim.1.gz
 %attr(755,root,root) %{prefix}/lib/gaim/*
 %{prefix}/share/locale/*/*/*
-%{prefix}/share/pixmaps/gaim.xpm
+%{prefix}/share/pixmaps/gaim.png
 %{prefix}/share/gnome/apps/Internet/gaim.desktop
 
 

[Gaim-commits] CVS: gaim/src gaimrc.c,1.102,1.103

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv21515/src

Modified Files:
	gaimrc.c 
Log Message:
Thanks peloverde.


Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- gaimrc.c	25 Aug 2002 23:46:16 -0000	1.102
+++ gaimrc.c	26 Aug 2002 02:33:38 -0000	1.103
@@ -829,7 +829,9 @@
 		away_resend = 120;
 
 	if (misc_options & OPT_MISC_BUDDY_TICKER) {
+#ifdef GAIM_PLUGINS
 		load_plugin(LIBDIR "/ticker.so");
+#endif
 		misc_options &= ~OPT_MISC_BUDDY_TICKER;
 	} 
 }

[Gaim-commits] CVS: gaim gaim.spec.in,1.54,1.55

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv21515

Modified Files:
	gaim.spec.in 
Log Message:
Thanks peloverde.


Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- gaim.spec.in	25 Aug 2002 23:06:36 -0000	1.54
+++ gaim.spec.in	26 Aug 2002 02:33:38 -0000	1.55
@@ -41,7 +41,6 @@
 mkdir -p $RPM_BUILD_ROOT%{prefix}
 make prefix=$RPM_BUILD_ROOT%{prefix} install
 make -C src mostlyclean-compile
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --sysconfdir=%{sysconfdir} --enable-distrib --disable-artsc
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT prefix=%{prefix} sysconfdir=%{sysconfdir} install

[Gaim-commits] CVS: gaim/src perl.c,1.72.2.1,1.72.2.2

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv14135/src

Modified Files:
      Tag: gtk1-stable
	perl.c 
Log Message:
i suck too.


Index: perl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/perl.c,v
retrieving revision 1.72.2.1
retrieving revision 1.72.2.2
diff -u -d -r1.72.2.1 -r1.72.2.2
--- perl.c	25 Aug 2002 02:29:19 -0000	1.72.2.1
+++ perl.c	26 Aug 2002 02:01:36 -0000	1.72.2.2
@@ -177,6 +177,7 @@
 void perl_autoload()
 {
 	DIR *dir;
+	struct dirent *ent;
 	struct dirent dirent_buf;
 	char *buf;
 	char *path;

[Gaim-commits] CVS: gaim NEWS,1.138,1.138.2.1

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv12134

Modified Files:
      Tag: gtk1-stable
	NEWS 
Log Message:
I like the cool camels.


Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.138
retrieving revision 1.138.2.1
diff -u -d -r1.138 -r1.138.2.1
--- NEWS	25 Jun 2002 01:25:44 -0000	1.138
+++ NEWS	26 Aug 2002 01:52:46 -0000	1.138.2.1
@@ -1,5 +1,16 @@
 -=[ Gaim ]=-  The Pimpin' Penguin IM Client That's Good For The Soul!
 
+0.59.1 (08/25/3002)
+	Sean: We've decided to create a stable branch for GTK+ 1.2 bugfixes
+	and start developing CVS HEAD in GTK+ 2 only.  GTK+ 1.2 releases
+	will be in the 0.59.x branch and GTK+ 2 releases will follow our
+	normal versioning scheme.
+
+	Things slow down a lot during the summer--but the summer is ending
+	soon so expect development to really pick up soon.  It will take a
+	little while to get 0.60 working well with GTK 2, but hopefully 
+	we'll go back to biweekly releases after that.
+
 0.59 (06/24/2002):
 	Rob: I guess Sean is busy at home or something and Jim is asleep.
 	I'm very tired but it's time for a release.  Enjoy.  :)

[Gaim-commits] CVS: gaim/po es.po,1.22,1.22.2.1 nl.po,1.4,1.4.2.1

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv11495

Modified Files:
      Tag: gtk1-stable
	es.po nl.po 
Log Message:
translation fixes for 0.59.1


Index: es.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/es.po,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- es.po	19 May 2002 03:11:09 -0000	1.22
+++ es.po	26 Aug 2002 01:49:54 -0000	1.22.2.1
@@ -641,14 +641,6 @@
 msgid "Friendly name too long."
 msgstr "Nombre demasiado largo"
 
-#: src/protocols/msn/msn.c:1111
-msgid "Buddies"
-msgstr "Amigos"
-
-#: src/protocols/msn/msn.c:1739 src/protocols/msn/msn.c:1766
-msgid "Unable to connect"
-msgstr "No se puede conectar"
-
 #: src/protocols/msn/msn.c:1746
 msgid "Unable to write to server"
 msgstr "No se puede escribir al servidor"
@@ -669,18 +661,10 @@
 msgid "Unable to send password"
 msgstr "No se puede enviar la contraseña"
 
-#: src/protocols/msn/msn.c:1760
-msgid "Connecting"
-msgstr "Conectando"
-
 #: src/protocols/msn/msn.c:1569
 msgid "Requesting to send password"
 msgstr "Enviando contraseña"
 
-#: src/protocols/msn/msn.c:2046
-msgid "Status: %s"
-msgstr "Estado: %s"
- 
 #: src/protocols/msn/msn.c:2123 src/protocols/msn/msn.c:2143
 msgid "Reset All Friendly Names"
 msgstr "Actualizar todos los nombres"
@@ -3317,9 +3301,6 @@
 msgid "More Info"
 msgstr "Más Información"
 
-#~ msgid "Available"
-#~ msgstr "Disponible"
-
 #~ msgid "Available for friends only"
 #~ msgstr "Disponible sólo para los amigos"
 
@@ -3603,9 +3584,6 @@
 
 #~ msgid "Remove buddy from permit/deny"
 #~ msgstr "Quitar amigo de autorizar/negar"
-
-#~ msgid "Idle"
-#~ msgstr "Inactivo"
 
 #~ msgid "Raise chat windows when people speak"
 #~ msgstr "Alzar ventana de conversación cuando alguien hable"

Index: nl.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/nl.po,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- nl.po	17 Mar 2002 22:25:12 -0000	1.4
+++ nl.po	26 Aug 2002 01:49:54 -0000	1.4.2.1
@@ -880,10 +880,6 @@
 msgid "Away."
 msgstr "Afwezig"
 
-#: src/applet.c:291 src/buddy.c:478 src/buddy.c:2278 src/buddy.c:2414
-msgid "Away"
-msgstr "Afwezig"
-
 #: src/applet.c:294 src/away.c:387
 msgid "New Away Message"
 msgstr "Nieuw Afwezigheidsbericht"
@@ -1591,10 +1587,6 @@
 msgid "Maiden Name"
 msgstr "Meisjesnaam"
 
-#: src/dialogs.c:1384 src/dialogs.c:2065
-msgid "City"
-msgstr "Stad"
-
 #: src/dialogs.c:1395 src/dialogs.c:2076
 msgid "State"
 msgstr "Staat"
@@ -1615,10 +1607,6 @@
 msgid "Fill out all fields completely"
 msgstr "Vul alle velden voledig in"
 
-#: src/dialogs.c:1490
-msgid "Gaim - Password Change"
-msgstr "Gaim - Wachtwoord veranderen"
-
 #: src/dialogs.c:1501
 msgid "Change Password"
 msgstr "Verander Wachtwoord"
@@ -1711,10 +1699,6 @@
 msgid "You cannot create an away message with a blank title"
 msgstr "U moet iets invullen"
 
-#: src/dialogs.c:2805 src/dialogs.c:2811
-msgid "Gaim - Error"
-msgstr "Gaim - Fout"
-
 #: src/dialogs.c:2811
 msgid "You cannot create an empty away message"
 msgstr "U kunt geen leeg bericht maken"
@@ -1760,10 +1744,6 @@
 msgid "Unable to remove file %s - %s"
 msgstr "Kan %s - %s niet verwijderen."
 
-#: src/dialogs.c:3338
-msgid "Error"
-msgstr "Fout"
-
 #: src/dialogs.c:3365
 msgid "Really clear log?"
 msgstr "Logboek opschonen?"
@@ -1849,10 +1829,6 @@
 #: src/multi.c:497
 msgid "Screenname:"
 msgstr "Gebruikersnaam:"
-
-#: src/multi.c:506
-msgid "Password:"
-msgstr "Wachtwoord:"
 
 #: src/multi.c:517
 msgid "Protocol:"

[Gaim-commits] CVS: gaim Makefile.am,1.31,1.31.2.1

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv8837

Modified Files:
      Tag: gtk1-stable
	Makefile.am 
Log Message:
Oh god no, this isn't really happening!!!


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -d -r1.31 -r1.31.2.1
--- Makefile.am	9 Dec 2001 13:18:58 -0000	1.31
+++ Makefile.am	26 Aug 2002 01:38:18 -0000	1.31.2.1
@@ -1,6 +1,6 @@
 
 EXTRA_DIST = gaim.spec.in gaim_applet.gnorba gaim.desktop gaim_applet.desktop \
-	HACKING gaim2blt.pl licq2gaim.pl
+	HACKING gaim2blt.pl licq2gaim.pl setup-gettext
 
 if DISTRIB
 

[Gaim-commits] CVS: gaim ChangeLog,1.509.2.7,1.509.2.8

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv5305

Modified Files:
      Tag: gtk1-stable
	ChangeLog 
Log Message:
:)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.509.2.7
retrieving revision 1.509.2.8
diff -u -d -r1.509.2.7 -r1.509.2.8
--- ChangeLog	26 Aug 2002 01:05:21 -0000	1.509.2.7
+++ ChangeLog	26 Aug 2002 01:21:01 -0000	1.509.2.8
@@ -1,6 +1,6 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
-version 0.59.1
+version 0.59.1 (08/25/2002)
 	* Created a gtk1-stable branch for GTK+ 1.2 bugfix releases.
 	  Development will continue in our main branch in GTK+ 2 only.
 	* Fixed a security bug in the manual browser setting (Thanks

[Gaim-commits] CVS: gaim ChangeLog,1.509.2.6,1.509.2.7 README,1.28,1.28.2.1 configure.ac,1.70.2.2,1.70.2.3 configure.in,1.118.2.2,1.118.2.3 gaim.desktop,1.4,1.4.2.1 gaim_applet.desktop,1.3,1.3.2.1

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv2819

Modified Files:
      Tag: gtk1-stable
	ChangeLog README configure.ac configure.in gaim.desktop 
	gaim_applet.desktop 
Log Message:
:)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.509.2.6
retrieving revision 1.509.2.7
diff -u -d -r1.509.2.6 -r1.509.2.7
--- ChangeLog	25 Aug 2002 23:57:08 -0000	1.509.2.6
+++ ChangeLog	26 Aug 2002 01:05:21 -0000	1.509.2.7
@@ -1,6 +1,8 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
 version 0.59.1
+	* Created a gtk1-stable branch for GTK+ 1.2 bugfix releases.
+	  Development will continue in our main branch in GTK+ 2 only.
 	* Fixed a security bug in the manual browser setting (Thanks
 	  Robert McQueen)
 	* Now using libiconv for better i18n support (Thanks Junichi
@@ -9,6 +11,7 @@
 	  Colascione)
 	* Fix for HTTP proxies (thanks, Ethan Blanton)	
 	* Read proxy environment variables. (thanks, Christian Hammond)
+	* Use the pretty gaim.png for our menu entry.
 	* Added support for gettext 0.11.x.
 
 version 0.59 (06/24/2002):

Index: README
===================================================================
RCS file: /cvsroot/gaim/gaim/README,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -d -r1.28 -r1.28.2.1
--- README	30 Mar 2002 10:22:29 -0000	1.28
+++ README	26 Aug 2002 01:05:21 -0000	1.28.2.1
@@ -10,6 +10,12 @@
 MSN, IRC, and Jabber. Gaim is NOT endorsed by, nor affiliated with,
 AOL nor any other company in ANY way.
 
+0.59.x
+======
+This version of Gaim is a stable branch.  These releases are bugfix 
+releases for GTK+ 1.2.  Development will continue on our main branch
+in GTK+ 2 only.
+
 
 BUILD
 =====

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.70.2.2
retrieving revision 1.70.2.3
diff -u -d -r1.70.2.2 -r1.70.2.3
--- configure.ac	25 Aug 2002 23:57:08 -0000	1.70.2.2
+++ configure.ac	26 Aug 2002 01:05:21 -0000	1.70.2.3
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.59.1cvs])
+AM_INIT_AUTOMAKE([gaim], [0.59.1])
 
 AC_PREREQ([2.50])
 

Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.118.2.2
retrieving revision 1.118.2.3
diff -u -d -r1.118.2.2 -r1.118.2.3
--- configure.in	25 Aug 2002 23:57:08 -0000	1.118.2.2
+++ configure.in	26 Aug 2002 01:05:21 -0000	1.118.2.3
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.59.1cvs])
+AM_INIT_AUTOMAKE([gaim], [0.59.1])
 
 
 

Index: gaim.desktop
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.desktop,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- gaim.desktop	14 May 2002 02:29:39 -0000	1.4
+++ gaim.desktop	26 Aug 2002 01:05:21 -0000	1.4.2.1
@@ -2,7 +2,7 @@
 Name=Gaim
 Comment=Multi-protocol Instant Messaging Client 
 Exec=gaim 
-Icon=gaim.xpm
+Icon=gaim.png
 Info=Gaim
 Terminal=0
 Type=Application

Index: gaim_applet.desktop
===================================================================
RCS file: /cvsroot/gaim/gaim/Attic/gaim_applet.desktop,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- gaim_applet.desktop	2 Jun 2000 21:48:50 -0000	1.3
+++ gaim_applet.desktop	26 Aug 2002 01:05:21 -0000	1.3.2.1
@@ -2,6 +2,6 @@
 Name=Gaim
 Comment=Client for AOL IM
 Exec=gaim_applet --activate-goad-server=gaim_applet
-Icon=gaim.xpm
+Icon=gaim.png
 Terminal=0
 Type=Application

[Gaim-commits] CVS: gaim/pixmaps gaim.png,NONE,1.1.2.1 Makefile.am,1.70,1.70.2.1

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/pixmaps
In directory usw-pr-cvs1:/tmp/cvs-serv2819/pixmaps

Modified Files:
      Tag: gtk1-stable
	Makefile.am 
Added Files:
      Tag: gtk1-stable
	gaim.png 
Log Message:
:)


--- NEW FILE: gaim.png ---
‰PNG


Ä?í¡øÿƒòIJ
T{ˆ¯CýꡟPöo¨'þë€
’(ä­VLWqóværbdág``æzŽ
èøŒÿ€ŽgáføÇüžéï_nÞ¿lE!ÿlDؙ„JæÿãêeâPÇ⏠°òa¡JÐ
b߁u#ë`þý?ÿ~&Ÿ¿?~ÖÂ?~¿ÿÅðóÉ_†Ÿ ”töo`JÛq‡áPñ¤²ŸØ²
ŠüáãûÅ¡&ýK‘‰™›—áßçk<}^ºîÏ9h³ú&‚ÆÂ(ý	ÚgøƒË
Ít ÐÑ J™™(Îd31ˆ
–f`üq<ÐÏWïþ{ï:ýÿ±ù'ÿßýñÿeÉ}‘.ò\² .+¨Ï
ÄB@,í±ñAû¬°@
@”xàó•ë¿iK}Ôýÿû0~1üù:
µuþ3ü%•Oäòï7¬ý	yS@­SA6°Ã9 íŸoHãCÈE%#¶V(
¨å

‰XtéøóEÁm~P)$†ä	f´ÌŒ5
rðºW?ä¾a:ü=49ýC½fDk™‚
@
š
Y¡Ý½·Ð…ý¿ }…/hÍbf¨~X§…jTl
ë @
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.70
retrieving revision 1.70.2.1
diff -u -d -r1.70 -r1.70.2.1
--- Makefile.am	3 Jun 2002 05:54:26 -0000	1.70
+++ Makefile.am	26 Aug 2002 01:05:21 -0000	1.70.2.1
@@ -42,6 +42,7 @@
 		fontface.xpm			\
 		fontface2.xpm			\
 		free_icon.xpm			\
+		gaim.png			\
 		gaim.xpm			\
 		gg_suncloud.xpm			\
 		gg_sunred.xpm			\
@@ -127,7 +128,7 @@
 gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png
 
 distpixmapdir = $(datadir)/pixmaps
-distpixmap_DATA = gaim.xpm
+distpixmap_DATA = gaim.png
 	
 else
 
@@ -139,12 +140,12 @@
 gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
 
 gaimpixmapdir = $(gnomedata)/pixmaps
-gaimpixmap_DATA = gaim.xpm
+gaimpixmap_DATA = gaim.png
 
 else
 
 pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = gaim.xpm
+pixmap_DATA = gaim.png
 	
 endif
 

[Gaim-commits] CVS: gaim/doc gaim.1,1.54,1.54.2.1

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/doc
In directory usw-pr-cvs1:/tmp/cvs-serv2819/doc

Modified Files:
      Tag: gtk1-stable
	gaim.1 
Log Message:
:)


Index: gaim.1
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/gaim.1,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -u -d -r1.54 -r1.54.2.1
--- gaim.1	31 May 2002 06:21:06 -0000	1.54
+++ gaim.1	26 Aug 2002 01:05:21 -0000	1.54.2.1
@@ -21,7 +21,7 @@
 .\" USA.
 .TH gaim 1
 .SH NAME
-Gaim v0.59 \- Instant Messaging client
+Gaim v0.59.1 \- Instant Messaging client
 .SH SYNOPSIS
 .TP 5
 \fBgaim \fI[options]\fR

[Gaim-commits] CVS: gaim/doc FAQ,1.21,1.21.2.1

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/doc
In directory usw-pr-cvs1:/tmp/cvs-serv27039

Modified Files:
      Tag: gtk1-stable
	FAQ 
Log Message:
Synced the FAQ.


Index: FAQ
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/FAQ,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -d -r1.21 -r1.21.2.1
--- FAQ	20 Jun 2002 04:00:52 -0000	1.21
+++ FAQ	26 Aug 2002 00:07:53 -0000	1.21.2.1
@@ -14,7 +14,7 @@
 	2.2  Why is gaim crashing when somebody sends me an IM?
 
 3  Features
-	3.1  How do I use MSN, Yahoo, IRC, Gadu-Gadu, Napster, or Zephyr?
+	3.1  How do I use MSN, Yahoo, Jabber, IRC, Gadu-Gadu, Napster, or Zephyr?
 	3.2  Can Gaim send files?
 	3.3  When will file transfer be supported? Is it being worked on?
 	3.4  How come there's no Export Buddy List?
@@ -39,6 +39,11 @@
 	7.2  How do I change my Jabber resource to be other than the
 	     default of "/GAIM"?
 	7.3  How do I register a new Jabber account?
+	7.4  How do I use invisibility?
+	7.5  I've a buddy that I keep removing from my buddy list, but
+	     he keeps coming back!  How can I stop this?
+	7.6  What does "Remove From Roster" do?
+	7.7  What does "Cancel Presence Notification" do?
 
 8  Scripts and Plugins
 	8.1  Where can I find documentation on writing plugins and
@@ -47,9 +52,10 @@
 
 9  Development
 	9.1  Where should I report bugs?
-	9.2  Did you guys reverse engineer it?
-	9.3  Will Gaim be ported to Windows 95/98/Me/2000/XP?
-	9.4  Will there be a QT dock app?
+	9.2  Where should I submit patches?
+	9.3  Did you guys reverse engineer it?
+	9.4  Will Gaim be ported to Windows 95/98/Me/2000/XP?
+	9.5  Will there be a QT dock app?
 
 10  Misc. Questions
 	10.1  Does AOL's attempts at blocking Trillian affect Gaim?
@@ -103,11 +109,18 @@
 
 1.4  I can't compile Gaim CVS.
 
-  Make sure you have gettext <= 0.10.40, autoconf 2.11 or 2.53, and
-  automake 1.4px. If you are still having problems, make sure that your
-  gettext package includes the program gettextize. If it does not, look for
+  Make sure you have gettext <= 0.10.40 or gettext >= 0.11.3, autoconf 2.11
+  or 2.53, and automake 1.4px. If you are still having problems, make sure
+  that your gettext package includes the program gettextize (for gettext <=
+  0.10.40) or autopoint (for gettext >= 0.11.3). If it does not, look for
   another package.
 
+  We don't support gettext 0.11.0 through 0.11.2. It may work for you, but
+  we make no promises.
+
+  If you are using autoconf 2.50+, do not use a version of gettext lower
+  than 0.10.39. You will get errors in the po/ directory. 
+
   If you have Slackware, you need to get non-slack packages for autoconf,
   automake, gettext, and libtool. You also have to copy the contents of
   /usr/local/share/aclocal to /usr/share/aclocal. This is due to bugs in
@@ -156,7 +169,7 @@
 | 3  Features
 +--------------------------------------------------------------------------
 
-3.1  How do I use MSN, Yahoo, IRC, Gadu-Gadu, Napster, or Zephyr?
+3.1  How do I use MSN, Yahoo, Jabber, IRC, Gadu-Gadu, Napster, or Zephyr?
 
   First load the plugin. Protocol plugins come with Gaim, so just go to the
   Plugins dialog (Tools->Plugins, or the Plugins button on the start
@@ -322,6 +335,65 @@
         you're hosed.
 
 
+7.4  How do I use invisibility?
+
+  Jabber invisibility support is available in Gaim version 0.60 and later.
+
+  There are two ways to use Jabber invisibility: on a per-buddy and on a
+  per-server basis.
+
+  To use per-buddy invisibility: right-click on the buddy on the Online
+  buddy list and select "Temporarily Hide From."  You will appear to that
+  buddy to be off-line.  To make yourself seen by that buddy again:
+  right-click on the buddy and select "Un-hide From."  Note that the menu
+  changes based on whether you're currently invisible to that buddy or
+  not.
+
+    The "Temporarily" part is a dead give-away.  Your invisibility to
+    that buddy will last only until the next time you log on or until
+    you set server invisibility (discussed next) on and off.
+
+  To use per-server invisibility: click "Tools -> Away," select the Jabber
+  server login for the server upon which you wish to become invisible (if
+  necessary) and select "Invisible."  To become visible again: select
+  anything else from that same menu (such as "Online"), or set your away
+  status or log off the server and back on again.
+
+  You can set yourself invisible per-server and subsequently make yourself
+  visible to selected buddies only.
+
+  Gaim currently does not retain invisibility settings between logins,
+  just as it doesn't currently retain "away" status.
+
+
+7.5  I've a buddy that I keep removing from my buddy list but the entry
+     keeps coming back every time I log in again!  How can I stop this?
+
+  As of Gaim version 0.59 and later: Select the Edit Buddies tab, right-
+  click on the offending entry, and select "Remove From Roster."
+
+
+7.6  Can I remove a buddy from my Jabber roster entirely?
+
+  As of Gaim version 0.59 and later: yes.  In the Edit Buddies tab, right-
+  click on a buddy and Select "Remove From Roster."
+
+  The buddy will disappear from your buddy list and also will no longer
+  receive presence notifications from you.
+
+
+7.7  What does "Cancel Presence Notification" do?
+
+  This selection, available in Gaim version 0.60 and later, and found by
+  right-clicking on a buddy entry in the Edit Buddies tab, prevents that
+  Jabber I.D. from receiving future presence notifications when you log on
+  to the server.
+
+  After you do this, that buddy will have to re-request a subscription to
+  your presence (and you will have to approve it) for them to again see you
+  on-line.
+
+
 +--------------------------------------------------------------------------
 | 8  Scripts and Plugins
 +--------------------------------------------------------------------------
@@ -383,21 +455,26 @@
   http://gaim.sf.net/bug.php
 
 
-9.2  Did you guys reverse engineer it?
+9.2  Where should I submit patches?
+
+  http://gaim.sf.net/patches.php
+
+
+9.3  Did you guys reverse engineer it?
 
   TOC, Jabber, MSN, Napster, and IRC are published protocols, so we didn't
   have to reverse engineer those. Oscar, ICQ, and Yahoo are not published,
   and were reverse engineered by other people.
 
 
-9.3  Will Gaim be ported to Windows 95/98/Me/2000/XP?
+9.4  Will Gaim be ported to Windows 95/98/Me/2000/XP?
 
   When GTK+ 2.0 comes out and compiles well against Cygwin, and Gaim has
   been ported to it, Gaim should work. It will not happen before GTK+ 2.0
   is ported to Windows, though.
 
 
-9.4  Will there be a QT dock app?
+9.5  Will there be a QT dock app?
 
   Right now Gaim, is done entirely in C and GTK+, so a QT dock app is not
   in planned. You can either write a patch to do this yourself, or wait

[Gaim-commits] CVS: gaim/doc FAQ,1.25,1.26

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/doc
In directory usw-pr-cvs1:/tmp/cvs-serv26986

Modified Files:
	FAQ 
Log Message:
Updated the FAQ for gettext 0.11.x info.


Index: FAQ
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/FAQ,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- FAQ	19 Jul 2002 04:06:20 -0000	1.25
+++ FAQ	26 Aug 2002 00:07:19 -0000	1.26
@@ -109,10 +109,17 @@
 
 1.4  I can't compile Gaim CVS.
 
-  Make sure you have gettext <= 0.10.40, autoconf 2.11 or 2.53, and
-  automake 1.4px. If you are still having problems, make sure that your
-  gettext package includes the program gettextize. If it does not, look for
+  Make sure you have gettext <= 0.10.40 or gettext >= 0.11.3, autoconf 2.11
+  or 2.53, and automake 1.4px. If you are still having problems, make sure
+  that your gettext package includes the program gettextize (for gettext <=
+  0.10.40) or autopoint (for gettext >= 0.11.3). If it does not, look for
   another package.
+
+  We don't support gettext 0.11.0 through 0.11.2. It may work for you, but
+  we make no promises.
+
+  If you are using autoconf 2.50+, do not use a version of gettext lower
+  than 0.10.39. You will get errors in the po/ directory. 
 
   If you have Slackware, you need to get non-slack packages for autoconf,
   automake, gettext, and libtool. You also have to copy the contents of

[Gaim-commits] CVS: gaim acinclude.m4,NONE,1.2.2.1 setup-gettext,NONE,1.5.2.1 ChangeLog,1.509.2.5,1.509.2.6 autogen.sh,1.14,1.14.2.1 configure.ac,1.70.2.1,1.70.2.2 configure.in,1.118.2.1,1.118.2.2

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv25595

Modified Files:
      Tag: gtk1-stable
	ChangeLog autogen.sh configure.ac configure.in 
Added Files:
      Tag: gtk1-stable
	acinclude.m4 setup-gettext 
Log Message:
Added support for gettext 0.11.x.


--- NEW FILE: acinclude.m4 ---
AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])

--- NEW FILE: setup-gettext ---
#!/bin/sh
#
# setup-gettext - Provides compatibility with versions of gettext
#                 from the 0.10.x series and 0.11.x.
#
# Copyright (C) 2002 Christian Hammond.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA  02111-1307  USA
#

VERSION=0.1.3

VERBOSE=0

parse_gettext_version() {
	GETTEXT_VERSION=`$GETTEXT_TOOL --version | sed -n 's/^.*\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\).*$/\1.\2.\3/p'`
	GETTEXT_MAJOR_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^\([0-9]\+\).*/\1/p'`
	GETTEXT_MINOR_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^[0-9]\+\.\([0-9]\+\).*/\1/p'`
	GETTEXT_MICRO_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^[0-9]\+\.[0-9]\+\.\([0-9]\+\).*/\1/p'`
}

find_gettext() {
	GETTEXT_TOOL=autopoint
	
	(autopoint --version) < /dev/null > /dev/null 2>&1 || {
		GETTEXT_TOOL=gettextize

		(gettextize --version) < /dev/null > /dev/null 2>&1 || {
			GETTEXT_TOOL=
		}
	}
}

install() {
	[ -f configure.in ] && {
		cp configure.in .tmp-configure.in
		sed -e 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\
AM_GNU_GETTEXT_VERSION(0.10.40)/' < .tmp-configure.in > configure.in
		rm .tmp-configure.in
	}

	[ -f configure.ac ] && {
		cp configure.ac .tmp-configure.ac
		sed -e 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\
AM_GNU_GETTEXT_VERSION(0.10.40)/' < .tmp-configure.ac > configure.ac
		rm .tmp-configure.ac
	}

	[ -f autogen.sh ] && {
		cp autogen.sh .tmp-autogen.sh
		sed -e 's/\(gettextize\|autopoint\) --version/.\/setup-gettext --gettext-tool/1' -e 's/^\(echo.*|[\t ]*\)\?\(gettextize\|autopoint\) -.*$/.\/setup-gettext/1' < .tmp-autogen.sh > autogen.sh
		rm .tmp-autogen.sh
	}

	echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' >> acinclude.m4
}

backup_m4() {
	[ -d m4 ] && mv m4 m4~
}

restore_m4() {
	[ -d m4~ ] && {
		rm -rf m4
		mv m4~ m4
	}
}

restore_files() {
	[ -f configure.in~ ] && mv -f configure.in~ configure.in
	[ -f configure.ac~ ] && mv -f configure.ac~ configure.ac
	[ -f Makefile.am~ ]  && mv -f Makefile.am~  Makefile.am
}

abort() {
	restore_files
	restore_m4

	exit 1
}

# Main code

find_gettext

# See if a version of gettext and its tools are installed.
if [ x$GETTEXT_TOOL = x ]; then
	echo
	echo "You do not have a version of gettext installed."
	echo "Please download one from your local package repository or"
	echo "from ftp://ftp.gnu.org/pub/gnu/gettext/"
	echo
	exit 1
fi

parse_gettext_version

NUMVAR=$#

if [ $NUMVAR -gt 0 ]; then
	if [ $NUMVAR -gt 1 ]; then
		echo "Only one option at a time!"
		exit 1

	elif [ $1 = "--gettext-tool" ]; then
		echo $GETTEXT_TOOL
		exit 0

	elif [ $1 = "--help" ]; then
		echo "setup-gettext v$VERSION"
		echo "Usage:"
		echo "   --gettext-tool           Returns gettextize or autopoint, depending"
		echo "                            on the version of gettext installed."
		echo "   --gettext-version        Returns the version of gettext installed."
		echo "   --gettext-major-version  Returns the major version of gettext installed."
		echo "   --gettext-minor-version  Returns the minor version of gettext installed."
		echo "   --gettext-micro-version  Returns the micro version of gettext installed."
		echo "   --help                   Displays this help screen."
		echo
		exit 0

	elif [ $1 = "--version" ]; then
		echo $VERSION
		exit 0

	elif [ $1 = "--gettext-version" ]; then
		echo $GETTEXT_VERSION
		exit 0

	elif [ $1 = "--gettext-major-version" ]; then
		echo $GETTEXT_MAJOR_VERSION
		exit 0

	elif [ $1 = "--gettext-minor-version" ]; then
		echo $GETTEXT_MINOR_VERSION
		exit 0

	elif [ $1 = "--gettext-micro-version" ]; then
		echo $GETTEXT_MICRO_VERSION
		exit 0
	
	elif [ $1 = "--install" ]; then
		install
		echo "setup-gettext installed."
		exit 0

	elif [ $1 = "--happy-url" ]; then
		echo http://gaim.sf.net/forkgettext.jpg
		exit 0
	
	elif [ $1 = "--verbose" ]; then
		VERBOSE=1

	else
		echo "Invalid option '$1'"
		exit 1
	fi
fi

# Okay, run the main stuff
if [ "$GETTEXT_TOOL" = "autopoint" ]; then
	backup_m4
	[ $VERBOSE -eq 1 ] && echo "  autopoint --force"
	echo n | autopoint --force || abort
	restore_m4
else
	if [ $GETTEXT_MINOR_VERSION -eq 11 ]; then
		backup_m4

		# Gettext is pure evil. It DEMANDS that we press Return no matter
		# what. This gets rid of their happy "feature" of doom.
		[ $VERBOSE -eq 1 ] && \
			echo "  gettextize --copy --force --intl --no-changelog"

		sed 's:read .*< /dev/tty::' `which gettextize` > .temp-gettextize
		chmod +x .temp-gettextize
		echo n | ./.temp-gettextize --copy --force --intl --no-changelog || abort
		rm .temp-gettextize

		restore_files
		restore_m4

		[ -f po/Makevars.template ] && mv po/Makevars.template po/Makevars
	else
		[ $VERBOSE -eq 1 ] && echo "  gettextize --copy --force"
		echo n | gettextize --copy --force || exit;
	fi
fi


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.509.2.5
retrieving revision 1.509.2.6
diff -u -d -r1.509.2.5 -r1.509.2.6
--- ChangeLog	25 Aug 2002 23:48:41 -0000	1.509.2.5
+++ ChangeLog	25 Aug 2002 23:57:08 -0000	1.509.2.6
@@ -9,6 +9,7 @@
 	  Colascione)
 	* Fix for HTTP proxies (thanks, Ethan Blanton)	
 	* Read proxy environment variables. (thanks, Christian Hammond)
+	* Added support for gettext 0.11.x.
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

Index: autogen.sh
===================================================================
RCS file: /cvsroot/gaim/gaim/autogen.sh,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- autogen.sh	26 Apr 2002 00:59:30 -0000	1.14
+++ autogen.sh	25 Aug 2002 23:57:08 -0000	1.14.2.1
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-(gettextize --version) < /dev/null > /dev/null 2>&1 || {
+(./setup-gettext --gettext-tool) < /dev/null > /dev/null 2>&1 || {
 	echo;
 	echo "You must have gettext installed to compile Gaim";
 	echo;
@@ -42,7 +42,7 @@
 echo;
 
 echo "Running gettextize, please ignore non-fatal messages...."
-echo n | gettextize --copy --force || exit;
+./setup-gettext
 echo "Running libtoolize, please ignore non-fatal messages...."
 echo n | libtoolize --copy --force || exit;
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.70.2.1
retrieving revision 1.70.2.2
diff -u -d -r1.70.2.1 -r1.70.2.2
--- configure.ac	22 Aug 2002 03:16:03 -0000	1.70.2.1
+++ configure.ac	25 Aug 2002 23:57:08 -0000	1.70.2.2
@@ -17,6 +17,7 @@
 
 ALL_LINGUAS="bg cs da de es fi fr hu it ja ko nl pl ru sk sv zh_CN zh_TW"
 AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION(0.10.40)
 
 AC_CYGWIN
 

Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.118.2.1
retrieving revision 1.118.2.2
diff -u -d -r1.118.2.1 -r1.118.2.2
--- configure.in	22 Aug 2002 03:16:03 -0000	1.118.2.1
+++ configure.in	25 Aug 2002 23:57:08 -0000	1.118.2.2
@@ -17,6 +17,7 @@
 
 ALL_LINGUAS="bg cs da de es fi fr hu it ja ko nl pl ru sk sv zh_CN zh_TW"
 AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION(0.10.40)
 
 AC_CYGWIN
 

[Gaim-commits] CVS: gaim TODO,1.129,1.129.2.1

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv25380

Modified Files:
      Tag: gtk1-stable
	TODO 
Log Message:
heh.


Index: TODO
===================================================================
RCS file: /cvsroot/gaim/gaim/TODO,v
retrieving revision 1.129
retrieving revision 1.129.2.1
diff -u -d -r1.129 -r1.129.2.1
--- TODO	7 Mar 2002 20:57:16 -0000	1.129
+++ TODO	25 Aug 2002 23:55:13 -0000	1.129.2.1
@@ -1,120 +1,2 @@
-THE CORE:
-	GPG Encryption of messages
-	Have plugin_event use varargs instead of void*
-	Separate core functions from UI stuff.
-		about.c, applet.[ch], away.c, browser.c, buddy.c, conversation.c,
-		convo.h, dialogs.c, gtk*, plugins.c, prefs.c, prpl.c, sound.c,
-		ticker.c, ui.h
-			little to no work (mostly GTK)
-
-		core.[ch], html.c, list.c, module.c, multi.h, proxy.[ch], perl.c,
-		prpl.h, util.c
-			little to no work (mostly CORE)
-
-		buddy_chat.c, gaim.h, idle.c, multi.c, server.c
-			standard splitting (for idleness, core needs to be in
-			charge of gaim-use idleness)
-
-		aim.c - need to redo main() completely
-			- current main should be moved mostly to core
-			- GTK main should connect to core
-		gaimrc.c - Need to figure out how to save UI preferences
-
-		Ideally at the end of this the prpls should only need to include
-		prpl.h and they'll get everything they need without anything
-		*cough*GTK*cough* that they don't.
-
-	Need to write the core side of the core-ui protocol
-	Non-blocking gethostbyname()
-	Cancelable proxy_connect
-
-----
-THE PROTOCOLS:
-
-TOC:
-	Other RVOUS Actions
-
-Oscar:
-	File Transfer
-	Other RVOUS Actions
-
-Yahoo:
-	Chat
-	File Transfer
-
-ICQ:
-	Chat
-	File Transfer
-	New User Registration
-
-MSN:
-	Need some way of indicating "invite" in IM window
-	File Transfer
-
-IRC:
-	/whois, /ban, /kickban, /list, /names
-	DCC
-	CTCP
-
-Jabber:
-	Jabber Transports (having them show up on the buddy list should be
-		fairly easy; having an appropriate right-click menu for
-		them should also be somewhat easy. Providing a UI for adding
-		transports should be rather difficult.)
-	Rework how subscriptions are handled
-	Browsing
-	Make the set info dialog prettier
-
-Napster:
-	File Transfer
-	New User Registration
-
-Zephyr:
-	God help us.
-
-Gadu-Gadu:
-	New User Registration
-	There's probably 100 other things but since I've hardly used the Windows
-		client before I'm not sure what any of them are
-
-----
-THE UIS:
-
-GTK:
-	Transparency for GtkIMHtml
-	Rewrite the HTML parser in GtkIMHtml
-	Moving GTK/GDK and related things out of the prpls
-		TOC: file transfer (move into the core)
-	Status labels in buddy list (mostly just for yahoo/msn)
-	Better way of showing away state - and possibly in main window
-	Away needs to be modified to include "show" and "status", i.e. you can have
-		an away state, and an away message. This is exactly what ICQ does -
-		you're "N/A" (show in Jabber) and your away message is "I'm gone."
-		(status in Jabber). Since it only applies to ICQ and Jabber (and
-		actually, currently only Jabber, since icqlib doesn't handle away
-		messages yet), there should be some way of indicating that it can
-		do both without breaking the others. My suggestion is to put "/" at
-		the end of the "state", and when that's there, have it be a menu with
-		all of the custom messages, e.g. in Jabber it'd return "Away/" as one
-		of the states, and you'd see "Away" with a menu of all the away
-		messages you have.
-
-	Need to write the ui side of the core-ui protocol
-
-	Syd is cool and gave all of these ideas:
-		Have multiple tickers in the same window, one for buddies
-			like it is now, one for who just came online/offline
-			(scrolled faster possibly because that doesn't
-			happen very often), etc.
-		Have tooltips on the passing buddies on the ticker
-		Have a stock ticker (a plugin could easily make use of
-			GtkTicker)
-
-	Buddy Icons need to be converted to use new gdk-pixbuf (GTK2)
-
-
 Then, of course, are all the Bugs that need to be fixed
 	http://sourceforge.net/tracker/?atid=100235&group_id=235&func=browse
-and the Feature Requests. SourceForge should really allow users
-to vote on feature requests and bugs.....
-	http://sourceforge.net/tracker/?atid=350235&group_id=235&func=browse

[Gaim-commits] CVS: gaim ChangeLog,1.509.2.4,1.509.2.5

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv24262

Modified Files:
      Tag: gtk1-stable
	ChangeLog 
Log Message:
More Credit.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.509.2.4
retrieving revision 1.509.2.5
diff -u -d -r1.509.2.4 -r1.509.2.5
--- ChangeLog	25 Aug 2002 23:31:48 -0000	1.509.2.4
+++ ChangeLog	25 Aug 2002 23:48:41 -0000	1.509.2.5
@@ -1,12 +1,14 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
 version 0.59.1
-	* Fixed a security bug in the manual browser setting
+	* Fixed a security bug in the manual browser setting (Thanks
+	  Robert McQueen)
 	* Now using libiconv for better i18n support (Thanks Junichi
 	  Uekawa)
 	* Will work with Perl 5.8 (thanks, Timothy Lee and Dan 
 	  Colascione)
 	* Fix for HTTP proxies (thanks, Ethan Blanton)	
+	* Read proxy environment variables. (thanks, Christian Hammond)
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

[Gaim-commits] CVS: gaim ChangeLog,1.522,1.523

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv24106

Modified Files:
	ChangeLog 
Log Message:
Credit.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -d -r1.522 -r1.523
--- ChangeLog	18 Aug 2002 19:32:04 -0000	1.522
+++ ChangeLog	25 Aug 2002 23:47:15 -0000	1.523
@@ -35,6 +35,7 @@
 	* Added support for gettext 0.11.x.
 	* Added support for automake 1.6.
 	* Buddy Ticker made a plugin.
+	* Read proxy environment variables.  (Thanks, Christian Hammond)
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

[Gaim-commits] CVS: gaim/src gaimrc.c,1.101,1.102

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv23951/src

Modified Files:
	gaimrc.c 
Log Message:
Chippenfixer


Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- gaimrc.c	25 Aug 2002 23:36:26 -0000	1.101
+++ gaimrc.c	25 Aug 2002 23:46:16 -0000	1.102
@@ -914,6 +914,96 @@
 	fprintf(f, "}\n");
 }
 
+static gboolean gaimrc_parse_proxy_uri(const char *proxy)
+{
+	char *c, *d;
+	char buffer[2048];
+
+	char host[128];
+	char user[128];
+	char pass[128];
+	int  port = 0;
+	int  len  = 0;
+
+	if ((c = strchr(proxy, ':')) == NULL)
+	{
+		/* No URI detected. */
+		return FALSE;
+	}
+
+	len = c - proxy;
+
+	if (!strncmp(proxy, "http", len))
+		proxytype = PROXY_HTTP;
+	else
+		return FALSE;
+
+	/* Get past "://" */
+	c += 3;
+
+	for (;;)
+	{
+		*buffer = '\0';
+		d = buffer;
+
+		while (*c != '\0' && *c != '@' && *c != ':' && *c != '/')
+			*d++ = *c++;
+
+		*d = '\0';
+
+		if (*c == ':')
+		{
+			/*
+			 * If there is a '@' in there somewhere, we are in the auth part.
+			 * If not, host.
+			 */
+			if (strchr(c, '@') != NULL)
+				strcmp(user, buffer);
+			else
+				strcmp(host, buffer);
+		}
+		else if (*c == '@')
+		{
+			if (user == NULL)
+				strcmp(user, buffer);
+			else
+				strcmp(pass, buffer);
+		}
+		else if (*c == '/' || *c == '\0')
+		{
+			if (host == NULL)
+				strcmp(host, buffer);
+			else
+				port = atoi(buffer);
+
+			/* Done. */
+			break;
+		}
+
+		c++;
+	}
+
+	/* NOTE: HTTP_PROXY takes precendence. */
+	if (host)
+		strcpy(proxyhost, host);
+	else
+		*proxyhost = '\0';
+
+	if (user)
+		strcpy(proxyuser, user);
+	else
+		*proxyuser = '\0';
+
+	if (pass)
+		strcpy(proxypass, pass);
+	else
+		*proxypass = '\0';
+	
+	proxyport = port;
+
+	return TRUE;
+}
+
 static void gaimrc_read_proxy(FILE *f)
 {
 	char buf[2048];
@@ -944,6 +1034,8 @@
 		}
 	}
 	if (!proxyhost[0]) {
+		gboolean getVars = TRUE;
+		
 		if (g_getenv("HTTP_PROXY"))
 			g_snprintf(proxyhost, sizeof(proxyhost), "%s", g_getenv("HTTP_PROXY"));
 		else if (g_getenv("http_proxy"))
@@ -951,29 +1043,36 @@
 		else if (g_getenv("HTTPPROXY"))
 			g_snprintf(proxyhost, sizeof(proxyhost), "%s", g_getenv("HTTPPROXY"));
 
-		if (g_getenv("HTTP_PROXY_PORT"))
-			proxyport = atoi(g_getenv("HTTP_PROXY_PORT"));
-		else if (g_getenv("http_proxy_port"))
-			proxyport = atoi(g_getenv("http_proxy_port"));
-		else if (g_getenv("HTTPPROXYPORT"))
-			proxyport = atoi(g_getenv("HTTPPROXYPORT"));
+		if (*proxyhost != '\0')
+			getVars = !gaimrc_parse_proxy_uri(proxyhost);
 
-		if (g_getenv("HTTP_PROXY_USER"))
-			g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("HTTP_PROXY_USER"));
-		else if (g_getenv("http_proxy_user"))
-			g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("http_proxy_user"));
-		else if (g_getenv("HTTPPROXYUSER"))
-			g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("HTTPPROXYUSER"));
+		if (getVars)
+		{
+			if (g_getenv("HTTP_PROXY_PORT"))
+				proxyport = atoi(g_getenv("HTTP_PROXY_PORT"));
+			else if (g_getenv("http_proxy_port"))
+				proxyport = atoi(g_getenv("http_proxy_port"));
+			else if (g_getenv("HTTPPROXYPORT"))
+				proxyport = atoi(g_getenv("HTTPPROXYPORT"));
 
-		if (g_getenv("HTTP_PROXY_PASS"))
-			g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("HTTP_PROXY_PASS"));
-		else if (g_getenv("http_proxy_pass"))
-			g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("http_proxy_pass"));
-		else if (g_getenv("HTTPPROXYPASS"))
-			g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("HTTPPROXYPASS"));
+			if (g_getenv("HTTP_PROXY_USER"))
+				g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("HTTP_PROXY_USER"));
+			else if (g_getenv("http_proxy_user"))
+				g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("http_proxy_user"));
+			else if (g_getenv("HTTPPROXYUSER"))
+				g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("HTTPPROXYUSER"));
 
-		if (proxyhost[0])
-			proxytype = PROXY_HTTP;
+			if (g_getenv("HTTP_PROXY_PASS"))
+				g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("HTTP_PROXY_PASS"));
+			else if (g_getenv("http_proxy_pass"))
+				g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("http_proxy_pass"));
+			else if (g_getenv("HTTPPROXYPASS"))
+				g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("HTTPPROXYPASS"));
+
+			
+			if (proxyhost[0])
+				proxytype = PROXY_HTTP;
+		}
 	}
 }
 

[Gaim-commits] CVS: gaim/src gaimrc.c,1.96,1.96.2.1

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv23851/src

Modified Files:
      Tag: gtk1-stable
	gaimrc.c 
Log Message:
Thanks, Chip!!


Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.96
retrieving revision 1.96.2.1
diff -u -d -r1.96 -r1.96.2.1
--- gaimrc.c	15 Jun 2002 15:43:03 -0000	1.96
+++ gaimrc.c	25 Aug 2002 23:45:19 -0000	1.96.2.1
@@ -910,6 +910,96 @@
 	fprintf(f, "}\n");
 }
 
+static gboolean gaimrc_parse_proxy_uri(const char *proxy)
+{
+	char *c, *d;
+	char buffer[2048];
+
+	char host[128];
+	char user[128];
+	char pass[128];
+	int  port = 0;
+	int  len  = 0;
+
+	if ((c = strchr(proxy, ':')) == NULL)
+	{
+		/* No URI detected. */
+		return FALSE;
+	}
+
+	len = c - proxy;
+
+	if (!strncmp(proxy, "http", len))
+		proxytype = PROXY_HTTP;
+	else
+		return FALSE;
+
+	/* Get past "://" */
+	c += 3;
+
+	for (;;)
+	{
+		*buffer = '\0';
+		d = buffer;
+
+		while (*c != '\0' && *c != '@' && *c != ':' && *c != '/')
+			*d++ = *c++;
+
+		*d = '\0';
+
+		if (*c == ':')
+		{
+			/*
+			 * If there is a '@' in there somewhere, we are in the auth part.
+			 * If not, host.
+			 */
+			if (strchr(c, '@') != NULL)
+				strcmp(user, buffer);
+			else
+				strcmp(host, buffer);
+		}
+		else if (*c == '@')
+		{
+			if (user == NULL)
+				strcmp(user, buffer);
+			else
+				strcmp(pass, buffer);
+		}
+		else if (*c == '/' || *c == '\0')
+		{
+			if (host == NULL)
+				strcmp(host, buffer);
+			else
+				port = atoi(buffer);
+
+			/* Done. */
+			break;
+		}
+
+		c++;
+	}
+
+	/* NOTE: HTTP_PROXY takes precendence. */
+	if (host)
+		strcpy(proxyhost, host);
+	else
+		*proxyhost = '\0';
+
+	if (user)
+		strcpy(proxyuser, user);
+	else
+		*proxyuser = '\0';
+
+	if (pass)
+		strcpy(proxypass, pass);
+	else
+		*proxypass = '\0';
+	
+	proxyport = port;
+
+	return TRUE;
+}
+
 static void gaimrc_read_proxy(FILE *f)
 {
 	char buf[2048];
@@ -940,6 +1030,8 @@
 		}
 	}
 	if (!proxyhost[0]) {
+		gboolean getVars = TRUE;
+		
 		if (g_getenv("HTTP_PROXY"))
 			g_snprintf(proxyhost, sizeof(proxyhost), "%s", g_getenv("HTTP_PROXY"));
 		else if (g_getenv("http_proxy"))
@@ -947,29 +1039,36 @@
 		else if (g_getenv("HTTPPROXY"))
 			g_snprintf(proxyhost, sizeof(proxyhost), "%s", g_getenv("HTTPPROXY"));
 
-		if (g_getenv("HTTP_PROXY_PORT"))
-			proxyport = atoi(g_getenv("HTTP_PROXY_PORT"));
-		else if (g_getenv("http_proxy_port"))
-			proxyport = atoi(g_getenv("http_proxy_port"));
-		else if (g_getenv("HTTPPROXYPORT"))
-			proxyport = atoi(g_getenv("HTTPPROXYPORT"));
+		if (*proxyhost != '\0')
+			getVars = !gaimrc_parse_proxy_uri(proxyhost);
 
-		if (g_getenv("HTTP_PROXY_USER"))
-			g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("HTTP_PROXY_USER"));
-		else if (g_getenv("http_proxy_user"))
-			g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("http_proxy_user"));
-		else if (g_getenv("HTTPPROXYUSER"))
-			g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("HTTPPROXYUSER"));
+		if (getVars)
+		{
+			if (g_getenv("HTTP_PROXY_PORT"))
+				proxyport = atoi(g_getenv("HTTP_PROXY_PORT"));
+			else if (g_getenv("http_proxy_port"))
+				proxyport = atoi(g_getenv("http_proxy_port"));
+			else if (g_getenv("HTTPPROXYPORT"))
+				proxyport = atoi(g_getenv("HTTPPROXYPORT"));
 
-		if (g_getenv("HTTP_PROXY_PASS"))
-			g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("HTTP_PROXY_PASS"));
-		else if (g_getenv("http_proxy_pass"))
-			g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("http_proxy_pass"));
-		else if (g_getenv("HTTPPROXYPASS"))
-			g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("HTTPPROXYPASS"));
+			if (g_getenv("HTTP_PROXY_USER"))
+				g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("HTTP_PROXY_USER"));
+			else if (g_getenv("http_proxy_user"))
+				g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("http_proxy_user"));
+			else if (g_getenv("HTTPPROXYUSER"))
+				g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("HTTPPROXYUSER"));
 
-		if (proxyhost[0])
-			proxytype = PROXY_HTTP;
+			if (g_getenv("HTTP_PROXY_PASS"))
+				g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("HTTP_PROXY_PASS"));
+			else if (g_getenv("http_proxy_pass"))
+				g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("http_proxy_pass"));
+			else if (g_getenv("HTTPPROXYPASS"))
+				g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("HTTPPROXYPASS"));
+
+			
+			if (proxyhost[0])
+				proxytype = PROXY_HTTP;
+		}
 	}
 }