Menu
▾
▴
pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(106) |
Oct
(334) |
Nov
(246) |
Dec
(145) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(42) |
Feb
(53) |
Mar
(232) |
Apr
(109) |
May
(137) |
Jun
(63) |
Jul
(26) |
Aug
(263) |
Sep
(193) |
Oct
(507) |
Nov
(440) |
Dec
(241) |
| 2003 |
Jan
(567) |
Feb
(195) |
Mar
(504) |
Apr
(481) |
May
(524) |
Jun
(522) |
Jul
(594) |
Aug
(502) |
Sep
(643) |
Oct
(508) |
Nov
(430) |
Dec
(377) |
| 2004 |
Jan
(361) |
Feb
(251) |
Mar
(219) |
Apr
(499) |
May
(461) |
Jun
(419) |
Jul
(314) |
Aug
(519) |
Sep
(416) |
Oct
(247) |
Nov
(305) |
Dec
(382) |
| 2005 |
Jan
(267) |
Feb
(282) |
Mar
(327) |
Apr
(338) |
May
(189) |
Jun
(400) |
Jul
(462) |
Aug
(530) |
Sep
(316) |
Oct
(523) |
Nov
(481) |
Dec
(650) |
| 2006 |
Jan
(536) |
Feb
(361) |
Mar
(287) |
Apr
(146) |
May
(101) |
Jun
(169) |
Jul
(221) |
Aug
(498) |
Sep
(300) |
Oct
(236) |
Nov
(209) |
Dec
(205) |
| 2007 |
Jan
(30) |
Feb
(23) |
Mar
(26) |
Apr
(15) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Eric W. <war...@us...> - 2001-10-10 20:03:19
|
Update of /cvsroot/gaim/gaim/src/protocols/gg
In directory usw-pr-cvs1:/tmp/cvs-serv6959/src/protocols/gg
Modified Files:
libgg.c libgg.h
Log Message:
BMiller's fixes so gg compiles on solaris
Index: libgg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/libgg.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libgg.c 2001/10/01 06:56:34 1.2
+++ libgg.c 2001/10/10 20:03:17 1.3
@@ -26,6 +26,8 @@
#include <arpa/inet.h>
#include <sys/ioctl.h>
#include <sys/wait.h>
+#include <sys/types.h>
+#include <fcntl.h>
#include <netdb.h>
#include <errno.h>
#include <string.h>
@@ -210,7 +212,13 @@
}
if (async) {
+#ifdef FIONBIO
if (ioctl(sock, FIONBIO, &one) == -1) {
+#else
+ int flags = fcntl (sock, F_GETFL);
+ if (flags < 0 ||
+ fcntl (sock, F_SETFL, flags | O_NONBLOCK) < 0) {
+#endif
gg_debug(GG_DEBUG_MISC, "-- ioctl() failed. errno = %d (%s)\n", errno, strerror(errno));
return -1;
}
Index: libgg.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/libgg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libgg.h 2001/10/01 06:56:34 1.2
+++ libgg.h 2001/10/10 20:03:17 1.3
@@ -26,6 +26,10 @@
#define GG_DEBUG 1
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
/*
* typ zmiennej okre¶laj±cej numerek danej osoby.
*/
|
|
From: Eric W. <war...@us...> - 2001-10-10 18:12:12
|
Update of /cvsroot/gaim/gaim/plugins In directory usw-pr-cvs1:/tmp/cvs-serv2776 Modified Files: Makefile.am Log Message: this probably won't fix anything but it doesn't break things that weren't broken, i think Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/Makefile.am,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- Makefile.am 2001/09/21 20:57:20 1.54 +++ Makefile.am 2001/10/10 18:12:09 1.55 @@ -2,7 +2,7 @@ SUFFIXES = .c .so .c.so: $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS) - $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) $(PLUGIN_LIBS) + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -avoid-version $(PLUGIN_LIBS) @rm -f tmp$@.lo tmp$@.o libtmp$@.la @cp .libs/libtmp$@.so $@ @rm -f .libs/libtmp$@.* |
|
From: Rob F. <rob...@us...> - 2001-10-10 04:16:44
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv26558
Modified Files:
buddy.c dialogs.c
Log Message:
Nothing to see here.
Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- buddy.c 2001/10/05 20:31:14 1.249
+++ buddy.c 2001/10/10 04:16:41 1.250
@@ -698,6 +698,8 @@
show_ee_dialog(2);
else if (!g_strcasecmp("ewarmenhoven", normalize (b->name)))
show_ee_dialog(3);
+ else if (!g_strcasecmp("markster97", normalize (b->name)))
+ show_ee_dialog(4);
} else {
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- dialogs.c 2001/10/02 05:52:55 1.256
+++ dialogs.c 2001/10/10 04:16:41 1.257
@@ -522,8 +522,10 @@
label = gtk_label_new("Pimpin\' Penguin Style! *Waddle Waddle*");
else if (ee == 2)
label = gtk_label_new("You should be me. I'm so cute!");
- else
+ else if (ee == 3)
label = gtk_label_new("Now that's what I like!");
+ else
+ label = gtk_label_new("Ahh, and excellent choice!");
gtk_widget_show(label);
gtk_widget_show(ok);
|
|
From: Eric W. <war...@us...> - 2001-10-10 00:26:30
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv28527
Modified Files:
prefs.c
Log Message:
hi.
Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- prefs.c 2001/09/28 12:15:54 1.183
+++ prefs.c 2001/10/10 00:26:26 1.184
@@ -1356,6 +1356,7 @@
static GtkWidget *sndent[NUM_SOUNDS];
static GtkWidget *sndcmd = NULL;
+static char *last_sound_dir = NULL;
void close_sounddialog(GtkWidget *w, GtkWidget *w2)
{
@@ -1396,6 +1397,10 @@
/* Close the window! It's getting cold in here! */
close_sounddialog(NULL, sounddialog);
+
+ if (last_sound_dir)
+ g_free(last_sound_dir);
+ last_sound_dir = g_dirname(sound_file[snd]);
}
static void reset_sound(GtkWidget *button, int snd)
@@ -1409,7 +1414,6 @@
static void sel_sound(GtkWidget *button, int snd)
{
-
char *buf = g_malloc(BUF_LEN);
if (!sounddialog) {
@@ -1417,7 +1421,7 @@
gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(sounddialog));
- g_snprintf(buf, BUF_LEN - 1, "%s/", getenv("HOME"));
+ g_snprintf(buf, BUF_LEN - 1, "%s/", last_sound_dir ? last_sound_dir : g_get_home_dir());
gtk_file_selection_set_filename(GTK_FILE_SELECTION(sounddialog), buf);
|
|
From: Eric W. <war...@us...> - 2001-10-09 23:44:28
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv15295 Modified Files: ChangeLog Log Message: hi Index: ChangeLog =================================================================== RCS file: /cvsroot/gaim/gaim/ChangeLog,v retrieving revision 1.310 retrieving revision 1.311 diff -u -d -r1.310 -r1.311 --- ChangeLog 2001/10/05 22:08:13 1.310 +++ ChangeLog 2001/10/09 23:44:24 1.311 @@ -1,6 +1,7 @@ GAIM: The Pimpin' Penguin IM Clone thats good for the soul! version 0.46: + * New applet icons (courtesy David Raeman) version 0.45 (10/04/2001): * New plugin event: event_chat_send_invite |
|
From: Eric W. <war...@us...> - 2001-10-09 23:43:32
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv15018 Modified Files: server.c Log Message: whoops. Index: server.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/server.c,v retrieving revision 1.197 retrieving revision 1.198 diff -u -d -r1.197 -r1.198 --- server.c 2001/10/09 23:40:18 1.197 +++ server.c 2001/10/09 23:43:29 1.198 @@ -34,6 +34,9 @@ #include "prpl.h" #include "multi.h" #include "gaim.h" +#ifdef USE_APPLET +#include "applet.h" +#endif #include "pixmaps/ok.xpm" #include "pixmaps/cancel.xpm" |
|
From: Eric W. <war...@us...> - 2001-10-09 23:40:21
|
Update of /cvsroot/gaim/gaim/pixmaps
In directory usw-pr-cvs1:/tmp/cvs-serv14337/pixmaps
Modified Files:
Makefile.am
Added Files:
away.png connect.png msgpend.png offline.png online.png
Log Message:
David Raeman's applet icons
--- NEW FILE: away.png ---
PNG
(ä
WLW±ñvæ²`dág``æz
èø ÿgáføÇüéï_nÞ¿¬E!ÿEØøKæÿãÚ}êxPûMrßAO
^I(Ì
vÅÿ¿ ¹à906þqüf`üýñûo(&ûþýº G>ñg¨yÌP³aÿõÞ$@äBÒÒ<±\ö,@dzɱk10bX bq`8ÀLÌ ÿÀ.ÊqdTcebà2ù $ÆD!
u0sC=À¨ðz Èõ £28Í3óÓ=ȱ@
| Ш'h²abä$7
]F4
ÍØ°ÈÎÿ±6@
LÿÞ±ÿýv %¼ÿüaϹ öúì bÌ 'oüfxüê CU °ór¨
Êÿ3#ìÄ¿ná@ÝÌ@| Úå|Ôsûæ
T¹ at¸"7ØñW üdà`gfð³ó
Uùà©cçàd(Í ý½ö1ÃoÁÅ*RÏ©'Ç@ä{
²}aý÷PüZ2ýE.Fì<ÀÈÄòMä?''ã>¿ÿ:«¤_W7ôþfâ
Ð!o>þcøóá°Üæge°Ô
jÌPaSGÿ øuĨ#~¡>ÿ&)V¨h 1CÕüÀ¢
Cþ#åHæ Ï`x
--- NEW FILE: connect.png ---
PNG
(ä
WLW±ñvæ²`dág``æz
èø ÿgáføÇüéï_nÞ¿¬E!ÿEØøKæÿãÚ}êxPûMrßAO
Tæß QL*÷ üû5u?8|âÏPó¡aÿõÞ$@,hI%qÿGK_PyÅ:büÁî _ò11°J1üû+T/ÄðçϦÿÿþgøÇÊÀôïÓÏÿYþÝ÷áß?&þg;0ªÍ:øÿÍï @³îC Ï
qXú µö/>
Äê¹ <&ß~±q~þÈÉð¨á÷ &§ÿüýÅøïÏ? þ3°
ÉÿÑÒÿ$aMN
µVþº #_¡ö3 %3
yb65EiA~ëw J¼ÿøäØ×ÐÒêx üôñÄë \ïp
1þûÄôãÛgf`*9sê&7'ÓßóWî3h*2¤y3ÿüûéßù«wsüþkÅð÷ûÿ<Ì ¼P³ø¡þ
ÍÌÜ@¬ÌÎÎþ76Ðñµ©¾æ£ôÊþ{Hb@Î
r rñrrð²r²±qqr¼üüåÿÿ¯=:¿¶ìØÇÀËÍÊàã`Ì ª©ÇÀÆ+,þ0|ýøáÏÏ ?~þf`7Ãß ^>{ÆPÕ:é×ËO~zØþw´2àãT\?9¸ø>~ÿñóÙÏßÿîþýóûÊϯï.¿yýúJVE×´ NR
Â0'[cºÙEßÿ9<zAQ{è¡^T°%¤Qã¾ÁðÍüÿÌï5ªd ¤Ç×
¡à4R>·RÂp;hD©³_:z>»?ìÆ+ã VwðÁ$UØW
NuÍ®F ;ÕzE9EÅàCzÌ- qëÄ9Öãp¬P%;·è¯ÖZÁÒh9
_êäïñÉ*ÇAbαaM8D((øÿW¨hĽÙ# 8r¦ðÆòØ?FC;×dÖ·ûH߶±&:Ý^L ¼û/
1¥kXÓi©áô á^øÀf{@UͱåØýñûCc½Z ,2H ¢¸S!¾Ìû^ÂêK¨õ3¶Æâ¾zÕøZ¥2)+óúÏ`ñ@ 7'Ð~.`åËñèð¿ÀÀ? àjÙ88éÿþ~ÿÀ`i¢Í°åð÷_ ba¸óò7¨^gbzè0M9/7ð SmEP+áÝÇÏ _Íë À¶Ñ¯ß ¿þ2Mczá°»ðû× &!!1V~ ö¿¿~òüþý ¨[QV©(Ó
8!ËÈr;0ãþúÆðôÞ5^ÆÀ"á̹ ÇÎ\öÂ>3Ø+1;=ü¾9y@:Äù6î< '# t+0%Úÿ? Ü\ Àde¸÷è? ãWï~þòýçó×ïßݺÿôåÑs×ì8xæݯß~@[©à@
!vÀÊX!ÌÃALËáÃË §Íe8",À
ÌàdðX3s K0ü
§¸°7¤Îà~ÿÃ¥ÛdÅXéX·1¼æy«v*«Ç@|OÜÄï¡ÍäÖ3¸ fh=ð ©çÃÔÀcv±1ä}ýö`Ij £°¨úý7
8ñӶî9ÊpìäY.&`xýè°Z`& PýË «ªÏp|÷z^q9`QËÆðíë`l3<ºXɽeþ/ÀÏËøãç/í{ÿøñôëÇï ¯~þwðAÝÊgÐPÿÔ
Ç0
Ãk`óX)|üôYï>xösËsßèµG_^ xÂpXÿvdàºõáÍïÿ ï ±ñßü /`V]ÃZ©ì7î=ù¬¡$-uðÄÖýÇ/2Ø[è3Èé[
à&óG7n_;Çðàé+`
ýAX ÜÉY¶vÃå;Ï^¿û tðgÀìõç <\ì lÀ¼ñðÑ#üÃo?~ÝvðAãE~g¸yþ=Ã] ã¿Bóç/¨Ã#3¨ïÛØØÞ×dDêfbåâ_¬ô9¹ØYxLåû·/ø-x
!6 Ã9þÿfgø#ÄÊðý¸÷_ëåOð ¬bFêê2#"XGªïð:'þ#M
ÁbæÁác7¯Æ»òë s2ü}l
af¤1S
3ÿÿ³ââÿK@Ç?ÆÐUhñù©Ü
§ñ'ö~ÖáÒ bPÇþDÊ È±À6¼
--- NEW FILE: msgpend.png ---
PNG
(ä
WLW±ñvæ²`dág``æz
èø ÿgáføÇüéï_nÞ¿¬E!ÿEØøKæÿãÚ}êxPûMrßAO
^I(Ì
vÅÿ¿ ¹à906þqüf`üýñûo(&ûþýº G>ñg¨yÌP³aÿõÞ$@äBÒÒ<±\ö,@dzɱk10bX bq`8ÀLÌ ÿÀ.ÊqdTcebà2ù $ÆD!
u0sC=À¨ðz Èõ £28Í3óÓ=ȱ@
| Ш'h²abä$7
]F4
ÍØ°ÈÎÿ±6@
LÿÞ±ÿýv %¼ÿüaϹ öúì bÌ 'oüfxüê CU °ór¨
Êÿ3#ìÄ¿ná@ÝÌ@| Úå|Ôsûæ
T¹ at¸"7ØñW üdà`gfð³ó
Uùà©cçàd(Í ý½ö1ÃoÁÅ*RÏ©'Ç@L2,;;û:^>î«ÜW¸¸ØÏÅÊÀ
Å`ûóç ÷ï?ö ¼ð}úÜm ¸ö êð)Ðæõ'¨ã!ÕÎà ¬5±ÇÏïN̬ø¯o£ÂÌðþÞ_p*üôîk`8ô¯güäÓ¹®&ç B\¿|þÂd"ûá¢èß_+¶þâ]²û/ÿ=ë8¹XÞ1BËo}gß3p²³0:HÁ ÿíû/'ÏÞý]°tïµ}yüôõ>hà~
íÜ 4Ý
@lll^¼¼¼jÞÞÞz < ðóçoׯßó0Rq¼Ã¤¬BFWÀpX ¬àÕì<þÊÉJ1***2Í3ûÿó íïã þ}àüóÿ߶':²âòf,1Ìÿ~<&&¨Ã>|üÂpçÖÿíËÿm?z ®÷C ûÚ3{Ô¹yî1º
ÿß½úÇô ÚßrMíWÏ®
+Ão`üäÕÿÖåÿθöw©Ó? Ã+÷ß1ply®>£Mr §uÃ
¬øíÛ· ³fÍb
$ò (ÃÄ@ÜþUxÀtûï)´4a:þRñø©´ù
õÈ®W?¤¾azê
ty¾m
=Dÿ£Õÿ z¡ü?Hm X
--- NEW FILE: offline.png ---
PNG
(ä
WLW±ñvæ²`dág``æz
èø ÿgáføÇüéï_nÞ¿¬E!ÿEØøKæÿãÚ}êxPûMrßAO
^I(Ì
vÅÿ¿ ¹à906þqüf`üýñûo(&ûþýº G>ñg¨yÌP³aÿõÞ$@äBÒÒ<±\ö,@dzɱk10bX bq`8ÀLÌ ÿÀ.ÊqdTcebà2ù $ÆD!
u0sC=À¨ðz Èõ £28Í3óÓ=ȱ@
ûÿoÜiGeàºZ¥rM $áõölÜ`òE%»Gåë×îVèHC¤õÃfWR¿I=9¿\0cK0E¥~â2H`C«ÿÿdiE´MQ/b`Y= ýÇZzýXï7Û½áMIî>Qg±8
´¯Ò<deVAÅåöýS_/øÏ; g¦SÖ ×~~üÈóèøϯÿrý~ÿá+;ï&F¾
Ã7ãÿ3A üîhåAøÄú¬Ì¦ìÌZ
ödøzó:'+ÃÇWX=LEü®2ÈlºvÜwh·Áÿ å
hE-
/à aNÆ?b, ¿%Ù~3A È¥/ðê¯ÐTÀÖj
5»ÿ^ ÅÂOhQ!
¬ÒÅÓ?Æÿ ¸úÇËÍøGá?;Ã?>`Aè &?Ì 8~wêÿcÉ¿bÝà
ô°yùXhýgvÙþ}ýÿ TËõà$Äu$Ò #'/Z ø©®ÿ=ò ©txùæ-Ë#+Í_²?8ÿ2~ÿóñ 0ôJÀñTÉô Xu+f
ô
--- NEW FILE: online.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¬ý yS@SA6°Ã9 íoHãCÈE%#¶V(
¨å
Xtéø óEÁm~P)$ä f´Ì5
rðºW?ä¾a:ü=49ýC½fDk@
Y¡Ý½·Ð
ý¿ }
/hÍbf¨~X§
jT l
ë @
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- Makefile.am 2001/10/04 15:57:10 1.57
+++ Makefile.am 2001/10/09 23:40:18 1.58
@@ -11,6 +11,7 @@
available-dnd.xpm \
available-xa.xpm \
available.xpm \
+ away.png \
away_big.xpm \
away_icon.xpm \
away_small.xpm \
@@ -23,6 +24,7 @@
cancel.xpm \
close.xpm \
close_small.xpm \
+ connect.png \
crazy4.xpm \
crossedlips.xpm \
cry.xpm \
@@ -61,13 +63,16 @@
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 \
@@ -103,11 +108,31 @@
yell.xpm
-pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = gaim.xpm
+if DISTRIB
+
+gaimdistpixdir = $(datadir)/pixmaps/gaim
+gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png
+
+distpixmapdir = $(datadir)/pixmaps
+distpixmap_DATA = gaim.xpm
+else
+
if GNOMEAPPLET
+
gnomedata = `@GNOME_CONFIG@ --datadir`
+
+gaimdistpmdir = $(gnomedata)/pixmaps/gaim
+gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
+
gaimpixmapdir = $(gnomedata)/pixmaps
gaimpixmap_DATA = gaim.xpm
+
+else
+
+pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = gaim.xpm
+
+endif
+
endif
|
|
From: Eric W. <war...@us...> - 2001-10-09 23:40:21
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv14337 Modified Files: Makefile.am Log Message: David Raeman's applet icons Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/Makefile.am,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- Makefile.am 2001/10/01 20:19:32 1.28 +++ Makefile.am 2001/10/09 23:40:18 1.29 @@ -2,6 +2,16 @@ EXTRA_DIST = gaim.spec.in gaim_applet.gnorba gaim.desktop gaim_applet.desktop \ HACKING STATUS gaim2blt.pl +if DISTRIB + +distribgnorbadir = $(sysconfdir)/CORBA/servers +distribgnorba_DATA = gaim_applet.gnorba + +distribdesktopdir = $(datadir)/applets/Network +distribdesktop_DATA = gaim_applet.desktop + +else + if GNOMEAPPLET gnomesysconf = `@GNOME_CONFIG@ --sysconfdir` @@ -15,37 +25,9 @@ gaimdesktopdir = $(gnomedata)/applets/Network gaimdesktop_DATA = $(gaim_DESKTOP) -# We dont need this no more :) I got good english =) -#gaim_SOUND = gaim.soundlist -#gaimsounddir = $(gnomesysconf)/sound/events -#gaimsound_DATA = $(gaim_SOUND) - endif -if DISTRIB - -distribgnorbadir = $(sysconfdir)/CORBA/servers -distribgnorba_DATA = gaim_applet.gnorba - -distribdesktopdir = $(datadir)/applets/Network -distribdesktop_DATA = gaim_applet.desktop - -#Get outta here -#distribsounddir = $(sysconfdir)/sound/events -#distribsound_DATA = gaim.soundlist - endif - -# we used to have gnome-configurable sound events, but now we can configure them -# ourselves. isn't that lovely -# -#if GNOMEBITS -# -#bitssysconf = `@GNOME_CONFIG@ --sysconfdir` -#bitssounddir = $(bitssysconf)/sound/events -#bitssound_DATA = gaim.soundlist -# -#endif pixmapdir = $(datadir)/gnome/apps/Internet pixmap_DATA = gaim.desktop |
|
From: Eric W. <war...@us...> - 2001-10-09 23:40:21
|
Update of /cvsroot/gaim/gaim/pixmaps/gnome In directory usw-pr-cvs1:/tmp/cvs-serv14337/pixmaps/gnome Removed Files: devil-connect.png devil-offline.png devil-online.png penguin-connect.png penguin-offline.png penguin-online.png Log Message: David Raeman's applet icons --- devil-connect.png DELETED --- --- devil-offline.png DELETED --- --- devil-online.png DELETED --- --- penguin-connect.png DELETED --- --- penguin-offline.png DELETED --- --- penguin-online.png DELETED --- |
|
From: Eric W. <war...@us...> - 2001-10-09 23:40:21
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv14337/src
Modified Files:
applet.c applet.h server.c
Log Message:
David Raeman's applet icons
Index: applet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/applet.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- applet.c 2001/09/27 19:17:10 1.13
+++ applet.c 2001/10/09 23:40:18 1.14
@@ -110,7 +110,30 @@
} else if (!connections) {
gtk_pixmap_set(GTK_PIXMAP(icon), icon_offline_pm, icon_offline_bm);
applet_set_tooltips(_("Offline. Click to bring up login box."));
- } else if (!awaymessage) {
+ } else if (awaymessage) {
+ int dsr = 0;
+
+ if ((away_options & OPT_AWAY_QUEUE) && message_queue) {
+ GSList *m = message_queue;
+ int dsr = 0;
+ while (m) {
+ struct queued_message *qm = m->data;
+ if (qm->flags & WFLAG_RECV)
+ dsr++;
+ m = m->next;
+ }
+ }
+
+ if (dsr) {
+ gtk_pixmap_set(GTK_PIXMAP(icon), icon_msg_pending_pm, icon_msg_pending_bm);
+ g_snprintf(buf, sizeof(buf), _("Away: %d pending."), dsr);
+ } else {
+ gtk_pixmap_set(GTK_PIXMAP(icon), icon_away_pm, icon_away_bm);
+ g_snprintf(buf, sizeof(buf), _("Away."));
+ }
+
+ applet_set_tooltips(buf);
+ } else {
gtk_pixmap_set(GTK_PIXMAP(icon), icon_online_pm, icon_online_bm);
g_snprintf(buf, sizeof buf, "Online: ");
while (c) {
@@ -120,8 +143,6 @@
strcat(buf, ", ");
}
applet_set_tooltips(buf);
- } else {
- gtk_pixmap_set(GTK_PIXMAP(icon), icon_online_pm, icon_online_bm);
}
return TRUE;
@@ -135,6 +156,10 @@
&icon_connect_pm, &icon_connect_bm);
load_applet_icon(GAIM_GNOME_ONLINE_ICON, (sizehint - 1), (sizehint - 1),
&icon_online_pm, &icon_online_bm);
+ load_applet_icon(GAIM_GNOME_AWAY_ICON, (sizehint - 1), (sizehint - 1),
+ &icon_away_pm, &icon_away_bm);
+ load_applet_icon(GAIM_GNOME_MSG_PENDING_ICON, (sizehint - 1), (sizehint - 1),
+ &icon_msg_pending_pm, &icon_msg_pending_bm);
update_applet();
gtk_widget_set_usize(appletframe, sizehint, sizehint);
}
@@ -326,7 +351,11 @@
/*load online icon */
load_applet_icon(GAIM_GNOME_ONLINE_ICON, 32, 32, &icon_online_pm, &icon_online_bm);
- /*icon_away and icon_msg_pennding need to be implemented */
+ /*load away icon */
+ load_applet_icon(GAIM_GNOME_AWAY_ICON, 32, 32, &icon_away_pm, &icon_away_bm);
+
+ /*load msg_pending icon */
+ load_applet_icon(GAIM_GNOME_ONLINE_ICON, 32, 32, &icon_msg_pending_pm, &icon_msg_pending_bm);
icon = gtk_pixmap_new(icon_offline_pm, icon_offline_bm);
Index: applet.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/applet.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- applet.h 2001/10/05 22:23:27 1.6
+++ applet.h 2001/10/09 23:40:18 1.7
@@ -63,9 +63,17 @@
#define GAIM_GNOME_PENGUIN_CONNECT "gaim/gnome/penguin-connect.png"
#define GAIM_GNOME_PENGUIN_ONLINE "gaim/gnome/penguin-online.png"
+/*
#define GAIM_GNOME_OFFLINE_ICON "apple-red.png"
#define GAIM_GNOME_CONNECT_ICON "gnome-battery.png"
#define GAIM_GNOME_ONLINE_ICON "apple-green.png"
+*/
+
+#define GAIM_GNOME_OFFLINE_ICON "gaim/offline.png"
+#define GAIM_GNOME_CONNECT_ICON "gaim/connect.png"
+#define GAIM_GNOME_ONLINE_ICON "gaim/online.png"
+#define GAIM_GNOME_AWAY_ICON "gaim/away.png"
+#define GAIM_GNOME_MSG_PENDING_ICON "gaim/msgpend.png"
extern GtkWidget *applet;
Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- server.c 2001/10/05 22:06:27 1.196
+++ server.c 2001/10/09 23:40:18 1.197
@@ -510,6 +510,10 @@
qm->flags = WFLAG_RECV | away;
message_queue = g_slist_append(message_queue, qm);
+#ifdef USE_APPLET
+ set_user_state(away);
+#endif
+
row = find_queue_row_by_name(qm->name);
if (row >= 0) {
|
|
From: Eric W. <war...@us...> - 2001-10-09 23:15:36
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv9010
Modified Files:
sound.c
Log Message:
bmiller's solaris sound patch
Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- sound.c 2001/09/27 19:17:11 1.38
+++ sound.c 2001/10/09 23:15:33 1.39
@@ -82,7 +82,7 @@
{
int fd;
- fd = open("/dev/audio", O_WRONLY | O_EXCL);
+ fd = open("/dev/audio", O_WRONLY | O_EXCL | O_NDELAY);
if (fd < 0)
return;
write(fd, data, size);
@@ -106,7 +106,7 @@
read(fd, buf, info.st_size - 24);
close(fd);
- fd = open("/dev/audio", O_WRONLY | O_EXCL);
+ fd = open("/dev/audio", O_WRONLY | O_EXCL | O_NDELAY);
if (fd < 0) {
free(buf);
return;
|
|
From: Eric W. <war...@us...> - 2001-10-09 22:20:49
|
Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory usw-pr-cvs1:/tmp/cvs-serv26529/protocols/irc
Modified Files:
irc.c
Log Message:
cosmetic fix
Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- irc.c 2001/10/09 19:15:13 1.40
+++ irc.c 2001/10/09 22:20:46 1.41
@@ -1260,7 +1260,7 @@
struct proto_chat_entry *pce;
pce = g_new0(struct proto_chat_entry, 1);
- pce->label = _("Room:");
+ pce->label = _("Channel:");
m = g_list_append(m, pce);
pce = g_new0(struct proto_chat_entry, 1);
|
|
From: Eric W. <war...@us...> - 2001-10-09 22:14:58
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv24565
Modified Files:
module.c
Log Message:
fix this too
Index: module.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/module.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- module.c 2001/10/09 21:14:16 1.9
+++ module.c 2001/10/09 22:14:56 1.10
@@ -420,10 +420,11 @@
(char *)arg3 ? (char *)arg3 : "");
break;
case event_chat_recv:
- debug_printf("%s: %s %s %s\n", event_name(event),
+ debug_printf("%s: %s %d %s\n", event_name(event),
((struct gaim_connection *)arg1)->username,
- (char *)arg2 ? (char *)arg2 : "",
- (char *)arg3 ? (char *)arg3 : "");
+ (int)arg2,
+ (char *)arg3 ? (char *)arg3 : "",
+ (char *)arg4 ? (char *)arg4 : "");
break;
case event_chat_send_invite:
debug_printf("%s: %s %d %s %s\n", event_name(event),
|
|
From: Eric W. <war...@us...> - 2001-10-09 21:14:19
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv5373
Modified Files:
module.c
Log Message:
whoops
Index: module.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/module.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- module.c 2001/10/09 21:06:41 1.8
+++ module.c 2001/10/09 21:14:16 1.9
@@ -416,8 +416,8 @@
case event_im_displayed_rcvd:
debug_printf("%s: %s %s %s\n", event_name(event),
((struct gaim_connection *)arg1)->username,
- *(char **)arg2 ? *(char **)arg2 : "",
- *(char **)arg3 ? *(char **)arg3 : "");
+ (char *)arg2 ? (char *)arg2 : "",
+ (char *)arg3 ? (char *)arg3 : "");
break;
case event_chat_recv:
debug_printf("%s: %s %s %s\n", event_name(event),
|
|
From: Eric W. <war...@us...> - 2001-10-09 21:06:44
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv3839
Modified Files:
module.c
Log Message:
debug_print event messages usefully. some of these are probably broken but i tried to avoid that.
Index: module.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/module.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- module.c 2001/10/06 04:37:34 1.7
+++ module.c 2001/10/09 21:06:41 1.8
@@ -344,6 +344,104 @@
return buf;
}
+static void debug_event(enum gaim_event event, void *arg1, void *arg2, void *arg3, void *arg4)
+{
+#ifndef DEBUG
+ if (!(misc_options & OPT_MISC_DEBUG))
+ return;
+#endif
+ switch (event) {
+ case event_quit:
+ debug_printf("%s\n", event_name(event));
+ break;
+ case event_signon:
+ case event_signoff:
+ debug_printf("%s: %s\n", event_name(event),
+ ((struct gaim_connection *)arg1)->username);
+ break;
+ case event_new_conversation:
+ debug_printf("event_new_conversation: %s\n", (char *)arg1);
+ break;
+ case event_error:
+ debug_printf("event_error: %d\n", (int)arg1);
+ break;
+ case event_buddy_signon:
+ case event_buddy_signoff:
+ case event_buddy_away:
+ case event_buddy_back:
+ case event_buddy_idle:
+ case event_buddy_unidle:
+ case event_set_info:
+ debug_printf("%s: %s %s\n", event_name(event),
+ ((struct gaim_connection *)arg1)->username, (char *)arg2);
+ break;
+ case event_chat_leave:
+ debug_printf("event_chat_leave: %s %d\n",
+ ((struct gaim_connection *)arg1)->username, (int)arg2);
+ break;
+ case event_im_send:
+ case event_im_displayed_sent:
+ debug_printf("%s: %s %s %s\n", event_name(event),
+ ((struct gaim_connection *)arg1)->username,
+ (char *)arg2, *(char **)arg3 ? *(char **)arg3 : "");
+ break;
+ case event_chat_join:
+ case event_chat_buddy_join:
+ case event_chat_buddy_leave:
+ debug_printf("%s: %s %d %s\n", event_name(event),
+ ((struct gaim_connection *)arg1)->username,
+ (int)arg2, (char *)arg3);
+ break;
+ case event_chat_send:
+ debug_printf("%s: %s %d %s\n", event_name(event),
+ ((struct gaim_connection *)arg1)->username,
+ (int)arg2, *(char **)arg3 ? *(char **)arg3 : "");
+ break;
+ case event_away:
+ debug_printf("%s: %s %s %s\n", event_name(event),
+ ((struct gaim_connection *)arg1)->username,
+ (char *)arg2, (char *)arg3 ? (char *)arg3 : "");
+ break;
+ case event_warned:
+ debug_printf("%s: %s %s %d\n", event_name(event),
+ ((struct gaim_connection *)arg1)->username,
+ (char *)arg2 ? (char *)arg2 : "", (int)arg3);
+ break;
+ case event_im_recv:
+ debug_printf("%s: %s %s %s\n", event_name(event),
+ ((struct gaim_connection *)arg1)->username,
+ *(char **)arg2 ? *(char **)arg2 : "",
+ *(char **)arg3 ? *(char **)arg3 : "");
+ break;
+ case event_im_displayed_rcvd:
+ debug_printf("%s: %s %s %s\n", event_name(event),
+ ((struct gaim_connection *)arg1)->username,
+ *(char **)arg2 ? *(char **)arg2 : "",
+ *(char **)arg3 ? *(char **)arg3 : "");
+ break;
+ case event_chat_recv:
+ debug_printf("%s: %s %s %s\n", event_name(event),
+ ((struct gaim_connection *)arg1)->username,
+ (char *)arg2 ? (char *)arg2 : "",
+ (char *)arg3 ? (char *)arg3 : "");
+ break;
+ case event_chat_send_invite:
+ debug_printf("%s: %s %d %s %s\n", event_name(event),
+ ((struct gaim_connection *)arg1)->username,
+ (int)arg2, (char *)arg3,
+ *(char **)arg4 ? *(char **)arg4 : "");
+ break;
+ case event_chat_invited:
+ debug_printf("%s: %s %s %s %s\n", event_name(event),
+ ((struct gaim_connection *)arg1)->username,
+ (char *)arg2, (char *)arg3,
+ (char *)arg4 ? (char *)arg4 : "");
+ break;
+ default:
+ break;
+ }
+}
+
int plugin_event(enum gaim_event event, void *arg1, void *arg2, void *arg3, void *arg4)
{
#ifdef USE_PERL
@@ -352,7 +450,11 @@
#ifdef GAIM_PLUGINS
GList *c = callbacks;
struct gaim_callback *g;
+#endif
+ debug_event(event, arg1, arg2, arg3, arg4);
+
+#ifdef GAIM_PLUGINS
while (c) {
void (*zero)(void *);
void (*one)(void *, void *);
|
|
From: Eric W. <war...@us...> - 2001-10-09 20:19:45
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv22277
Modified Files:
core.c
Log Message:
stupid
Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- core.c 2001/10/08 01:12:02 1.11
+++ core.c 2001/10/09 20:19:42 1.12
@@ -41,18 +41,18 @@
static gint UI_fd = -1;
GSList *uis = NULL;
-static guchar *UI_build(int *len, guchar type, guchar subtype, va_list args1)
+static guchar *UI_build(guint32 *len, guchar type, guchar subtype, va_list args1)
{
va_list args2;
guchar *buffer;
- int pos;
+ guint32 pos;
int size;
void *data;
G_VA_COPY(args2, args1);
- buffer = g_malloc(sizeof(guchar) * 2 + 4);
*len = sizeof(guchar) * 2 + 4;
+ buffer = g_malloc(*len);
pos = 0;
memcpy(buffer + pos, &type, sizeof(type)); pos += sizeof(type);
@@ -73,6 +73,9 @@
size = va_arg(args2, int);
}
+ /* now we do size */
+ memcpy(buffer + sizeof(guchar) * 2, &pos, 4);
+
va_end(args2);
return buffer;
@@ -95,7 +98,7 @@
{
va_list ap;
gchar *data;
- int len;
+ guint32 len;
va_start(ap, subtype);
data = UI_build(&len, type, subtype, ap);
@@ -120,7 +123,7 @@
{
va_list ap;
gchar *data;
- int len;
+ guint32 len;
if (!uis)
return;
|
|
From: Eric W. <war...@us...> - 2001-10-09 19:24:18
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv6458
Modified Files:
gtkspell.c
Log Message:
be more assertive. this was a bug in gtkspell even before my patch, i think; it's just easier to check with my patch ;)
Index: gtkspell.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkspell.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gtkspell.c 2001/10/09 18:01:06 1.10
+++ gtkspell.c 2001/10/09 19:24:16 1.11
@@ -255,6 +255,9 @@
GList *l = NULL;
int count;
+ if (!word)
+ return NULL;
+
buf = g_strdup_printf("^%s\n", word); /* guard against ispell control chars */
writetext(buf);
g_free(buf);
|
|
From: Eric W. <war...@us...> - 2001-10-09 19:18:44
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv4511
Modified Files:
aim.c conversation.c
Log Message:
don't turn on ispell unless you want it.
Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- aim.c 2001/10/03 07:49:38 1.162
+++ aim.c 2001/10/09 19:18:41 1.163
@@ -636,7 +636,8 @@
if (misc_options & OPT_MISC_DEBUG)
show_debug();
- gtkspell_start(NULL, ispell_cmd);
+ if (convo_options & OPT_CONVO_CHECK_SPELLING)
+ gtkspell_start(NULL, ispell_cmd);
#ifdef USE_PERL
perl_autoload();
#endif
@@ -681,7 +682,8 @@
#endif /* USE_APPLET */
- gtkspell_stop();
+ if (convo_options & OPT_CONVO_CHECK_SPELLING)
+ gtkspell_stop();
core_quit();
return 0;
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- conversation.c 2001/10/08 03:22:53 1.275
+++ conversation.c 2001/10/09 19:18:41 1.276
@@ -60,6 +60,8 @@
#include "pixmaps/mrt.xpm"
#include "pixmaps/download.xpm"
+static gchar *ispell_cmd[] = { "ispell", "-a", NULL };
+
int state_lock = 0;
GdkPixmap *dark_icon_pm = NULL;
@@ -2323,6 +2325,9 @@
GSList *con = connections;
struct gaim_connection *gc;
+ if (convo_options & OPT_CONVO_CHECK_SPELLING)
+ gtkspell_start(NULL, ispell_cmd);
+
while (cnv) {
c = (struct conversation *)cnv->data;
if (convo_options & OPT_CONVO_CHECK_SPELLING)
@@ -2345,6 +2350,9 @@
}
con = con->next;
}
+
+ if (!(convo_options & OPT_CONVO_CHECK_SPELLING))
+ gtkspell_stop();
}
void toggle_timestamps()
|
|
From: Eric W. <war...@us...> - 2001-10-09 19:15:16
|
Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory usw-pr-cvs1:/tmp/cvs-serv4066/protocols/irc
Modified Files:
irc.c
Log Message:
nolog
Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- irc.c 2001/10/02 20:31:56 1.39
+++ irc.c 2001/10/09 19:15:13 1.40
@@ -1206,7 +1206,7 @@
"JOIN PART TOPIC<BR>"
"OP DEOP VOICE DEVOICE KICK<BR>"
"NICK ME MSG QUOTE SAY</B>",
- WFLAG_SYSTEM, NULL, time(NULL));
+ WFLAG_NOLOG, NULL, time(NULL));
} else {
struct conversation *c = NULL;
if (is_channel(gc, who)) {
@@ -1216,7 +1216,7 @@
}
if (!c)
return -EINVAL;
- write_to_conv(c, "<B>Unknown command</B>", WFLAG_SYSTEM, NULL, time(NULL));
+ write_to_conv(c, "<B>Unknown command</B>", WFLAG_NOLOG, NULL, time(NULL));
}
return 0;
|
|
From: Eric W. <war...@us...> - 2001-10-09 18:12:44
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv19585
Modified Files:
multi.c
Log Message:
small bug
Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- multi.c 2001/10/06 05:41:25 1.91
+++ multi.c 2001/10/09 18:12:41 1.92
@@ -612,6 +612,7 @@
mod_users = g_slist_append(mod_users, u);
if (a) {
+ int i;
u->options = a->options;
if (find_prpl(a->protocol))
u->protocol = a->protocol;
@@ -620,6 +621,9 @@
else
u->protocol = -1;
g_snprintf(u->iconfile, sizeof(u->iconfile), "%s", a->iconfile);
+ for (i = 0; i < 7; i++)
+ g_snprintf(u->proto_opt[i], sizeof(u->proto_opt[i]), "%s",
+ a->proto_opt[i]);
} else {
u->options = OPT_USR_REM_PASS;
if (find_prpl(DEFAULT_PROTO))
|
|
From: Eric W. <war...@us...> - 2001-10-09 18:01:08
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv15977
Modified Files:
gtkspell.c
Log Message:
stupid, stupid
Index: gtkspell.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkspell.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gtkspell.c 2001/10/09 16:23:08 1.9
+++ gtkspell.c 2001/10/09 18:01:06 1.10
@@ -354,12 +354,11 @@
if (iswordsep(GTK_TEXT_INDEX(gtktext, end))) break;
}
- if (buf) {
- char *tmp = g_malloc(end - start + 1);
+ if (buf && (end - start + 1 > 0)) {
+ *buf = g_malloc(end - start + 1);
for (pos = start; pos < end; pos++)
- tmp[pos-start] = GTK_TEXT_INDEX(gtktext, pos);
- tmp[pos-start] = 0;
- *buf = tmp;
+ (*buf)[pos-start] = GTK_TEXT_INDEX(gtktext, pos);
+ (*buf)[pos-start] = 0;
}
if (pstart) *pstart = start;
|
|
From: Eric W. <war...@us...> - 2001-10-09 16:23:11
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv18788
Modified Files:
gtkspell.c
Log Message:
hm
Index: gtkspell.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkspell.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gtkspell.c 2001/10/09 01:26:17 1.8
+++ gtkspell.c 2001/10/09 16:23:08 1.9
@@ -355,10 +355,11 @@
}
if (buf) {
- *buf = g_malloc(end - start + 1);
+ char *tmp = g_malloc(end - start + 1);
for (pos = start; pos < end; pos++)
- (*buf)[pos-start] = GTK_TEXT_INDEX(gtktext, pos);
- (*buf)[pos-start] = 0;
+ tmp[pos-start] = GTK_TEXT_INDEX(gtktext, pos);
+ tmp[pos-start] = 0;
+ *buf = tmp;
}
if (pstart) *pstart = start;
|
|
From: Eric W. <war...@us...> - 2001-10-09 01:38:19
|
Update of /cvsroot/gaim/gaim/src/protocols/yahoo In directory usw-pr-cvs1:/tmp/cvs-serv22403 Modified Files: outgoing.c Log Message: this should fix many things. Index: outgoing.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/outgoing.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- outgoing.c 2001/07/31 01:00:38 1.1 +++ outgoing.c 2001/10/09 01:38:16 1.2 @@ -49,7 +49,7 @@ struct yahoo_packet *pkt; int ret; - if (!session || !conn) + if (!session || !session->login || !conn || !active_id) return 0; if (!(pkt = g_new0(struct yahoo_packet, 1))) @@ -149,6 +149,9 @@ struct yahoo_conn *conn; if (!session) + return 0; + + if (!session->login) return 0; if (!(conn = yahoo_getconn_type(session, YAHOO_CONN_TYPE_MAIN))) |
|
From: Eric W. <war...@us...> - 2001-10-09 01:26:23
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv19618
Modified Files:
gtkspell.c
Log Message:
I hacked gtkspell.
Index: gtkspell.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkspell.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gtkspell.c 2001/05/06 09:16:40 1.7
+++ gtkspell.c 2001/10/09 01:26:17 1.8
@@ -35,7 +35,7 @@
*/
/* size of the text buffer used in various word-processing routines. */
-#define BUFSIZE 1024
+/* #define BUFSIZE 1024 */
/* number of suggestions to display on each menu. */
#define MENUCOUNT 10
#define BUGEMAIL "gtk...@li..."
@@ -74,42 +74,64 @@
static void writetext(char *text) {
write(fd_write[1], text, strlen(text));
}
-static int readpipe(char *buf, int bufsize) {
- int len;
- len = read(fd_read[0], buf, bufsize-1);
- if (len < 0) {
- error_print("read: %s\n", strerror(errno));
- return -1;
- } else if (len == 0) {
- error_print("pipe closed.\n");
- return -1;
- } else if (len == bufsize-1) {
- error_print("buffer overflowed?\n");
- }
- buf[len] = 0;
- return len;
-}
-static int readline(char *buf) {
- return readpipe(buf, BUFSIZE);
+static char *readline() {
+ int len = 1024;
+ gchar *buf = g_malloc(len);
+ int pos = 0;
+ do {
+ int val = read(fd_read[0], buf + pos, 1);
+ if (val <= 0) {
+ error_print("read: %s\n", strerror(errno));
+ g_free(buf);
+ return NULL;
+ }
+ pos += val;
+ if (pos == len) {
+ len *= 2;
+ buf = g_realloc(buf, len);
+ }
+ } while (buf[pos - 1] != '\n');
+
+ buf = g_realloc(buf, pos + 1);
+ buf[pos] = 0;
+ return buf;
}
-static int readresponse(char *buf) {
- int len;
- len = readpipe(buf, BUFSIZE);
+static char *readresponse() {
+ char *r1, *r2, *result;
- /* all ispell responses of any reasonable length should end in \n\n.
- * depending on the speed of the spell checker, this may require more
- * reading. */
- if (len >= 2 && (buf[len-1] != '\n' || buf[len-2] != '\n')) {
- len += readpipe(buf+len, BUFSIZE-len);
+ r1 = readline();
+ if (!r1)
+ return NULL;
+ if (*r1 == '\n') {
+ g_strchomp(r1);
+ return r1;
}
+ r2 = readline();
+ if (!r2) {
+ g_free(r1);
+ return NULL;
+ }
- /* now we can remove all of the the trailing newlines. */
- while (len > 0 && buf[len-1] == '\n')
- buf[--len] = 0;
+ while (r2 && *r2 != '\n') {
+ char *tmp = r1;
+ r1 = g_strconcat(tmp, r2, NULL);
+ g_free(tmp);
+ g_free(r2);
+ r2 = readline();
+ }
- return len;
+ if (!r2) {
+ g_free(r1);
+ return NULL;
+ }
+
+ result = g_strconcat(r1, r2, NULL);
+ g_free(r1);
+ g_free(r2);
+ g_strchomp(result);
+ return result;
}
@@ -124,7 +146,6 @@
int gtkspell_start(char *path, char * args[]) {
int fd_error[2];
- char buf[BUFSIZE];
if (gtkspell_running()) {
error_print("gtkspell_start called while already running.\n");
@@ -178,6 +199,7 @@
*/
fd_set rfds;
struct timeval tv;
+ char *buf;
close(fd_write[0]);
close(fd_read[1]);
@@ -207,36 +229,43 @@
close(fd_error[1]);
/* otherwise, fd_read[0] is set. */
- readline(buf);
+ buf = readline();
/* ispell should print something like this:
* @(#) International Ispell Version 3.1.20 10/10/95
* if it doesn't, it's an error. */
- if (buf[0] != '@') {
+ if (!buf || buf[0] != '@') {
+ if (buf)
+ g_free(buf);
gtkspell_stop();
return -1;
}
+ g_free(buf);
}
/* put ispell into terse mode.
* this makes it not respond on correctly spelled words. */
- sprintf(buf, "!\n");
- writetext(buf);
+ writetext("!\n");
return 0;
}
static GList* misspelled_suggest(char *word) {
- char buf[BUFSIZE];
+ char *buf;
char *newword;
GList *l = NULL;
int count;
- sprintf(buf, "^%s\n", word); /* guard against ispell control chars */
+ buf = g_strdup_printf("^%s\n", word); /* guard against ispell control chars */
writetext(buf);
- readresponse(buf);
+ g_free(buf);
+ buf = readresponse();
+
+ if (!buf)
+ return NULL;
switch (buf[0]) { /* first char is ispell command. */
case 0: /* no response: word is ok. */
+ g_free(buf);
return NULL;
case '&': /* misspelled, with suggestions */
/* & <orig> <count> <ofs>: <miss>, <miss>, <guess>, ... */
@@ -260,6 +289,7 @@
count--;
}
+ g_free(buf);
return l;
case '#': /* misspelled, no suggestions */
@@ -268,6 +298,7 @@
strtok(buf, " "); /* & */
newword = strtok(NULL, " "); /* orig */
l = g_list_append(l, g_strdup(newword));
+ g_free(buf);
return l;
default:
error_print("Unsupported spell command '%c'.\n"
@@ -275,24 +306,32 @@
error_print("Input [%s]\nOutput [%s]\n", word, buf);
}
+ g_free(buf);
return NULL;
}
static int misspelled_test(char *word) {
- char buf[BUFSIZE];
- sprintf(buf, "^%s\n", word); /* guard against ispell control chars */
+ char *buf;
+ buf = g_strdup_printf("^%s\n", word); /* guard against ispell control chars */
writetext(buf);
- readresponse(buf);
+ g_free(buf);
+ buf = readresponse();
+
+ if (!buf)
+ return 0;
if (buf[0] == 0) {
+ g_free(buf);
return 0;
} else if (buf[0] == '&' || buf[0] == '#' || buf[0] == '?') {
+ g_free(buf);
return 1;
}
error_print("Unsupported spell command '%c'.\n"
"This is a bug; mail " BUGEMAIL " about it.\n", buf[0]);
error_print("Input [%s]\nOutput [%s]\n", word, buf);
+ g_free(buf);
return -1;
}
@@ -300,7 +339,7 @@
return !isalpha(c) && c != '\'';
}
-static gboolean get_word_from_pos(GtkText* gtktext, int pos, char* buf,
+static gboolean get_word_from_pos(GtkText* gtktext, int pos, char** buf,
int *pstart, int *pend) {
gint start, end;
@@ -316,9 +355,10 @@
}
if (buf) {
+ *buf = g_malloc(end - start + 1);
for (pos = start; pos < end; pos++)
- buf[pos-start] = GTK_TEXT_INDEX(gtktext, pos);
- buf[pos-start] = 0;
+ (*buf)[pos-start] = GTK_TEXT_INDEX(gtktext, pos);
+ (*buf)[pos-start] = 0;
}
if (pstart) *pstart = start;
@@ -327,7 +367,7 @@
return TRUE;
}
-static gboolean get_curword(GtkText* gtktext, char* buf,
+static gboolean get_curword(GtkText* gtktext, char** buf,
int *pstart, int *pend) {
int pos = gtk_editable_get_position(GTK_EDITABLE(gtktext));
return get_word_from_pos(gtktext, pos, buf, pstart, pend);
@@ -354,9 +394,11 @@
static gboolean check_at(GtkText *gtktext, int from_pos) {
int start, end;
- char buf[BUFSIZE];
+ char *buf = NULL;
- if (!get_word_from_pos(gtktext, from_pos, buf, &start, &end)) {
+ if (!get_word_from_pos(gtktext, from_pos, &buf, &start, &end)) {
+ if (buf)
+ g_free(buf);
return FALSE;
}
@@ -367,10 +409,14 @@
gdk_colormap_alloc_color(gc, &highlight, FALSE, TRUE);;
}
change_color(gtktext, start, end, &highlight);
+ if (buf)
+ g_free(buf);
return TRUE;
} else {
change_color(gtktext, start, end,
&(GTK_WIDGET(gtktext)->style->fg[0]));
+ if (buf)
+ g_free(buf);
return FALSE;
}
}
@@ -456,7 +502,6 @@
static void replace_word(GtkWidget *w, gpointer d) {
int start, end;
char *newword;
- char buf[BUFSIZE];
/* we don't save their position,
* because the cursor is moved by the click. */
@@ -464,7 +509,7 @@
gtk_text_freeze(GTK_TEXT(d));
gtk_label_get(GTK_LABEL(GTK_BIN(w)->child), &newword);
- get_curword(GTK_TEXT(d), buf, &start, &end);
+ get_curword(GTK_TEXT(d), NULL, &start, &end);
gtk_text_set_point(GTK_TEXT(d), end);
gtk_text_backward_delete(GTK_TEXT(d), end-start);
@@ -479,6 +524,7 @@
menu = gtk_menu_new(); {
caption = g_strdup_printf("Not in dictionary: %s", (char*)l->data);
item = gtk_menu_item_new_with_label(caption);
+ g_free(caption);
/* I'd like to make it so this item is never selectable, like
* the menu titles in the GNOME panel... unfortunately, the GNOME
* panel creates their own custom widget to do this! */
@@ -527,12 +573,14 @@
}
static void popup_menu(GtkText *gtktext, GdkEventButton *eb) {
- char buf[BUFSIZE];
+ char *buf = NULL;
GList *list, *l;
- get_curword(gtktext, buf, NULL, NULL);
+ get_curword(gtktext, &buf, NULL, NULL);
list = misspelled_suggest(buf);
+ if (buf)
+ g_free(buf);
if (list != NULL) {
gtk_menu_popup(make_menu(list, gtktext), NULL, NULL, NULL, NULL,
eb->button, eb->time);
|
|
From: Eric W. <war...@us...> - 2001-10-08 21:25:31
|
Update of /cvsroot/gaim/gaim/src/protocols/toc
In directory usw-pr-cvs1:/tmp/cvs-serv433/protocols/toc
Modified Files:
toc.c
Log Message:
this was stupid
Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- toc.c 2001/09/28 07:46:36 1.24
+++ toc.c 2001/10/08 21:25:28 1.25
@@ -379,7 +379,7 @@
g_show_info_text(url_text, NULL);
}
-static char *show_error_message(char *d)
+static char *show_error_message()
{
int no = atoi(strtok(NULL, ":"));
char *w = strtok(NULL, ":");
@@ -528,8 +528,7 @@
buf + sizeof(struct sflap_hdr));
if (!g_strncasecmp(buf + sizeof(struct sflap_hdr), "ERROR", 5)) {
strtok(buf + sizeof(struct sflap_hdr), ":");
- hide_login_progress(gc, show_error_message(buf +
- sizeof(struct sflap_hdr)));
+ hide_login_progress(gc, show_error_message());
} else
hide_login_progress(gc, _("Authentication Failed"));
signoff(gc);
@@ -656,8 +655,7 @@
serv_got_update(gc, c, logged, evil, signon, time_idle, type, 0);
} else if (!strcasecmp(c, "ERROR")) {
- c = strtok(NULL, ":");
- show_error_message(c);
+ do_error_dialog(show_error_message(), "TOC Error");
} else if (!strcasecmp(c, "EVILED")) {
int lev;
char *name;
|
6 messages has been excluded from this view by a project administrator.
