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

[Gaim-commits] CVS: gaim/src aim.c,1.196,1.197

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

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

Modified Files:
	aim.c 
Log Message:
Maybe this will work better.


Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- aim.c	16 Sep 2002 08:35:17 -0000	1.196
+++ aim.c	16 Sep 2002 21:40:11 -0000	1.197
@@ -411,8 +411,8 @@
 			"they can help you.\n");
 #else
 		fprintf(stderr, "Oh no!  Segmentation fault!\n");
-		g_on_error_query (NULL);
-
+		g_on_error_query (prog_name);
+		exit(1);
 #endif
 		abort();
 		break;

[Gaim-commits] CVS: gaim/src buddy.c,1.331,1.332 server.c,1.238,1.239 ui.h,1.54,1.55

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

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

Modified Files:
	buddy.c server.c ui.h 
Log Message:
If I didn't do this, if you turned queuing on in the docklet, and then 
unloaded the docklet--you'd never get IMs ever again.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -d -r1.331 -r1.332
--- buddy.c	16 Sep 2002 15:09:13 -0000	1.331
+++ buddy.c	16 Sep 2002 20:42:17 -0000	1.332
@@ -110,7 +110,7 @@
 };
 static GSList *shows = NULL;
 
-static int docklet_count = 0;
+int docklet_count = 0;
 
 /* Predefine some functions */
 static void new_bp_callback(GtkWidget *w, struct buddy *bs);

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- server.c	16 Sep 2002 19:50:52 -0000	1.238
+++ server.c	16 Sep 2002 20:42:17 -0000	1.239
@@ -691,10 +691,10 @@
 		
 		if (new_conv && (sound_options & OPT_SOUND_FIRST_RCV))
 			play_sound(SND_FIRST_RECEIVE);
-		else if (cnv && cnv->makesound)
+		else if (new_conv || cnv->makesound)
 			play_sound(SND_RECEIVE);
 		
-		if (away_options & OPT_AWAY_QUEUE_UNREAD && !find_conversation(name)) {
+		if (away_options & OPT_AWAY_QUEUE_UNREAD && !find_conversation(name) && docklet_count) {
 			/* We're gonna queue it up and wait for the user to ask for it... probably
 			 * by clicking the docklet or windows tray icon. */
 			struct queued_message *qm;

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- ui.h	16 Sep 2002 08:35:24 -0000	1.54
+++ ui.h	16 Sep 2002 20:42:17 -0000	1.55
@@ -276,6 +276,7 @@
 extern GtkWidget *buddies;
 extern GtkWidget *bpmenu;
 extern GtkWidget *blist;
+extern int docklet_count;
 
 /* Globals in buddy_chat.c */
 extern GList *chats;	/* list of all chats (only use for tabbing!) */

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.49,1.50

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

Update of /cvsroot/gaim/gaim/src/protocols/yahoo
In directory usw-pr-cvs1:/tmp/cvs-serv12140/src/protocols/yahoo

Modified Files:
	yahoo.c 
Log Message:
some memleak fixes.


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- yahoo.c	14 Sep 2002 07:28:10 -0000	1.49
+++ yahoo.c	16 Sep 2002 19:50:52 -0000	1.50
@@ -826,6 +826,8 @@
 		
 		yahoo_send_packet(yd, pack);
 		
+		g_free(result6);
+		g_free(result96);
 		g_free(password_hash);
 		g_free(crypt_hash);
 		g_free(hash_string_p);

[Gaim-commits] CVS: gaim/src dialogs.c,1.337,1.338 server.c,1.237,1.238

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

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

Modified Files:
	dialogs.c server.c 
Log Message:
some memleak fixes.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -d -r1.337 -r1.338
--- dialogs.c	16 Sep 2002 07:04:55 -0000	1.337
+++ dialogs.c	16 Sep 2002 19:50:52 -0000	1.338
@@ -593,6 +593,7 @@
 	}
 	if (filename) {
 		img = gtk_image_new_from_file(filename);
+		g_free(filename);
 		gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
 	}
 	d = gtk_dialog_new_with_buttons("", NULL, GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- server.c	16 Sep 2002 18:13:45 -0000	1.237
+++ server.c	16 Sep 2002 19:50:52 -0000	1.238
@@ -691,7 +691,7 @@
 		
 		if (new_conv && (sound_options & OPT_SOUND_FIRST_RCV))
 			play_sound(SND_FIRST_RECEIVE);
-		else if (cnv->makesound)
+		else if (cnv && cnv->makesound)
 			play_sound(SND_RECEIVE);
 		
 		if (away_options & OPT_AWAY_QUEUE_UNREAD && !find_conversation(name)) {

[Gaim-commits] CVS: gaim/src prefs.c,1.251,1.252

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

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

Modified Files:
	prefs.c 
Log Message:
Patrick Aussems patched up some minor prefs.c memleaks.


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -d -r1.251 -r1.252
--- prefs.c	16 Sep 2002 05:53:20 -0000	1.251
+++ prefs.c	16 Sep 2002 18:14:39 -0000	1.252
@@ -858,6 +858,8 @@
 
 	sound_options_new ^= sounds[soundnum].opt;
 	gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, sound_options_new & sounds[soundnum].opt, -1);
+
+	gtk_tree_path_free(path);
 }
 
 static void test_sound(GtkWidget *button, gpointer i_am_NULL)
@@ -1018,6 +1020,7 @@
 			  G_CALLBACK(event_toggled), event_store);
 	path = gtk_tree_path_new_first();
 	gtk_tree_selection_select_path(sel, path);
+	gtk_tree_path_free(path);
 
 	col = gtk_tree_view_column_new_with_attributes ("Play",
 							rend,
@@ -1100,6 +1103,7 @@
 	gtk_list_store_remove(GTK_LIST_STORE(ts), &iter);
 	path = gtk_tree_path_new_first();
 	gtk_tree_selection_select_path(sel, path);
+	gtk_tree_path_free(path);
 }
 
 GtkWidget *away_message_page() {
@@ -1112,7 +1116,6 @@
 	GtkCellRenderer *rend;
 	GtkTreeViewColumn *col;
 	GtkTreeSelection *sel;
-	GtkTreePath *path;
 	GSList *awy = away_messages;
 	struct away_message *a;
 	GtkWidget *sw2;
@@ -1163,7 +1166,6 @@
 	gaim_setup_imhtml(away_text);
 	gtk_imhtml_set_defaults(GTK_IMHTML(away_text), NULL, NULL, NULL);
 	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (event_view));
-	path = gtk_tree_path_new_first();
 	g_signal_connect (G_OBJECT (sel), "changed",
 			  G_CALLBACK (away_message_sel),
 			  NULL);

[Gaim-commits] CVS: gaim/src server.c,1.236,1.237

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

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

Modified Files:
	server.c 
Log Message:
Play the sounds even if we're queuing them up.  This way at least we'll
know you have a message waiting.



Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- server.c	16 Sep 2002 08:35:24 -0000	1.236
+++ server.c	16 Sep 2002 18:13:45 -0000	1.237
@@ -688,6 +688,12 @@
 		/* we're not away. this is easy. if the convo window doesn't exist, create and update
 		 * it (if it does exist it was updated earlier), then play a sound indicating we've
 		 * received it and then display it. easy. */
+		
+		if (new_conv && (sound_options & OPT_SOUND_FIRST_RCV))
+			play_sound(SND_FIRST_RECEIVE);
+		else if (cnv->makesound)
+			play_sound(SND_RECEIVE);
+		
 		if (away_options & OPT_AWAY_QUEUE_UNREAD && !find_conversation(name)) {
 			/* We're gonna queue it up and wait for the user to ask for it... probably
 			 * by clicking the docklet or windows tray icon. */
@@ -705,11 +711,7 @@
 				cnv = new_conversation(name);
 				set_convo_gc(cnv, gc);
 			}
-			if (new_conv && (sound_options & OPT_SOUND_FIRST_RCV))
-				play_sound(SND_FIRST_RECEIVE);
-			else if (cnv->makesound)
-				play_sound(SND_RECEIVE);
-			
+						
 			set_convo_name(cnv, name);
 			
 			write_to_conv(cnv, message, away | WFLAG_RECV, NULL, mtime, len);

[Gaim-commits] CVS: gaim/plugins/docklet .cvsignore,NONE,1.1

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

Update of /cvsroot/gaim/gaim/plugins/docklet
In directory usw-pr-cvs1:/tmp/cvs-serv23516/plugins/docklet

Added Files:
	.cvsignore 
Log Message:
I wonder why this didn't work last time.  I'm always doing that.


--- NEW FILE: .cvsignore ---
.deps
.libs
Makefile
Makefile.in
docklet.la
docklet.lo
eggtrayicon.lo

[Gaim-commits] CVS: gaim/src buddy.c,1.330,1.331

[Luke S. <lsc...@us...>]

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

Modified Files:
	buddy.c 
Log Message:
2 printf's in buddy.c should be debug_printfs


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -d -r1.330 -r1.331
--- buddy.c	16 Sep 2002 08:35:18 -0000	1.330
+++ buddy.c	16 Sep 2002 15:09:13 -0000	1.331
@@ -2057,14 +2057,14 @@
 
 void docklet_add() {
 	docklet_count++;
-	printf("docklet_count: %d\n",docklet_count);
+	debug_printf("docklet_count: %d\n",docklet_count);
 }
 
 void docklet_remove() {
 	if (docklet_count) {
 		docklet_count--;
 	}
-	printf("docklet_count: %d\n",docklet_count);
+	debug_printf("docklet_count: %d\n",docklet_count);
 	if (!docklet_count) {
 		if (connections) {
 			unhide_buddy_list();

[Gaim-commits] CVS: gaim/pixmaps msgunread.png,NONE,1.1

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

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

Added Files:
	msgunread.png 
Log Message:
plus the icon.


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


T¢s5"QÈǬR(·
Kkš[tbËgͺùI«ý«Ï™f FàK@
PÑ}}V¯Hb¶’Àúï>¼tõ捭w©x;*ց²Ú€8
]
TâFˆ÷¢bסbKC,	–X
ø‹õjeÜ¢¸
˜ÌÚ¢ë& a»¤Zü¦,{x˜ßN77§Tl.*¶e_‡²»QvʚvÊÊ ìf –E*¡âôÑt
i ´
véáDî';¬Ó“““ÁgîYÜ}ËâÚܵŠÝŸ|¬¶Ãä¡´®D ÇT}Â{¦Ól	Ü|º”}þ±}•À›°öì;›;9’õ=¯’ò½RB~LkG­Zî¶uÎ
R­^jy×¦¬vs¦”çÅžûÚKÁ^BY}(FáBt.z†Æ”ºhÌz#ûö·ÿæCvêCܶª¸2¨þšU+ZWh'öÄÕ/@ÄGü0%
V;j.:È¢ŒƒeDûˆIŒoOÀ3WÀ„¹¯=

iҁzNȺ¬¨EÄêÅF3݊¼ª*dâVÞNíÇ;šÃäëŠä#|gPÄA5|§€øð}LÕ +]–P•Ö¿,ø¥¸¸¡©1a•om|_C*„M¯I¦¥Å¡ð«¦Õ•	”ªZ‰
*
ÂE¹
ãîĖӸ5í;˜šCPö1žF‚0!pÁ¸TÀ«:J›[ç1—°…Ò8êƦ*¡s+EçjDÐôe	(¥uu6¿þ‘U™ãk×.ψ€ç@<ñ¸}[k&q@Y¬83æ9ÊLДŽƒ[E×\ŒT5~É”/Š‚_Û)RÒ¨*\Ÿ&5#õ2٘23»Ø.Ó
à˗Ѷ¶yÙRy²ý¯_æ¯[vˆ©a¨ù°y¬þªŽ?ñ3³ð£ÖȾqÂÌIŽP.•¸µ»Âõí*
AÙà•ÃEkÐ5A;á¼j
Ú<·uÐÆ IÂ^P…‹;õºßh5/Q£*‘HljiiY¾yóæ§R©L&“ɸ®ŸŸèÌØ»—ÝÓ=d­lƒDrEøñPË¿ÌÇÖÿŽùÀõՒ%KÔþy+ùÏqï:C»-˜²àV]ÓÅD)#&œy@¹ŽŸÚÆëÀB{éæ}.º'”ÔÓŒ‹FìøÇG}ôƒétú’OœœàûOý9Þ俳0O¾	]·þú¥/qóMˬL&C.—ãàÀaœQ́ùªB¬n^ð\XõWa%2uÓt%i;ï2?\opÅ	•i½Áõž:[)õ¹õë× ™L’L^¼žæ´&é]z'Ûö楝C,_û
>ï±èú…$	^~ùe|ðA¶¿þ:ó2†EM†£°«Bµ{NÊԃ¯1øÄö={€ãoœ¢tC+©ùM¤µøázØ[ Hèê¥Ô#¬4
%ór°'''oêëëûèùóç T*‘J¥hjj²,2M6íV3ÿº³þεtu. ™LòÌ3ÏðÐCqóÍ7ÓÓÓCñÂËZ,°\xòM~â
>g@vÒÃûÅ)Îï=GqÓ"z¥iùé	+L9êGÀkL/ÚË®
;‹5ÝÿýŸ½ûî»­ññq<Èk¯½Æ¡C‡ð}Ÿtº‰žž,îí!™HP(xüñÇÙºu+kÖ¬á¾ûîCkÍþ½»XÚd˜oÁW^‘áãJƒC°"p
˜Ìº$|œ¡Otó¦ñ_å˜*ä	åD½CáEpޗ€ˆHOOÏç7nÜØÔÛÛËÒ¥K‰Åbô÷÷³}ûvŽ;F6›`bb‚­[·òæ›o²råJ6lØ@oo/"«¯¾Ê¢tÀ¡°ŠÓ„¦älôžúZ%Ìõ
9/Ÿá̦…,i·±ßžbnø~½tÖ¢ëËv'b™Læü¾}ûFù¾ï“L&¹ãŽ;˜7oÃÃÃd2Ν;ǶmÛ8uêŽã°eËZ[[Éçócèíí%ÝÔÊÑññàç	máY¦7©:ø"a•)ÿf`óßæ¹­á‹œ 
tDQ3„‹·q17Jéiù|¾ØÝÝ=P*•V577S.—ÑZ“L&Y·n‰D‚‰‰	.\¸ÀØØñxœ®®.âñ8¹\Žl6K*•¢m~7o/Fi°?š5©FÀ§+EŸÿHÃç¶ìã§pÓ/Ç9}cZ5î—4}c
¥SSSchkk£¥¥ß÷ÑZãº.mmmضM?‚…e@ö3­W겁ŸŒˆÔN-/å\ýê×E‘š"ÜØêº.îX_…€çy»víªöõõ5W«U‚  ¹¹™J¥‚ëºX–…1†X,†ÖšjµÊØØ£££ŒŒŒÈÞ½{åȑ#ŽˆŒF3|.zQ"šéb¬ž>²ø$÷„£„¦EÚF‹÷èD\
:xð`Xâ8λ%Ô²,Òé4Õj•\.DZcÇ8~ü¸ô÷÷›¡¡!'›ÍNø¾Vk}’pq€QÂ<ÎD¡÷£ˆ	åB#("`„ùž"ü™©aÓÑõÌï_LÀ3¾sçÎSÅbqIgg'¾ï“Íf9tè¼ýöÛþñãÇkÙlvJk}6‚a’x†Pê¢՘ÞQ5¦Uä̝ٴªW,›‹7¶÷îÌAà͝;wÏ/¼°Þ÷}¶mÛæ8p zæ̙qß÷ÏA0
>G¸H§¢-¦DÝ=)¦«GcûÃçâR8Hx]¸ù\¬Hg6¹Þÿ
E7NOtr

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

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

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

Modified Files:
	POTFILES.in 
Log Message:
Rob McQueen added a mute feature to his nice little docklet.  I added a 
queuing feature.  Configure the docklet in the plugins dialog to queue 
unread messages, and when you receive a message the docklet will eat it up
and show a little message pending icon.  Click on it, and read your message.

ICQ people will like it.

I also made plugin_event use a va_list.

I bet this breaks perl.


Index: POTFILES.in
===================================================================
RCS file: /cvsroot/gaim/gaim/po/POTFILES.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- POTFILES.in	26 Aug 2002 03:36:26 -0000	1.15
+++ POTFILES.in	16 Sep 2002 08:35:16 -0000	1.16
@@ -1,3 +1,4 @@
+plugins/docklet/docklet.c
 plugins/chatlist.c
 plugins/gtik.c
 src/protocols/gg/gg.c

[Gaim-commits] CVS: gaim/plugins/docklet docklet.c,1.4,1.5

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

Update of /cvsroot/gaim/gaim/plugins/docklet
In directory usw-pr-cvs1:/tmp/cvs-serv22869/plugins/docklet

Modified Files:
	docklet.c 
Log Message:
Rob McQueen added a mute feature to his nice little docklet.  I added a 
queuing feature.  Configure the docklet in the plugins dialog to queue 
unread messages, and when you receive a message the docklet will eat it up
and show a little message pending icon.  Click on it, and read your message.

ICQ people will like it.

I also made plugin_event use a va_list.

I bet this breaks perl.


Index: docklet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/docklet/docklet.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- docklet.c	15 Sep 2002 15:46:06 -0000	1.4
+++ docklet.c	16 Sep 2002 08:35:16 -0000	1.5
@@ -23,9 +23,7 @@
     - don't crash when the plugin gets unloaded (it seems to crash after
        the plugin has gone, when gtk updates the button in the plugins
        dialog. backtrace is always useless. weird)
-    - have a toggle on the menu to mute all Gaim sounds
     - handle and update tooltips to show your current accounts
-    - connecting status support (needs more fruxing with the core)
     - dernyi's account status menu in the right click
     - store icons in gtk2 stock icon thing (needs doing for the whole prog)
     - pop up notices when GNOME2's system-tray-applet supports it, with a
@@ -34,17 +32,16 @@
 /* includes */
 #define GAIM_PLUGINS
 #include <gtk/gtk.h>
+#include <fcntl.h>
 #include "gaim.h"
 #include "eggtrayicon.h"
 
-/* macros */
-#define DOCKLET_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED)
-
 /* types */
 enum docklet_status {
 	online,
 	away,
 	away_pending,
+	unread_pending,
 	connecting,
 	offline
 };
@@ -56,6 +53,7 @@
 static EggTrayIcon *docklet = NULL;
 static GtkWidget *icon;
 static enum docklet_status status;
+static GtkWidget *configwin = NULL;
 
 static void docklet_embedded(GtkWidget *widget, void *data) {
 	debug_printf("Docklet: embedded\n");
@@ -68,35 +66,17 @@
 	docklet_create();
 }
 
-static void docklet_toggle() {
-	/* this looks bad, but we need to use (un)hide_buddy_list to allow buddy.c to
-	   correctly hide/iconify depending on the docklet refcount, and to reposition
-	   the blist for us when we unhide. no such constraint for the login window
-	   because nothing else needs a unified way to hide/iconify it. otherwise I'd
-	   make a function and use it for both. */
-	if (connections) {
-		if (GTK_WIDGET_VISIBLE(blist)) {
-			if (DOCKLET_WINDOW_ICONIFIED(blist)) {
-				unhide_buddy_list();
-			} else {
-				hide_buddy_list();
-			}
-		} else {
-			unhide_buddy_list();
-		}
-	} else {
-		if (GTK_WIDGET_VISIBLE(mainwindow)) {
-			if (DOCKLET_WINDOW_ICONIFIED(mainwindow)) {
-				gtk_window_present(GTK_WINDOW(mainwindow));
-			} else {
-				gtk_widget_hide(mainwindow);
-			}
-		} else {
-			gtk_window_present(GTK_WINDOW(mainwindow));
-		}
-	}
+ 
+static void docklet_mute(GtkWidget *toggle, void *data) {
+       mute_sounds = GTK_CHECK_MENU_ITEM(toggle)->active;
+       if (mute_sounds) {
+	       debug_printf("Docklet: sounds muted\n");
+       } else {
+               debug_printf("Docklet: sounds unmuted\n");
+       }
 }
 
+
 static void docklet_menu(GdkEventButton *event) {
 	static GtkWidget *menu = NULL;
 	GtkWidget *entry;
@@ -154,6 +134,11 @@
 	entry = gtk_separator_menu_item_new();
 	gtk_menu_append(GTK_MENU(menu), entry);
 
+	entry = gtk_check_menu_item_new_with_label(_("Mute Sounds"));
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(entry), mute_sounds);
+	g_signal_connect(GTK_WIDGET(entry), "toggled", G_CALLBACK(docklet_mute), NULL);
+	gtk_menu_append(GTK_MENU(menu), entry);
+
 	entry = gtk_menu_item_new_with_label(_("Accounts"));
 	g_signal_connect(GTK_WIDGET(entry), "activate", G_CALLBACK(account_editor), NULL);
 	gtk_menu_append(GTK_MENU(menu), entry);
@@ -184,7 +169,13 @@
 static void docklet_clicked(GtkWidget *button, GdkEventButton *event, void *data) {
 	switch (event->button) {
 		case 1:
-			docklet_toggle();
+			if (unread_message_queue) {
+ 				purge_away_queue(unread_message_queue);
+				unread_message_queue=NULL;
+				docklet_update_status();
+			}
+			else
+				docklet_toggle();
 			break;
 		case 2:
 			break;
@@ -208,8 +199,12 @@
 		case away_pending:
 			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "msgpend.png", NULL);
 			break;
+	        case unread_pending:
+			/* XXX MAKE ME BLINK! */
+			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "msgunread.png", NULL);
+			break;
 		case connecting:
-			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "connecting.png", NULL);
+			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "connect.png", NULL);
 			break;
 		case offline:
 			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "offline.png", NULL);
@@ -239,7 +234,9 @@
 	oldstatus = status;
 
 	if (connections) {
-		if (awaymessage) {
+		if (unread_message_queue) {
+			status = unread_pending;
+		} else if (awaymessage) {
 			if (message_queue) {
 				status = away_pending;
 			} else {
@@ -249,7 +246,11 @@
 			status = online;
 		}
 	} else {
-		status = offline;
+		if (connecting_count) {
+			status = connecting;
+		} else {
+			status = offline;
+		}
 	}
 
 	if (status != oldstatus) {
@@ -339,6 +340,33 @@
 
 	return NULL;
 }
+
+static void toggle_queue (GtkWidget *w, void *null) {
+	away_options ^= OPT_AWAY_QUEUE_UNREAD;
+	save_prefs();
+}
+	
+void gaim_plugin_config() {
+	/* This is the sorriest dialog ever written ever */
+	/* It's a good thing I plan on rewriting it later tonight */
+	GtkWidget *button;
+	GtkWidget *vbox;
+
+	if (configwin) return;
+	GAIM_DIALOG(configwin);
+
+	vbox = gtk_vbox_new(0, 6);
+	gtk_container_add(GTK_CONTAINER(configwin), vbox);
+	gtk_window_set_title(GTK_WINDOW(configwin), "Docklet Configuration");
+	
+	button = gtk_check_button_new_with_mnemonic("_Hide new messages until docklet is clicked");
+	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), away_options & OPT_AWAY_QUEUE_UNREAD);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_queue), NULL);
+	gtk_box_pack_end(GTK_BOX(vbox), button, 0, 0, 0);
+
+	gtk_widget_show_all(configwin);
+}
+
 
 void gaim_plugin_remove() {
 	if (GTK_WIDGET_VISIBLE(docklet)) {

[Gaim-commits] CVS: gaim/plugins SIGNALS,1.30,1.31

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

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

Modified Files:
	SIGNALS 
Log Message:
Rob McQueen added a mute feature to his nice little docklet.  I added a 
queuing feature.  Configure the docklet in the plugins dialog to queue 
unread messages, and when you receive a message the docklet will eat it up
and show a little message pending icon.  Click on it, and read your message.

ICQ people will like it.

I also made plugin_event use a va_list.

I bet this breaks perl.


Index: SIGNALS
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/SIGNALS,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- SIGNALS	28 Aug 2002 08:13:58 -0000	1.30
+++ SIGNALS	16 Sep 2002 08:35:14 -0000	1.31
@@ -29,6 +29,7 @@
 	event_chat_send_invite,
 	event_got_typing,
 	event_del_conversation,
+	event_connecting,
 };
 
 To add a signal handler, call the fuction gaim_signal_connect with the
@@ -295,7 +296,7 @@
 	won't be displayed at all.
 
 event_im_displayed_rcvd:
-	struct gaim_connection *gc, char *who, char *what, guint32 flags
+	struct gaim_connection *gc, char *who, char *what, guint32 flags, time_t time
 
 	This is called after what you receive is displayed. This is useful
 	for displaying an autoresponse after the message that triggered it.
@@ -306,6 +307,8 @@
 	'who' is who sent the message.
 	'what' is what was sent.
 	'flags' is flags on the message.
+	'time' is the time the message was received--it may be very different from the
+	 time this signal gets called
 
 event_chat_send_invite:
 	struct gaim_connection *gc, int id, char *who, char **msg
@@ -332,6 +335,7 @@
 
 	'gc' 	is the connection the typing is sent to.
 	'who' 	is the person typing to you.
+
 event_del_conversation:
 	struct conversation *c
 
@@ -341,3 +345,15 @@
 	anything.
 
 	'c'	is he conversation being closed.
+	
+event_connecting
+	struct aim_user *u
+
+	This is called when Gaim attempts to bring a user on-line. The
+	boolean u->connecting is set to true, and a global counter
+	incremented. The attempt can end with event_signon or event_signoff
+	being called, depending upon whether the attempt was a sucess or
+	a failure. In both cases, u->connecting is set to false and the
+	counter decremented.
+	
+	'u'	is the account being connected

[Gaim-commits] CVS: gaim/pixmaps Makefile.am,1.76,1.77

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

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

Modified Files:
	Makefile.am 
Log Message:
Rob McQueen added a mute feature to his nice little docklet.  I added a 
queuing feature.  Configure the docklet in the plugins dialog to queue 
unread messages, and when you receive a message the docklet will eat it up
and show a little message pending icon.  Click on it, and read your message.

ICQ people will like it.

I also made plugin_event use a va_list.

I bet this breaks perl.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- Makefile.am	30 Aug 2002 03:13:59 -0000	1.76
+++ Makefile.am	16 Sep 2002 08:35:13 -0000	1.77
@@ -133,7 +133,7 @@
 gaimdialogpix_DATA = gaim_error.png gaim_info.png gaim_question.png gaim_warning.png
 
 gaimdistpixdir = $(datadir)/pixmaps/gaim
-gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png
+gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png
 
 distpixmapdir = $(datadir)/pixmaps
 distpixmap_DATA = gaim.png

[Gaim-commits] CVS: gaim ChangeLog,1.545,1.546 TODO,1.129,1.130

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

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

Modified Files:
	ChangeLog TODO 
Log Message:
Rob McQueen added a mute feature to his nice little docklet.  I added a 
queuing feature.  Configure the docklet in the plugins dialog to queue 
unread messages, and when you receive a message the docklet will eat it up
and show a little message pending icon.  Click on it, and read your message.

ICQ people will like it.

I also made plugin_event use a va_list.

I bet this breaks perl.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.545
retrieving revision 1.546
diff -u -d -r1.545 -r1.546
--- ChangeLog	14 Sep 2002 16:37:24 -0000	1.545
+++ ChangeLog	16 Sep 2002 08:35:12 -0000	1.546
@@ -23,7 +23,7 @@
 	  Uekawa)
 	* Optionally uniquely colorize nicks in chats
 	* Changed some default options
-	* Updated desktop icon.
+	* Updated desktop and window icons (Thanks Robert McQueen)
 	* GTK2 Goodness:
 		- Preferences dialog
 		- Plugins dialog (Ari Pollak)
@@ -70,7 +70,10 @@
 	* /topic with no argument displays the current topic (Thanks Mark 
 	  Doliner)
 	* i18n fixes (Thanks Matt Wilson)
-	* Changed Ctrl-C color binding to Ctrl-K
+	* Changed Ctrl-C color removed
+	* Docklet plugin--replaces the old GNOME applet.  You'll need the
+	  Panel Notification Area applet for GNOME 2, or the patch from
+	  RedHat for KDE 3. (Thanks Robert McQueen)
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

Index: TODO
===================================================================
RCS file: /cvsroot/gaim/gaim/TODO,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- TODO	7 Mar 2002 20:57:16 -0000	1.129
+++ TODO	16 Sep 2002 08:35:12 -0000	1.130
@@ -1,6 +1,5 @@
 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,

[Gaim-commits] CVS: gaim/src aim.c,1.195,1.196 away.c,1.73,1.74 buddy.c,1.329,1.330 buddy_chat.c,1.158,1.159 conversation.c,1.376,1.377 core.h,1.25,1.26 gaim.h,1.336,1.337 idle.c,1.32,1.33 module.c,1.20,1.21 multi.c,1.128,1.129 multi.h,1.41,1.42 perl.c,1.76,1.77 server.c,1.235,1.236 ui.h,1.53,1.54

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

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

Modified Files:
	aim.c away.c buddy.c buddy_chat.c conversation.c core.h gaim.h 
	idle.c module.c multi.c multi.h perl.c server.c ui.h 
Log Message:
Rob McQueen added a mute feature to his nice little docklet.  I added a 
queuing feature.  Configure the docklet in the plugins dialog to queue 
unread messages, and when you receive a message the docklet will eat it up
and show a little message pending icon.  Click on it, and read your message.

ICQ people will like it.

I also made plugin_event use a va_list.

I bet this breaks perl.


Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- aim.c	14 Sep 2002 23:27:26 -0000	1.195
+++ aim.c	16 Sep 2002 08:35:17 -0000	1.196
@@ -63,6 +63,7 @@
 GSList *away_messages = NULL;
 GList *conversations = NULL;
 GSList *message_queue = NULL;
+GSList *unread_message_queue = NULL;
 GSList *away_time_queue = NULL;
 
 GtkWidget *mainwindow = NULL;
@@ -98,7 +99,7 @@
 {
 #ifdef GAIM_PLUGINS
 	/* first we tell those who have requested it we're quitting */
-	plugin_event(event_quit, 0, 0, 0, 0);
+	plugin_event(event_quit);
 
 	/* then we remove everyone in a mass suicide */
 	remove_all_plugins();

Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- away.c	15 Sep 2002 15:46:06 -0000	1.73
+++ away.c	16 Sep 2002 08:35:17 -0000	1.74
@@ -53,15 +53,15 @@
 	imaway = NULL;
 }
 
-void purge_away_queue()
+void purge_away_queue(GSList *queue)
 {
 	struct conversation *cnv;
 
 	gtk_clist_freeze(GTK_CLIST(clistqueue));
 	gtk_clist_clear(GTK_CLIST(clistqueue));
 
-	while (message_queue) {
-		struct queued_message *qm = message_queue->data;
+	while (queue) {
+		struct queued_message *qm = queue->data;
 
 		cnv = find_conversation(qm->name);
 		if (!cnv)
@@ -70,7 +70,7 @@
 			set_convo_gc(cnv, qm->gc);
 		write_to_conv(cnv, qm->message, qm->flags, NULL, qm->tm, qm->len);
 
-		message_queue = g_slist_remove(message_queue, qm);
+		queue = g_slist_remove(queue, qm);
 
 		g_free(qm->message);
 		g_free(qm);
@@ -134,7 +134,7 @@
 	} else {
 		gtk_widget_hide(clistqueue);
 		gtk_widget_hide(clistqueuesw);
-		purge_away_queue();
+		purge_away_queue(message_queue);
 	}
 }
 
@@ -143,7 +143,7 @@
 	if (imaway) {
 		GtkWidget *tmp = imaway;
 
-		purge_away_queue();
+		purge_away_queue(message_queue);
 
 		imaway = NULL;
 		gtk_widget_destroy(tmp);

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -d -r1.329 -r1.330
--- buddy.c	14 Sep 2002 23:27:26 -0000	1.329
+++ buddy.c	16 Sep 2002 08:35:18 -0000	1.330
@@ -110,8 +110,7 @@
 };
 static GSList *shows = NULL;
 
-static gboolean blist_hidden;
-static int docklet_refcount = 0;
+static int docklet_count = 0;
 
 /* Predefine some functions */
 static void new_bp_callback(GtkWidget *w, struct buddy *bs);
@@ -703,7 +702,7 @@
 		}
 
 		/* we send the menu widget so we can add menuitems within a plugin */
-		plugin_event(event_draw_menu, menu, b->name, 0, 0);
+		plugin_event(event_draw_menu, menu, b->name);
 
 		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
 
@@ -1400,7 +1399,7 @@
 void do_quit()
 {
 	/* first we tell those who have requested it we're quitting */
-	plugin_event(event_quit, 0, 0, 0, 0);
+	plugin_event(event_quit);
 
 	signoff_all();
 #ifdef GAIM_PLUGINS
@@ -1993,10 +1992,39 @@
 	return g;
 }
 
+
+void docklet_toggle() {
+	/* Useful for the docklet plugin and also for the win32 tray icon*/
+	/* This is called when one of those is clicked--it will show/hide the 
+	   buddy list/login window--depending on which is active */
+	if (connections) {
+		if (GTK_WIDGET_VISIBLE(blist)) {
+			if (DOCKLET_WINDOW_ICONIFIED(blist)) {
+				unhide_buddy_list();
+			} else {
+				hide_buddy_list();
+			}
+		} else {
+			unhide_buddy_list();
+		}
+	} else {
+		if (GTK_WIDGET_VISIBLE(mainwindow)) {
+			if (DOCKLET_WINDOW_ICONIFIED(mainwindow)) {
+				gtk_window_present(GTK_WINDOW(mainwindow));
+			} else {
+				gtk_widget_hide(mainwindow);
+			}
+		} else {
+			gtk_window_present(GTK_WINDOW(mainwindow));
+		}
+	}
+}
+
+
 /* used by this file, and by iconaway.so */
 void hide_buddy_list() {
 	if (blist) {
-		if (!connections || docklet_refcount) {
+		if (!connections || docklet_count) {
 			gtk_widget_hide(blist);
 		} else {
 			gtk_window_iconify(GTK_WINDOW(blist));
@@ -2020,7 +2048,7 @@
 
 /* for the delete_event handler */
 static void close_buddy_list() {
-	if (docklet_refcount) {
+	if (docklet_count) {
 		hide_buddy_list();
 	} else {
 		do_quit();
@@ -2028,16 +2056,16 @@
 }
 
 void docklet_add() {
-	docklet_refcount++;
-	printf("docklet_refcount: %d\n",docklet_refcount);
+	docklet_count++;
+	printf("docklet_count: %d\n",docklet_count);
 }
 
 void docklet_remove() {
-	if (docklet_refcount) {
-		docklet_refcount--;
+	if (docklet_count) {
+		docklet_count--;
 	}
-	printf("docklet_refcount: %d\n",docklet_refcount);
-	if (!docklet_refcount) {
+	printf("docklet_count: %d\n",docklet_count);
+	if (!docklet_count) {
 		if (connections) {
 			unhide_buddy_list();
 		} else {

Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- buddy_chat.c	30 Aug 2002 03:14:00 -0000	1.158
+++ buddy_chat.c	16 Sep 2002 08:35:20 -0000	1.159
@@ -955,7 +955,7 @@
 	char tmp[BUF_LONG];
 	int pos;
 
-	plugin_event(event_chat_buddy_join, b->gc, (void *)b->id, name, 0);
+	plugin_event(event_chat_buddy_join, b->gc, b->id, name);
 	b->in_room = g_list_insert_sorted(b->in_room, name, insertname);
 	pos = g_list_index(b->in_room, name);
 
@@ -1048,7 +1048,7 @@
 
 	char tmp[BUF_LONG];
 
-	plugin_event(event_chat_buddy_leave, b->gc, (void *)b->id, buddy, 0);
+	plugin_event(event_chat_buddy_leave, b->gc, b->id, buddy);
 
 	while (names) {
 		if (!g_strcasecmp((char *)names->data, buddy)) {

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -d -r1.376 -r1.377
--- conversation.c	14 Sep 2002 16:37:24 -0000	1.376
+++ conversation.c	16 Sep 2002 08:35:20 -0000	1.377
@@ -194,7 +194,7 @@
 	update_icon(c);
 	update_checkbox(c);
 	update_smilies(c);
-	plugin_event(event_new_conversation, name, 0, 0, 0);
+	plugin_event(event_new_conversation, name);
 	return c;
 }
 
@@ -259,7 +259,7 @@
 
 void delete_conversation(struct conversation *c)
 {
-	plugin_event(event_del_conversation, c, 0, 0, 0);
+	plugin_event(event_del_conversation, c);
 	conversations = g_list_remove(conversations, c);
 	if (c->fg_color_dialog)
 		gtk_widget_destroy(c->fg_color_dialog);
@@ -949,13 +949,6 @@
 				toggle_font(c->font, c);
 				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 				break;
-			case 'k':
-			case 'K':
-				quiet_set(c->fgcolorbtn,
-					  !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->fgcolorbtn)));
-				toggle_fg_color(c->fgcolorbtn, c);
-				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
-				break;
 			}
 		}
 		if (convo_options & OPT_CONVO_CTL_SMILEYS) {
@@ -1188,7 +1181,7 @@
 		enum gaim_event evnt = c->is_chat ? event_chat_send : event_im_send;
 		int plugin_return = plugin_event(evnt, c->gc,
 						 c->is_chat ? (void *)c->id : c->name,
-						 &buffy, 0);
+						 &buffy);
 		if (!buffy) {
 			g_free(buf2);
 			g_free(buf);
@@ -1210,7 +1203,7 @@
 		gboolean binary = FALSE;
 
 		buffy = g_strdup(buf);
-		plugin_event(event_im_displayed_sent, c->gc, c->name, &buffy, 0);
+		plugin_event(event_im_displayed_sent, c->gc, c->name, &buffy);
 		if (buffy) {
 			int imflags = 0;
 			if (c->check && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->check)))

Index: core.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- core.h	14 Sep 2002 23:27:27 -0000	1.25
+++ core.h	16 Sep 2002 08:35:21 -0000	1.26
@@ -26,6 +26,7 @@
 #include <config.h>
 #endif
 
+#include <sys/types.h>
 #ifdef HAVE_ICONV
 #include <iconv.h>
 #endif
@@ -189,7 +190,7 @@
 #ifdef USE_PERL
 extern void perl_autoload();
 extern void perl_end();
-extern int perl_event(enum gaim_event, void *, void *, void *, void *);
+extern int perl_event(enum gaim_event, void *, void *, void *, void *, void *);
 extern int perl_load_file(char *);
 extern void unload_perl_scripts();
 extern void list_perl_scripts();
@@ -205,7 +206,7 @@
 extern void gaim_plugin_unload(GModule *);
 extern void remove_all_plugins();
 #endif
-extern int plugin_event(enum gaim_event, void *, void *, void *, void *);
+extern int plugin_event(enum gaim_event, ...);
 extern char *event_name(enum gaim_event);
 
 /* Functions in server.c */

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -d -r1.336 -r1.337
--- gaim.h	10 Sep 2002 15:31:33 -0000	1.336
+++ gaim.h	16 Sep 2002 08:35:21 -0000	1.337
@@ -333,12 +333,14 @@
 #define OPT_AWAY_NO_AUTO_RESP		0x00000010
 #define OPT_AWAY_QUEUE			0x00000020
 #define OPT_AWAY_IDLE_RESP		0x00000040
+#define OPT_AWAY_QUEUE_UNREAD           0x00000060
 
 extern guint away_resend;
 extern int report_idle;
 extern int web_browser;
 extern GSList *aim_users;
 extern GSList *message_queue;
+extern GSList *unread_message_queue;
 extern GSList *away_time_queue;
 extern char sound_cmd[2048];
 extern char web_command[2048];
@@ -351,6 +353,7 @@
 extern void do_pounce(struct gaim_connection *, char *, int);
 void create_prpl_icon(GtkWidget *widget, struct gaim_connection *gc,
 					  GdkPixmap **pixmap, GdkBitmap **mask);
+void docklet_toggle();
 
 /* Functions in buddy_chat.c */
 extern void show_new_buddy_chat(struct conversation *);

Index: idle.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/idle.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- idle.c	28 Sep 2001 05:17:16 -0000	1.32
+++ idle.c	16 Sep 2002 08:35:22 -0000	1.33
@@ -50,7 +50,7 @@
 	/* Not idle, really...  :) */
 	update_idle_times();
 
-	plugin_event(event_blist_update, 0, 0, 0, 0);
+	plugin_event(event_blist_update);
 
 	time(&t);
 

Index: module.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/module.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- module.c	14 Sep 2002 23:27:27 -0000	1.20
+++ module.c	16 Sep 2002 08:35:23 -0000	1.21
@@ -376,144 +376,35 @@
 	return buf;
 }
 
-static void debug_event(enum gaim_event event, void *arg1, void *arg2, void *arg3, void *arg4)
-{
-	if (!opt_debug && !(misc_options & OPT_MISC_DEBUG))
-		return;
-
-	switch (event) {
-		case event_blist_update:
-			/* this happens *really* often */
-			if (opt_debug) {
-				debug_printf("%s\n", event_name(event));
-			}
-			break;
-	        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("%s: %s\n", event_name(event), (char *)arg1);
-			break;
-		case event_error:
-			debug_printf("%s: %d\n", event_name(event), (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:
-	        case event_got_typing:
-			debug_printf("%s: %s %s\n", event_name(event),
-					((struct gaim_connection *)arg1)->username, (char *)arg2);
-			break;
-		case event_chat_leave:
-			debug_printf("%s: %s %d\n", event_name(event),
-					((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 %d %s\n", event_name(event),
-					((struct gaim_connection *)arg1)->username,
-					(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),
-					((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;
-		case event_del_conversation:
-			debug_printf("%s: %s\n", event_name(event), (char *)arg1);
-			break;
-		case event_connecting:
-			debug_printf("%s: %s\n", event_name(event), ((struct aim_user *)arg1)->username);
-			break;
-		default:
-			debug_printf("%s: um, right. yeah.\n", event_name(event));
-			break;
-	}
-}
-
-int plugin_event(enum gaim_event event, void *arg1, void *arg2, void *arg3, void *arg4)
+int plugin_event(enum gaim_event event, ...)
 {
 #ifdef GAIM_PLUGINS
 	GList *c = callbacks;
 	struct gaim_callback *g;
+	va_list arrg;
+	void    *arg1 = NULL, 
+		*arg2 = NULL,
+		*arg3 = NULL, 
+		*arg4 = NULL,
+		*arg5 = NULL;
 #endif
 
-	debug_event(event, arg1, arg2, arg3, arg4);
+	debug_printf("%s\n", event_name(event));
 
 #ifdef GAIM_PLUGINS
 	while (c) {
-		void (*zero)(void *);
-		void (*one)(void *, void *);
-		void (*two)(void *, void *, void *);
-		void (*three)(void *, void *, void *, void *);
-		void (*four)(void *, void *, void *, void *, void *);
-
+		void (*cbfunc)(void *, ...);
+		
 		g = (struct gaim_callback *)c->data;
 		if (g->event == event && g->function != NULL) {
+			cbfunc=g->function;
+			va_start(arrg, event);
 			switch (event) {
 
 				/* no args */
 			case event_blist_update:
 			case event_quit:
-				zero = g->function;
-				zero(g->data);
+				cbfunc(g->data);
 				break;
 
 				/* one arg */
@@ -523,8 +414,8 @@
 			case event_del_conversation:
 			case event_error:
 			case event_connecting:
-				one = g->function;
-				one(arg1, g->data);
+				arg1 = va_arg(arrg, void *);
+				cbfunc(arg1, g->data);
 				break;
 
 				/* two args */
@@ -534,48 +425,101 @@
 			case event_buddy_back:
 			case event_buddy_idle:
 			case event_buddy_unidle:
-			case event_chat_leave:
 			case event_set_info:
 			case event_draw_menu:
 			case event_got_typing:
-				two = g->function;
-				two(arg1, arg2, g->data);
+				arg1 = va_arg(arrg, void *);
+				arg2 = va_arg(arrg, void *);
+				cbfunc(arg1, arg2, g->data);
+				break;
+			case event_chat_leave:
+				{
+					int id;
+					arg1 = va_arg(arrg, void*);
+					id = va_arg(arrg, int);
+					cbfunc(arg1, id, g->data);
+				}
 				break;
-
 				/* three args */
 			case event_im_send:
 			case event_im_displayed_sent:
-			case event_chat_join:
+			case event_away:
+				arg1 = va_arg(arrg, void *);
+				arg2 = va_arg(arrg, void *);
+				arg3 = va_arg(arrg, void *);
+				cbfunc(arg1, arg2, arg3, g->data);
+				break;
 			case event_chat_buddy_join:
 			case event_chat_buddy_leave:
 			case event_chat_send:
-			case event_away:
-			case event_back:
+			case event_chat_join:
+				{
+					int id;
+					arg1 = va_arg(arrg, void*);
+					id = va_arg(arrg, int);
+					arg3 = va_arg(arrg, void*);
+					cbfunc(arg1, id, arg3, g->data);
+				}
+				break;
 			case event_warned:
-				three = g->function;
-				three(arg1, arg2, arg3, g->data);
+				{
+					int id;
+					arg1 = va_arg(arrg, void*);
+					arg2 = va_arg(arrg, void*);
+					id = va_arg(arrg, int);
+					cbfunc(arg1, arg2, id, g->data);
+				}
 				break;
-
 				/* four args */
 			case event_im_recv:
-			case event_chat_recv:
-			case event_im_displayed_rcvd:
-			case event_chat_send_invite:
 			case event_chat_invited:
-				four = g->function;
-				four(arg1, arg2, arg3, arg4, g->data);
+				arg1 = va_arg(arrg, void *);
+				arg2 = va_arg(arrg, void *);
+				arg3 = va_arg(arrg, void *);
+				arg4 = va_arg(arrg, void *);
+				cbfunc(arg1, arg2, arg3, arg4, g->data);
 				break;
+			case event_chat_recv:
+			case event_chat_send_invite:
+				{
+					int id;
+					arg1 = va_arg(arrg, void *);
+					id = va_arg(arrg, int);
 
-			default:
+					arg3 = va_arg(arrg, void *);
+					arg4 = va_arg(arrg, void *);
+					cbfunc(arg1, id, arg3, arg4, g->data);
+				}
+				break;
+				/* five args */
+			case event_im_displayed_rcvd:
+				{
+					time_t time;
+					arg1 = va_arg(arrg, void *);
+					arg2 = va_arg(arrg, void *);
+					arg3 = va_arg(arrg, void *);
+					arg4 = va_arg(arrg, void *);
+					time = va_arg(arrg, time_t);
+					cbfunc(arg1, arg2, arg3, arg4, time, g->data);
+				}
+				break;
+				default:
 				debug_printf("unknown event %d\n", event);
 				break;
 			}
+			va_end(arrg);
 		}
 		c = c->next;
 	}
 #endif /* GAIM_PLUGINS */
 #ifdef USE_PERL
-	return perl_event(event, arg1, arg2, arg3, arg4);
+	va_start(arrg, event);
+	arg1 = va_arg(arrg, void *);
+	arg2 = va_arg(arrg, void *);
+	arg3 = va_arg(arrg, void *);
+	arg4 = va_arg(arrg, void *);
+	arg5 = va_arg(arrg, void *);
+	return perl_event(event, arg1, arg2, arg3, arg4, arg5);
 #else
 	return 0;
 #endif

Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- multi.c	14 Sep 2002 23:27:27 -0000	1.128
+++ multi.c	16 Sep 2002 08:35:23 -0000	1.129
@@ -40,6 +40,7 @@
 #define LOGIN_STEPS 5
 
 GSList *connections;
+int connecting_count = 0;
 
 static GtkWidget *acctedit = NULL;
 static GtkWidget *list = NULL;	/* the clist of names in the accteditor */
@@ -1156,7 +1157,9 @@
 	gaim_setup(gc);
 
 	gc->user->connecting = FALSE;
-	plugin_event(event_signon, gc, 0, 0, 0);
+	connecting_count--;
+		
+	plugin_event(event_signon, gc);
 	system_log(log_signon, gc, NULL, OPT_LOG_BUDDY_SIGNON | OPT_LOG_MY_SIGNON);
 
 	/* away option given? */
@@ -1445,12 +1448,15 @@
 	/* remove this here so plugins get a sensible count of connections */
 	connections = g_slist_remove(connections, gc);
 	debug_printf("date: %s\n", full_date());
-	plugin_event(event_signoff, gc, 0, 0, 0);
+	plugin_event(event_signoff, gc);
 	system_log(log_signoff, gc, NULL, OPT_LOG_BUDDY_SIGNON | OPT_LOG_MY_SIGNON);
 	/* set this in case the plugin died before really connecting.
 	   do it after calling the plugins so they can determine if
 	   this user was ever on-line or not */
-	gc->user->connecting = FALSE;
+	if (gc->user->connecting) {
+		gc->user->connecting = FALSE;
+		connecting_count--;
+	}
 	serv_close(gc);
 
 	/* more UI stuff */

Index: multi.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- multi.h	17 Mar 2002 20:23:33 -0000	1.41
+++ multi.h	16 Sep 2002 08:35:23 -0000	1.42
@@ -98,6 +98,9 @@
 /* now that we have our struct, we're going to need lots of them. Maybe even a list of them. */
 extern GSList *connections;
 
+/* number of accounts that are currently in the process of connecting */
+extern int connecting_count;
+
 struct aim_user *new_user(const char *, int, int);
 struct gaim_connection *new_gaim_conn(struct aim_user *);
 void destroy_gaim_conn(struct gaim_connection *);

Index: perl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/perl.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- perl.c	14 Sep 2002 23:27:27 -0000	1.76
+++ perl.c	16 Sep 2002 08:35:23 -0000	1.77
@@ -662,7 +662,7 @@
 	XSRETURN(0);
 }
 
-int perl_event(enum gaim_event event, void *arg1, void *arg2, void *arg3, void *arg4)
+int perl_event(enum gaim_event event, void *arg1, void *arg2, void *arg3, void *arg4, void *arg5)
 {
 	char *buf = NULL;
 	GList *handler;
@@ -754,6 +754,7 @@
 				arg2 ? escape_quotes(arg2) : "", (int)arg3);
 		break;
 	case event_quit:
+	case event_blist_update:
 		buf = g_malloc0(1);
 		break;
 	case event_new_conversation:
@@ -780,6 +781,9 @@
 		g_free(tmp3);
 		}
 		break;
+	case event_draw_menu:
+		/* we can't handle this usefully without gtk/perl bindings */
+		return 0;
 	default:
 		debug_printf("someone forgot to handle %s in the perl binding\n", event_name(event));
 		return 0;

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- server.c	14 Sep 2002 23:27:28 -0000	1.235
+++ server.c	16 Sep 2002 08:35:24 -0000	1.236
@@ -55,7 +55,8 @@
 
 		debug_printf(PACKAGE " " VERSION " logging in %s using %s\n", user->username, p->name());
 		user->connecting = TRUE;
-		plugin_event(event_connecting, user, 0, 0, 0);
+		connecting_count++;
+		plugin_event(event_connecting, user);
 		p->login(user);
 	}
 }
@@ -207,7 +208,7 @@
 
 		gc->prpl->set_away(gc, state, buf);
 
-		plugin_event(event_away, gc, state, buf, 0);
+		plugin_event(event_away, gc, state, buf);
 
 		if (buf)
 			g_free(buf);
@@ -231,7 +232,7 @@
 void serv_set_info(struct gaim_connection *g, char *info)
 {
 	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->set_info) {
-		if (plugin_event(event_set_info, g, info, 0, 0))
+		if (plugin_event(event_set_info, g, info))
 			return;
 		g->prpl->set_info(g, info);
 	}
@@ -523,7 +524,7 @@
 		buffy = g_malloc(MAX(strlen(message) + 1, BUF_LONG));
 		strcpy(buffy, message);
 		angel = g_strdup(name);
-		plugin_return = plugin_event(event_im_recv, gc, &angel, &buffy, (void *)&flags);
+		plugin_return = plugin_event(event_im_recv, gc, &angel, &buffy, &flags);
 
 		if (!buffy || !angel || plugin_return) {
 			if (buffy)
@@ -687,21 +688,34 @@
 		/* we're not away. this is easy. if the convo window doesn't exist, create and update
 		 * it (if it does exist it was updated earlier), then play a sound indicating we've
 		 * received it and then display it. easy. */
-		if (cnv == NULL) {
-			cnv = new_conversation(name);
-			set_convo_gc(cnv, gc);
+		if (away_options & OPT_AWAY_QUEUE_UNREAD && !find_conversation(name)) {
+			/* We're gonna queue it up and wait for the user to ask for it... probably
+			 * by clicking the docklet or windows tray icon. */
+			struct queued_message *qm;
+			qm = g_new0(struct queued_message, 1);
+			g_snprintf(qm->name, sizeof(qm->name), "%s", name);
+			qm->message = g_strdup(message);
+			qm->gc = gc;
+			qm->tm = mtime;
+			qm->flags = away | WFLAG_RECV;
+			qm->len = len;
+			unread_message_queue = g_slist_append(unread_message_queue, qm);
+		} else {
+			if (cnv == NULL) {
+				cnv = new_conversation(name);
+				set_convo_gc(cnv, gc);
+			}
+			if (new_conv && (sound_options & OPT_SOUND_FIRST_RCV))
+				play_sound(SND_FIRST_RECEIVE);
+			else if (cnv->makesound)
+				play_sound(SND_RECEIVE);
+			
+			set_convo_name(cnv, name);
+			
+			write_to_conv(cnv, message, away | WFLAG_RECV, NULL, mtime, len);
 		}
-		if (new_conv && (sound_options & OPT_SOUND_FIRST_RCV))
-			play_sound(SND_FIRST_RECEIVE);
-		else if (cnv->makesound)
-			play_sound(SND_RECEIVE);
-
-		set_convo_name(cnv, name);
-
-		write_to_conv(cnv, message, away | WFLAG_RECV, NULL, mtime, len);
 	}
-
-	plugin_event(event_im_displayed_rcvd, gc, name, message, (void *)flags);
+	plugin_event(event_im_displayed_rcvd, gc, name, message, flags, mtime);
 	g_free(name);
 	g_free(message);
 }
@@ -739,12 +753,12 @@
 	}
 
 	if (!b->idle && idle) {
-		plugin_event(event_buddy_idle, gc, b->name, 0, 0);
+		plugin_event(event_buddy_idle, gc, b->name);
 		system_log(log_idle, gc, b, OPT_LOG_BUDDY_IDLE);
 	}
 	if (b->idle && !idle) {
 		do_pounce(gc, b->name, OPT_POUNCE_UNIDLE);
-		plugin_event(event_buddy_unidle, gc, b->name, 0, 0);
+		plugin_event(event_buddy_unidle, gc, b->name);
 		system_log(log_unidle, gc, b, OPT_LOG_BUDDY_IDLE);
 	}
 
@@ -753,10 +767,10 @@
 
 	if ((b->uc & UC_UNAVAILABLE) && !(type & UC_UNAVAILABLE)) {
 		do_pounce(gc, b->name, OPT_POUNCE_UNAWAY);
-		plugin_event(event_buddy_back, gc, b->name, 0, 0);
+		plugin_event(event_buddy_back, gc, b->name);
 		system_log(log_back, gc, b, OPT_LOG_BUDDY_AWAY);
 	} else if (!(b->uc & UC_UNAVAILABLE) && (type & UC_UNAVAILABLE)) {
-		plugin_event(event_buddy_away, gc, b->name, 0, 0);
+		plugin_event(event_buddy_away, gc, b->name);
 		system_log(log_away, gc, b, OPT_LOG_BUDDY_AWAY);
 	}
 
@@ -770,12 +784,12 @@
 		if (!b->present) {
 			b->present = 1;
 			do_pounce(gc, b->name, OPT_POUNCE_SIGNON);
-			plugin_event(event_buddy_signon, gc, b->name, 0, 0);
+			plugin_event(event_buddy_signon, gc, b->name);
 			system_log(log_signon, gc, b, OPT_LOG_BUDDY_SIGNON);
 		}
 	} else {
 		if (b->present) {
-			plugin_event(event_buddy_signoff, gc, b->name, 0, 0);
+			plugin_event(event_buddy_signoff, gc, b->name);
 			system_log(log_signoff, gc, b, OPT_LOG_BUDDY_SIGNON);
 		}
 		b->present = 0;
@@ -789,7 +803,7 @@
 {
 	char buf2[1024];
 
-	plugin_event(event_warned, gc, name, (void *)lev, 0);
+	plugin_event(event_warned, gc, name, lev);
 
 	if (gc->evil >= lev) {
 		gc->evil = lev;
@@ -810,7 +824,7 @@
 		 set_convo_gc(cnv, gc);
 		 show_typing(cnv);
 	} else return;
-	 plugin_event(event_got_typing, gc, name, 0, 0);
+	 plugin_event(event_got_typing, gc, name);
 	 do_pounce(gc, name, OPT_POUNCE_TYPING);
 	 if (timeout > 0) {
 		 if (cnv->typing_timeout)
@@ -916,7 +930,7 @@
 {
 	struct conversation *b;
 
-	plugin_event(event_chat_join, gc, (void *)id, name, 0);
+	plugin_event(event_chat_join, gc, id, name);
 
 	b = (struct conversation *)g_new0(struct conversation, 1);
 	gc->buddy_chats = g_slist_append(gc->buddy_chats, b);
@@ -975,7 +989,7 @@
 	if (!b)
 		return;
 
-	plugin_event(event_chat_leave, g, (void *)b->id, 0, 0);
+	plugin_event(event_chat_leave, g, b->id);
 
 	debug_printf("Leaving room %s.\n", b->name);
 
@@ -1014,7 +1028,7 @@
 	buffy = g_malloc(MAX(strlen(message) + 1, BUF_LONG));
 	strcpy(buffy, message);
 	angel = g_strdup(who);
-	plugin_return = plugin_event(event_chat_recv, g, (void *)b->id, &angel, &buffy);
+	plugin_return = plugin_event(event_chat_recv, g, b->id, &angel, &buffy);
 
 	if (!buffy || !angel || plugin_return) {
 		if (buffy)

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- ui.h	15 Sep 2002 15:46:06 -0000	1.53
+++ ui.h	16 Sep 2002 08:35:24 -0000	1.54
@@ -36,6 +36,8 @@
 #define gtk_accel_group_attach(x, y) _gtk_accel_group_attach(x, y)
 #define gtk_widget_lock_accelerators(x)
 
+#define DOCKLET_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED)
+
 #define DEFAULT_FONT_FACE "Helvetica"
 
 #define BROWSER_NETSCAPE              0
@@ -318,7 +320,7 @@
 extern void away_list_unclicked(GtkWidget *, struct away_message *);
 extern void away_list_clicked(GtkWidget *, struct away_message *);
 extern void toggle_away_queue();
-extern void purge_away_queue();
+extern void purge_away_queue(GSList*);
 
 /* Functions in browser.c */
 extern void open_url(GtkWidget *, char *);

[Gaim-commits] CVS: gaim/src dialogs.c,1.336,1.337

[Rob F. <rob...@us...>]

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

Modified Files:
	dialogs.c 
Log Message:
i am so sleepy.



Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -d -r1.336 -r1.337
--- dialogs.c	14 Sep 2002 18:47:45 -0000	1.336
+++ dialogs.c	16 Sep 2002 07:04:55 -0000	1.337
@@ -481,13 +481,17 @@
 	GtkWidget *hbox;
 	GtkWidget *vbox;
 	GtkWidget *fbox;
-	GtkWidget *frame;
+	GtkSizeGroup *sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
 	gchar tmp[2048];
+	char labeltext[1024 * 2];
+	char *filename;
+	GtkWidget *image;
 
 	GAIM_DIALOG(b->window);
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
 
 	g_snprintf(tmp, sizeof(tmp), _("Gaim - Remove %s?"), name);
+	gtk_container_set_border_width(GTK_CONTAINER(b->window), 6);
 	gtk_window_set_title(GTK_WINDOW(b->window), tmp);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "confirm_del", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, FALSE, TRUE);
@@ -497,33 +501,44 @@
 	gtk_widget_realize(b->window);
 
 	vbox = gtk_vbox_new(FALSE, 0);
+	gtk_box_set_spacing(GTK_BOX(vbox), 12);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
 	gtk_container_add(GTK_CONTAINER(b->window), vbox);
 	gtk_widget_show(vbox);
 
-	frame = gtk_frame_new(_("Remove Buddy"));
-	gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-	gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
-	gtk_widget_show(frame);	
-
-	fbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_add(GTK_CONTAINER(frame), fbox);
+	fbox = gtk_hbox_new(FALSE, 0);
+	gtk_box_set_spacing(GTK_BOX(fbox), 6);
 	gtk_container_set_border_width(GTK_CONTAINER(fbox), 5);
 	gtk_widget_show(fbox);
 
-	g_snprintf(tmp, sizeof(tmp), _("You are about to remove '%s' from\nyour buddylist. Do you want to continue?"), name);
-	b->label = gtk_label_new(tmp);
-	gtk_misc_set_alignment(GTK_MISC(b->label), 0, 0.5);
+	filename = g_build_filename (DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL);
+	debug_printf("Loading: %s\n", filename);
+	image = gtk_image_new_from_file(filename);
+	gtk_misc_set_alignment(GTK_MISC(image), 0, 0);
+	gtk_box_pack_start(GTK_BOX(fbox), image, FALSE, FALSE, 0);
+	gtk_widget_show(image);
+	g_free(filename);
+
+	g_snprintf(labeltext, sizeof(labeltext), "<span weight=\"bold\" size=\"larger\">Remove Buddy</span>\n\nYou are about to remove '%s' from\nyour buddylist.  Do you want to continue?", name);
+	b->label = gtk_label_new(NULL);
+	gtk_label_set_markup(GTK_LABEL(b->label), labeltext);
+	gtk_label_set_line_wrap(GTK_LABEL(b->label), TRUE);
 	gtk_label_set_justify(GTK_LABEL(b->label), GTK_JUSTIFY_LEFT);
+	gtk_misc_set_alignment(GTK_MISC(b->label), 0, 0);
 	gtk_box_pack_start(GTK_BOX(fbox), b->label, FALSE, FALSE, 0);
 	gtk_widget_show(b->label);
+	gtk_box_pack_start(GTK_BOX(vbox), fbox, TRUE, FALSE, 0);
 
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);
+	hbox = gtk_hbox_new(FALSE, 0);
+	gtk_box_set_spacing(GTK_BOX(hbox), 6);
+	gtk_container_set_border_width(GTK_CONTAINER(hbox), 0);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, FALSE, 0);
 	gtk_widget_show(hbox);
 
-	b->ok = picture_button(b->window, _("Accept"), ok_xpm);
-	gtk_box_pack_start(GTK_BOX(hbox), b->ok, FALSE, FALSE, 5);
+	b->ok = gtk_button_new_with_label("Remove Buddy");
+	gtk_widget_show(b->ok);
+	gtk_size_group_add_widget(sg, b->ok);
+	gtk_box_pack_end(GTK_BOX(hbox), b->ok, FALSE, FALSE, 5);
 
 	bd = find_buddy(gc, name);
 
@@ -532,8 +547,10 @@
 	
 	gtk_signal_connect(GTK_OBJECT(b->ok), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
 
-	b->cancel = picture_button(b->window, _("Cancel"), cancel_xpm);
-	gtk_box_pack_start(GTK_BOX(hbox), b->cancel, FALSE, FALSE, 5);
+	b->cancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+	gtk_widget_show(b->cancel);
+	gtk_size_group_add_widget(sg, b->cancel);
+	gtk_box_pack_end(GTK_BOX(hbox), b->cancel, FALSE, FALSE, 5);
 	gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
 	
 	gtk_widget_show(b->window);	
@@ -563,10 +580,10 @@
  	case GAIM_INFO:
 	 	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_info.png", NULL);
 		break; 
-	 case GAIM_WARNING:
+	case GAIM_WARNING:
 	 	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_warning.png", NULL);
 	  	break;
-	 case GAIM_ERROR:
+	case GAIM_ERROR:
 	 	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_error.png", NULL);
 	 	break;
 		/*	 case GAIM_QUESTION:

[Gaim-commits] CVS: gaim/src prefs.c,1.250,1.251

[Rob F. <rob...@us...>]

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

Modified Files:
	prefs.c 
Log Message:
Made the buttons look the same.  It annoyed me.



Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -r1.250 -r1.251
--- prefs.c	14 Sep 2002 19:37:29 -0000	1.250
+++ prefs.c	16 Sep 2002 05:53:20 -0000	1.251
@@ -1244,6 +1244,7 @@
 	GtkWidget *notebook;
 	GtkWidget *sep;
 	GtkWidget *button;
+	GtkSizeGroup *sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
 
 	int r;
 
@@ -1367,19 +1368,23 @@
 	gtk_widget_show (hbox);
 
 	button = gtk_button_new_from_stock (GTK_STOCK_OK);
+	gtk_size_group_add_widget(sg, button);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ok_cb), prefs);
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_widget_show(button);
 
-	button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(apply_cb), prefs);
+	button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+	gtk_size_group_add_widget(sg, button);
+	gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), prefs);
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_widget_show(button);
 
-	button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
-	gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), prefs);
+	button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
+	gtk_size_group_add_widget(sg, button);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(apply_cb), prefs);
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_widget_show(button);
+
 
 	prefs_notebook_init();
 

[Gaim-commits] CVS: gaim/doc gaim.1,1.54.2.3,1.54.2.4

[Rob F. <rob...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	gaim.1 
Log Message:
there is no spoon.



Index: gaim.1
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/gaim.1,v
retrieving revision 1.54.2.3
retrieving revision 1.54.2.4
diff -u -d -r1.54.2.3 -r1.54.2.4
--- gaim.1	13 Sep 2002 02:39:29 -0000	1.54.2.3
+++ gaim.1	15 Sep 2002 20:46:57 -0000	1.54.2.4
@@ -21,7 +21,7 @@
 .\" USA.
 .TH gaim 1
 .SH NAME
-Gaim v0.59.3 \- Instant Messaging client
+Gaim v0.59.4 \- Instant Messaging client
 .SH SYNOPSIS
 .TP 5
 \fBgaim \fI[options]\fR

[Gaim-commits] CVS: gaim configure.in,1.118.2.6,1.118.2.7 configure.ac,1.70.2.6,1.70.2.7 ChangeLog,1.509.2.28,1.509.2.29 NEWS,1.138.2.5,1.138.2.6

[Rob F. <rob...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	configure.in configure.ac ChangeLog NEWS 
Log Message:
there is no spoon.



Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.118.2.6
retrieving revision 1.118.2.7
diff -u -d -r1.118.2.6 -r1.118.2.7
--- configure.in	13 Sep 2002 02:39:28 -0000	1.118.2.6
+++ configure.in	15 Sep 2002 20:46:56 -0000	1.118.2.7
@@ -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.3])
+AM_INIT_AUTOMAKE([gaim], [0.59.4cvs])
 
 
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.70.2.6
retrieving revision 1.70.2.7
diff -u -d -r1.70.2.6 -r1.70.2.7
--- configure.ac	13 Sep 2002 02:39:28 -0000	1.70.2.6
+++ configure.ac	15 Sep 2002 20:46:57 -0000	1.70.2.7
@@ -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.3])
+AM_INIT_AUTOMAKE([gaim], [0.59.4cvs])
 
 AC_PREREQ([2.50])
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.509.2.28
retrieving revision 1.509.2.29
diff -u -d -r1.509.2.28 -r1.509.2.29
--- ChangeLog	15 Sep 2002 02:13:22 -0000	1.509.2.28
+++ ChangeLog	15 Sep 2002 20:46:57 -0000	1.509.2.29
@@ -1,5 +1,7 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
+version 0.59.4:
+
 version 0.59.3 (09/14/2002):
 	* Reversed patch that accidentally caused Yahoo
 	  not to connect--for implementation reasons

Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.138.2.5
retrieving revision 1.138.2.6
diff -u -d -r1.138.2.5 -r1.138.2.6
--- NEWS	15 Sep 2002 02:13:22 -0000	1.138.2.5
+++ NEWS	15 Sep 2002 20:46:57 -0000	1.138.2.6
@@ -1,5 +1,7 @@
 -=[ Gaim ]=-  The Pimpin' Penguin IM Client That's Good For The Soul!
 
+0.59.4:
+
 0.59.3 (09/14/2002):
 	Rob: This really has been made a little early.  Of course, we figured
 	that some of you may like to connect to Yahoo. Sorry about that

[Gaim-commits] CVS: gaim/plugins/docklet docklet.c,1.3,1.4

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/plugins/docklet
In directory usw-pr-cvs1:/tmp/cvs-serv19359/plugins/docklet

Modified Files:
	docklet.c 
Log Message:
another set of docklet bug fixes for robot101


Index: docklet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/docklet/docklet.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- docklet.c	15 Sep 2002 14:37:54 -0000	1.3
+++ docklet.c	15 Sep 2002 15:46:06 -0000	1.4
@@ -239,7 +239,7 @@
 	oldstatus = status;
 
 	if (connections) {
-		if (imaway) {
+		if (awaymessage) {
 			if (message_queue) {
 				status = away_pending;
 			} else {

[Gaim-commits] CVS: gaim/src away.c,1.72,1.73 ui.h,1.52,1.53

[Luke S. <lsc...@us...>]

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

Modified Files:
	away.c ui.h 
Log Message:
another set of docklet bug fixes for robot101


Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- away.c	30 Aug 2002 03:13:59 -0000	1.72
+++ away.c	15 Sep 2002 15:46:06 -0000	1.73
@@ -157,10 +157,10 @@
 		g_free(qar);
 	}
 
-	serv_set_away_all(NULL);
 	awaymessage = NULL;
 	clistqueue = NULL;
 	clistqueuesw = NULL;
+	serv_set_away_all(NULL);
 }
 
 

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ui.h	14 Sep 2002 23:27:28 -0000	1.52
+++ ui.h	15 Sep 2002 15:46:06 -0000	1.53
@@ -269,7 +269,6 @@
 extern int auto_away;
 extern GtkWidget *awaymenu;
 extern GtkWidget *clistqueue; 
-extern GtkWidget *imaway;
 
 /* Globals in buddy.c */
 extern GtkWidget *buddies;

[Gaim-commits] CVS: gaim/plugins/docklet docklet.c,1.2,1.3

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/plugins/docklet
In directory usw-pr-cvs1:/tmp/cvs-serv29582/plugins/docklet

Modified Files:
	docklet.c 
Log Message:
and Robot101 wants things initialized.


Index: docklet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/docklet/docklet.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- docklet.c	15 Sep 2002 14:29:41 -0000	1.2
+++ docklet.c	15 Sep 2002 14:37:54 -0000	1.3
@@ -53,7 +53,7 @@
 static void docklet_create();
 
 /* globals */
-static EggTrayIcon *docklet;
+static EggTrayIcon *docklet = NULL;
 static GtkWidget *icon;
 static enum docklet_status status;
 
@@ -98,7 +98,7 @@
 }
 
 static void docklet_menu(GdkEventButton *event) {
-	static GtkWidget *menu;
+	static GtkWidget *menu = NULL;
 	GtkWidget *entry;
 
 	if (menu) {

[Gaim-commits] CVS: gaim/plugins/docklet docklet.c,1.1,1.2

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/plugins/docklet
In directory usw-pr-cvs1:/tmp/cvs-serv27370/plugins/docklet

Modified Files:
	docklet.c 
Log Message:
Fixes a segfault (thanks Zyk) in the docklet, and some warnings (Robot101) also
in the docklet


Index: docklet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/docklet/docklet.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- docklet.c	14 Sep 2002 23:27:26 -0000	1.1
+++ docklet.c	15 Sep 2002 14:29:41 -0000	1.2
@@ -98,7 +98,8 @@
 }
 
 static void docklet_menu(GdkEventButton *event) {
-	GtkWidget *menu, *entry;
+	static GtkWidget *menu;
+	GtkWidget *entry;
 
 	if (menu) {
 		gtk_widget_destroy(menu);
@@ -137,7 +138,7 @@
 			gtk_menu_append(GTK_MENU(docklet_awaymenu), entry);
 
 			entry = gtk_menu_item_new_with_label(_("Away"));
-			gtk_menu_item_set_submenu(GTK_MENU_ITEM(entry), awaymenu);
+			gtk_menu_item_set_submenu(GTK_MENU_ITEM(entry), docklet_awaymenu);
 			gtk_menu_append(GTK_MENU(menu), entry);
 		} else {
 			entry = gtk_menu_item_new_with_label(_("Back"));

[Gaim-commits] CVS: gaim/plugins notify.c,1.13,1.14

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

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

Modified Files:
	notify.c 
Log Message:
a notify.so fix from deryni.

Also, I added some code so that when IRC tells you your nick is already in use, it will ask you to enter a new one rather than just wait to get kicked off.

Of course, I didn't test it all, and because I suck, it doesn't work.


Index: notify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/notify.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- notify.c	25 Aug 2002 19:24:30 -0000	1.13
+++ notify.c	15 Sep 2002 03:40:47 -0000	1.14
@@ -49,7 +49,7 @@
 /* predefine some functions, less warnings */
 void options(GtkWidget *widget, gpointer data);
 void un_star(GtkWidget *widget, gpointer data);
-void un_star_window(GtkWidget *widget, gpointer data);
+int un_star_window(GtkWidget *widget, gpointer data);
 void string_remove(GtkWidget *widget);
 void count_remove(GtkWidget *widget);
 void quote_remove(GtkWidget *widget);
@@ -177,10 +177,11 @@
 	return;
 }
 
-void un_star_window(GtkWidget *widget, gpointer data) {
+int un_star_window(GtkWidget *widget, gpointer data) {
 	GtkWidget *parent = gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW);
 	gtk_object_set_user_data(GTK_OBJECT(parent), gtk_object_get_user_data(GTK_OBJECT(widget)));
 	un_star(parent, data);
+	return 0;
 }
 
 /* This function returns the number in [ ]'s or 0 */

[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.82,1.83

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

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory usw-pr-cvs1:/tmp/cvs-serv30362/src/protocols/irc

Modified Files:
	irc.c 
Log Message:
a notify.so fix from deryni.

Also, I added some code so that when IRC tells you your nick is already in use, it will ask you to enter a new one rather than just wait to get kicked off.

Of course, I didn't test it all, and because I suck, it doesn't work.


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- irc.c	14 Sep 2002 03:17:05 -0000	1.82
+++ irc.c	15 Sep 2002 03:40:48 -0000	1.83
@@ -813,6 +813,14 @@
 	id->liststr = g_string_append(id->liststr, word_eol[4]);
 }
 
+static void irc_change_nick(void *a, char *b) {
+	struct gaim_connection *gc = a;
+	struct irc_data *id = gc->proto_data;
+	char buf[IRC_BUF_LEN];	
+	g_snprintf(buf, sizeof(buf), "NICK %s\r\n", b);
+	irc_write(id->fd, buf, strlen(buf));
+}
+
 static void process_numeric(struct gaim_connection *gc, char *word[], char *word_eol[])
 {
 	struct irc_data *id = gc->proto_data;
@@ -898,6 +906,8 @@
 	case 431:
 		do_error_dialog(_("No IRC nickname given"), NULL, GAIM_ERROR);
 		break;
+	case 433:
+		do_prompt_dialog(_("That nick is already in use.  Please enter a new nick"), gc->displayname, gc, irc_change_nick, NULL);
 	default:
 		if (n > 400 && n < 502) {
 			char errmsg[IRC_BUF_LEN];