[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!) */