[Gaim-commits] CVS: gaim/src dialogs.c,1.320,1.321 sound.c,1.59,1.60 ui.h,1.40,1.41

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

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

Modified Files:
	dialogs.c sound.c ui.h 
Log Message:
No UI for this (yet)... but plugins can use it.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -d -r1.320 -r1.321
--- dialogs.c	5 May 2002 20:19:40 -0000	1.320
+++ dialogs.c	16 Jun 2002 20:03:31 -0000	1.321
@@ -4285,9 +4285,9 @@
 	button_box = gtk_hbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(button), button_box);
 
-	button_box_2 = gtk_vbox_new(FALSE, 0);
+	button_box_2 = gtk_vbox_new(TRUE, 0);
 
-	gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(button_box), button_box_2, FALSE, FALSE, 0);
 	gtk_widget_show(button_box_2);
 	gtk_widget_show(button_box);
 	if (dispstyle == 2 || dispstyle == 0) {

Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- sound.c	31 May 2002 02:26:53 -0000	1.59
+++ sound.c	16 Jun 2002 20:03:31 -0000	1.60
@@ -52,6 +52,9 @@
 #include "sounds/Receive.h"
 #include "sounds/RedAlert.h"
 
+
+gboolean mute_sounds = 0;
+
 /* label and opt are null for the buddy pounce because it's configured *
  * per pounce. NULL option means it doesn't get displayed in the sound *
  * preferences box */
@@ -551,6 +554,10 @@
 
 void play_sound(int sound)
 {
+
+	if (mute_sounds)
+		return;
+	
 	if (awaymessage && !(sound_options & OPT_SOUND_WHEN_AWAY))
 		return;
 

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ui.h	3 Jun 2002 05:52:52 -0000	1.40
+++ ui.h	16 Jun 2002 20:03:31 -0000	1.41
@@ -309,6 +309,9 @@
 /* Globals in prpl.c */
 extern GtkWidget *protomenu;
 
+/* Globals in sound.c */
+extern gboolean mute_sounds;
+
 /* Functions in about.c */
 extern void show_about(GtkWidget *, void *);
 extern void gaim_help(GtkWidget *, void *);