add support for playing sounds when new mail arrives. based on a patch

1999-06-21  Jaka Mocnik  <jaka.mocnik@kiss.uni-lj.si>

	* gen_util/mailcheck.c: add support for playing sounds when new
	mail arrives. based on a patch submitted by Eric M. Hopper
	<hopper@omnifarious.omnifarious.mn.org>.
	* gen_util/mailcheck.soundlist: just that. still looking for a
	better sound than phone.wav.
	* gen_util/Makefile.am: install mailcheck.soundlist.

7 files changed, 163 insertions, 54 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f29b9e51..4348f80f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-06-21  Jaka Mocnik  <jaka.mocnik@kiss.uni-lj.si>
+
+	* gen_util/mailcheck.c: add support for playing sounds when new
+	mail arrives. based on a patch submitted by Eric M. Hopper
+	<hopper@omnifarious.omnifarious.mn.org>.
+	* gen_util/mailcheck.soundlist: just that. still looking for a
+	better sound than phone.wav.
+	* gen_util/Makefile.am: install mailcheck.soundlist.
+	
 1999-06-08  Jacob Berkman  <jberkman@andrew.cmu.edu>
 
 	* gen_util/mailcheck.c (create_mail_widgets): don't check mail
diff --git a/gen_util/Makefile.am b/gen_util/Makefile.am
index a2f6e371c..686b1fd02 100644
--- a/gen_util/Makefile.am
+++ b/gen_util/Makefile.am
@@ -27,6 +27,7 @@ MAILCHECK_BITMAPS = email.png email-e.png tux-anim.png email-eclouds.png
 
 EXTRA_DIST = clock_applet.desktop	\
              mailcheck_applet.desktop	\
+             mailcheck.soundlist	\
              printer.desktop		\
              $(PRINTER_BITMAPS)		\
              $(MAILCHECK_BITMAPS)	\
@@ -46,3 +47,7 @@ printersys_DATA = printer.desktop
 
 genutilgnorbadir  = $(sysconfdir)/CORBA/servers
 genutilgnorba_DATA = gen_util.gnorba
+
+soundlistdir = $(sysconfdir)/sound/events
+soundlist_DATA = mailcheck.soundlist
+
diff --git a/gen_util/mailcheck.c b/gen_util/mailcheck.c
index c3caf7fc2..6a966be93 100644
--- a/gen_util/mailcheck.c
+++ b/gen_util/mailcheck.c
@@ -1,8 +1,9 @@
 /* GNOME panel mail check module.
- * (C) 1997, 1998 The Free Software Foundation
+ * (C) 1997, 1998, 1999 The Free Software Foundation
  *
- * Author: Miguel de Icaza
- *         Lennart Poettering
+ * Authors: Miguel de Icaza
+ *          Jaka Mocnik
+ *          Lennart Poettering
  *
  */
 
@@ -29,6 +30,9 @@ struct _MailCheck {
 	/* If set, the user has launched the mail viewer */
 	int mailcleared;
 
+	/* Has the sound been played for this bunch of new mail? */
+	int soundplayed;
+
 	/* Does the user have any mail at all? */
 	int anymail;
 
@@ -99,13 +103,16 @@ struct _MailCheck {
 	char *animation_file;
         
 	GtkWidget *mailfile_entry, *mailfile_label, *mailfile_fentry;
-        GtkWidget *remote_server_entry, *remote_username_entry, *remote_password_entry;
-        GtkWidget *remote_server_label, *remote_username_label, *remote_password_label;
+  GtkWidget *remote_server_entry, *remote_username_entry, *remote_password_entry;
+  GtkWidget *remote_server_label, *remote_username_label, *remote_password_label;
 	GtkWidget *remote_option_menu;
+  GtkWidget *play_sound_check;
         
 	char *remote_server, *remote_username, *remote_password;
 	int mailbox_type; /* local = 0; pop3 = 1; imap = 2 */
         int mailbox_type_temp;
+
+  gboolean play_sound;
 	
 	PanelSizeType size;
 };
@@ -156,20 +163,21 @@ mail_animation_filename (MailCheck *mc)
 static void
 check_mail_file_status (MailCheck *mc)
 {
+	static const char *supinfo[] = {"mailcheck", "new-mail", NULL};

 	static off_t oldsize = 0;
 	struct stat s;
 	off_t newsize;
-	int status;
-        if ((mc->mailbox_type == 1) || (mc->mailbox_type == 2)) {
+	int status, suppress_sound;
+
+  if ((mc->mailbox_type == 1) || (mc->mailbox_type == 2)) {
 		int v;
-		
+
 		if (mc->mailbox_type == 1)
 			v = pop3_check(mc->remote_server, mc->remote_username, mc->remote_password);
 		else
 			v = imap_check(mc->remote_server, mc->remote_username, mc->remote_password);
 		
-		if (v == -1) 
-		{
+		if (v == -1) {
 #if 0
 			/* don't notify about an error: think of people with
 			 * dial-up connections; keep the current mail status
@@ -183,15 +191,15 @@ check_mail_file_status (MailCheck *mc)
 			mc->mailbox_type = 0;
 			mc->anymail = mc->newmail = 0;
 #endif
-		}
-		else
-		{
-			mc->newmail = (signed int) (((unsigned int) v) >> 16) ? 1 : 0;
-			mc->anymail = (signed int) (((unsigned int) v) & 0x0000FFFFL) ? 1 : 0;
-		} 
-        } else {
+    }
+		else {
+      mc->unreadmail = mc->newmail = (signed int) (((unsigned int) v) >> 16) ? 1 : 0;
+      mc->anymail = (signed int) (((unsigned int) v) & 0x0000FFFFL) ? 1 : 0;
+    } 
+  }
+  else {
 		status = stat (mc->mail_file, &s);
-		if (status < 0){
+		if (status < 0) {
 			oldsize = 0;
 			mc->anymail = mc->newmail = mc->unreadmail = 0;
 			return;
@@ -201,14 +209,23 @@ check_mail_file_status (MailCheck *mc)
 		mc->anymail = newsize > 0;
 		mc->unreadmail = (s.st_mtime >= s.st_atime && newsize > 0);
 		
-		if (newsize >= oldsize && mc->unreadmail){
+		if (newsize > oldsize && mc->unreadmail) {
 			mc->newmail = 1;
 			mc->mailcleared = 0;
-		} else
-			mc->newmail = 0;
-		oldsize = newsize;
-        }
-
+    } else
+      mc->newmail = 0;
+
+    oldsize = newsize;
+  }
+
+  if(mc->newmail && mc->play_sound) {
+    if(!mc->soundplayed) {
+      gnome_triggers_vdo("", "program", supinfo);
+      mc->soundplayed = TRUE;
+    }
+  }
+  else
+    mc->soundplayed = FALSE;
 }
 
 static void
@@ -647,7 +664,9 @@ apply_properties_callback (GtkWidget *widget, gint page, gpointer data)
 	if (strlen(text) > 0)
 		mc->remote_password = g_strdup(text);
         
-        mc->mailbox_type = mc->mailbox_type_temp;
+  mc->mailbox_type = mc->mailbox_type_temp;
+
+  mc->play_sound = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mc->play_sound_check));
 }
 
 static void make_remote_widgets_sensitive(MailCheck *mc)
@@ -863,7 +882,7 @@ mailcheck_properties_page (MailCheck *mc)
         hbox = gtk_hbox_new (FALSE, 6);
         gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
         gtk_widget_show (hbox); 
-
+        
         l = gtk_label_new (_("Check for mail every"));
 	gtk_widget_show(l);
 	gtk_box_pack_start (GTK_BOX (hbox), l, FALSE, FALSE, 0);
@@ -894,6 +913,13 @@ mailcheck_properties_page (MailCheck *mc)
 	gtk_widget_show(l);
 	gtk_box_pack_start (GTK_BOX (hbox), l, FALSE, FALSE, 0);
 	
+  mc->play_sound_check = gtk_check_button_new_with_label(_("Play a sound when new mail arrives"));
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mc->play_sound_check), mc->play_sound);
+	gtk_signal_connect(GTK_OBJECT(mc->play_sound_check), "toggled",
+                     GTK_SIGNAL_FUNC(property_box_changed), mc);
+  gtk_widget_show(mc->play_sound_check);
+  gtk_box_pack_start(GTK_BOX (vbox), mc->play_sound_check, FALSE, FALSE, 0);
+
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 	gtk_widget_show (hbox);  
@@ -973,6 +999,7 @@ applet_save_session(GtkWidget *w,
         gnome_config_set_string("mail/remote_password", 
 				mc->remote_password?mc->remote_password:"");
         gnome_config_set_int("mail/mailbox_type", (int) mc->mailbox_type);
+  gnome_config_set_bool("mail/play_sound", mc->play_sound);
         
 	gnome_config_pop_prefix();
 
@@ -1030,11 +1057,13 @@ make_mailcheck_applet(const gchar *goad_id)
 	char *emailfile;
 	char *query;
 
-	mc = g_new(MailCheck,1);
+	mc = g_new0(MailCheck,1);
 	mc->animation_tag = -1;
 	mc->animation_file = NULL;
 	mc->property_window = NULL;
 	mc->anim_changed = FALSE;
+  mc->soundplayed= FALSE;
+  mc->anymail = mc->unreadmail = mc->newmail = FALSE;
 
 	/*initial state*/
 	mc->report_mail_mode = REPORT_MAIL_USE_ANIMATION;
@@ -1084,6 +1113,8 @@ make_mailcheck_applet(const gchar *goad_id)
 	mc->remote_password = gnome_config_get_string("mail/remote_password");
 	mc->mailbox_type = gnome_config_get_int("mail/mailbox_type=0");
 
+  mc->play_sound = gnome_config_get_bool("mail/play_sound=false");
+
 	gnome_config_pop_prefix();
 
 	mc->mailcheck_text_only = _("Text only");
diff --git a/gen_util/mailcheck.soundlist b/gen_util/mailcheck.soundlist
new file mode 100644
index 000000000..fe5e5e21f
--- /dev/null
+++ b/gen_util/mailcheck.soundlist
@@ -0,0 +1,19 @@
+[__section_info__]
+description=Mailcheck
+description[ca]=Avís de Correu
+description[de]=Postkontrolle
+description[es]=Buzón
+description[eu]=Postontzia
+description[fi]=Postintarkistus
+description[fr]=Boite aux lettres
+description[ja]=¥á¡¼¥ë¥Á¥§¥Ã¥¯
+description[ko]=ÆíÁö È®ÀÎ
+description[nl]=Postbus
+description[no]=E-postsjekk
+description[pl]=Monitor poczty
+description[pt]=Caixa Correio
+description[wa]=Boesse ås emiles
+
+[new-mail]
+file=phone.wav
+description=New Mail
diff --git a/mailcheck/ChangeLog b/mailcheck/ChangeLog
index 2f29b9e51..4348f80f9 100644
--- a/mailcheck/ChangeLog
+++ b/mailcheck/ChangeLog
@@ -1,3 +1,12 @@
+1999-06-21  Jaka Mocnik  <jaka.mocnik@kiss.uni-lj.si>
+
+	* gen_util/mailcheck.c: add support for playing sounds when new
+	mail arrives. based on a patch submitted by Eric M. Hopper
+	<hopper@omnifarious.omnifarious.mn.org>.
+	* gen_util/mailcheck.soundlist: just that. still looking for a
+	better sound than phone.wav.
+	* gen_util/Makefile.am: install mailcheck.soundlist.
+	
 1999-06-08  Jacob Berkman  <jberkman@andrew.cmu.edu>
 
 	* gen_util/mailcheck.c (create_mail_widgets): don't check mail
diff --git a/mailcheck/Makefile.am b/mailcheck/Makefile.am
index a2f6e371c..686b1fd02 100644
--- a/mailcheck/Makefile.am
+++ b/mailcheck/Makefile.am
@@ -27,6 +27,7 @@ MAILCHECK_BITMAPS = email.png email-e.png tux-anim.png email-eclouds.png
 
 EXTRA_DIST = clock_applet.desktop	\
              mailcheck_applet.desktop	\
+             mailcheck.soundlist	\
              printer.desktop		\
              $(PRINTER_BITMAPS)		\
              $(MAILCHECK_BITMAPS)	\
@@ -46,3 +47,7 @@ printersys_DATA = printer.desktop
 
 genutilgnorbadir  = $(sysconfdir)/CORBA/servers
 genutilgnorba_DATA = gen_util.gnorba
+
+soundlistdir = $(sysconfdir)/sound/events
+soundlist_DATA = mailcheck.soundlist
+
diff --git a/mailcheck/mailcheck.c b/mailcheck/mailcheck.c
index c3caf7fc2..6a966be93 100644
--- a/mailcheck/mailcheck.c
+++ b/mailcheck/mailcheck.c
@@ -1,8 +1,9 @@
 /* GNOME panel mail check module.
- * (C) 1997, 1998 The Free Software Foundation
+ * (C) 1997, 1998, 1999 The Free Software Foundation
  *
- * Author: Miguel de Icaza
- *         Lennart Poettering
+ * Authors: Miguel de Icaza
+ *          Jaka Mocnik
+ *          Lennart Poettering
  *
  */
 
@@ -29,6 +30,9 @@ struct _MailCheck {
 	/* If set, the user has launched the mail viewer */
 	int mailcleared;
 
+	/* Has the sound been played for this bunch of new mail? */
+	int soundplayed;
+
 	/* Does the user have any mail at all? */
 	int anymail;
 
@@ -99,13 +103,16 @@ struct _MailCheck {
 	char *animation_file;
         
 	GtkWidget *mailfile_entry, *mailfile_label, *mailfile_fentry;
-        GtkWidget *remote_server_entry, *remote_username_entry, *remote_password_entry;
-        GtkWidget *remote_server_label, *remote_username_label, *remote_password_label;
+  GtkWidget *remote_server_entry, *remote_username_entry, *remote_password_entry;
+  GtkWidget *remote_server_label, *remote_username_label, *remote_password_label;
 	GtkWidget *remote_option_menu;
+  GtkWidget *play_sound_check;
         
 	char *remote_server, *remote_username, *remote_password;
 	int mailbox_type; /* local = 0; pop3 = 1; imap = 2 */
         int mailbox_type_temp;
+
+  gboolean play_sound;
 	
 	PanelSizeType size;
 };
@@ -156,20 +163,21 @@ mail_animation_filename (MailCheck *mc)
 static void
 check_mail_file_status (MailCheck *mc)
 {
+	static const char *supinfo[] = {"mailcheck", "new-mail", NULL};

 	static off_t oldsize = 0;
 	struct stat s;
 	off_t newsize;
-	int status;
-        if ((mc->mailbox_type == 1) || (mc->mailbox_type == 2)) {
+	int status, suppress_sound;
+
+  if ((mc->mailbox_type == 1) || (mc->mailbox_type == 2)) {
 		int v;
-		
+
 		if (mc->mailbox_type == 1)
 			v = pop3_check(mc->remote_server, mc->remote_username, mc->remote_password);
 		else
 			v = imap_check(mc->remote_server, mc->remote_username, mc->remote_password);
 		
-		if (v == -1) 
-		{
+		if (v == -1) {
 #if 0
 			/* don't notify about an error: think of people with
 			 * dial-up connections; keep the current mail status
@@ -183,15 +191,15 @@ check_mail_file_status (MailCheck *mc)
 			mc->mailbox_type = 0;
 			mc->anymail = mc->newmail = 0;
 #endif
-		}
-		else
-		{
-			mc->newmail = (signed int) (((unsigned int) v) >> 16) ? 1 : 0;
-			mc->anymail = (signed int) (((unsigned int) v) & 0x0000FFFFL) ? 1 : 0;
-		} 
-        } else {
+    }
+		else {
+      mc->unreadmail = mc->newmail = (signed int) (((unsigned int) v) >> 16) ? 1 : 0;
+      mc->anymail = (signed int) (((unsigned int) v) & 0x0000FFFFL) ? 1 : 0;
+    } 
+  }
+  else {
 		status = stat (mc->mail_file, &s);
-		if (status < 0){
+		if (status < 0) {
 			oldsize = 0;
 			mc->anymail = mc->newmail = mc->unreadmail = 0;
 			return;
@@ -201,14 +209,23 @@ check_mail_file_status (MailCheck *mc)
 		mc->anymail = newsize > 0;
 		mc->unreadmail = (s.st_mtime >= s.st_atime && newsize > 0);
 		
-		if (newsize >= oldsize && mc->unreadmail){
+		if (newsize > oldsize && mc->unreadmail) {
 			mc->newmail = 1;
 			mc->mailcleared = 0;
-		} else
-			mc->newmail = 0;
-		oldsize = newsize;
-        }
-
+    } else
+      mc->newmail = 0;
+
+    oldsize = newsize;
+  }
+
+  if(mc->newmail && mc->play_sound) {
+    if(!mc->soundplayed) {
+      gnome_triggers_vdo("", "program", supinfo);
+      mc->soundplayed = TRUE;
+    }
+  }
+  else
+    mc->soundplayed = FALSE;
 }
 
 static void
@@ -647,7 +664,9 @@ apply_properties_callback (GtkWidget *widget, gint page, gpointer data)
 	if (strlen(text) > 0)
 		mc->remote_password = g_strdup(text);
         
-        mc->mailbox_type = mc->mailbox_type_temp;
+  mc->mailbox_type = mc->mailbox_type_temp;
+
+  mc->play_sound = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mc->play_sound_check));
 }
 
 static void make_remote_widgets_sensitive(MailCheck *mc)
@@ -863,7 +882,7 @@ mailcheck_properties_page (MailCheck *mc)
         hbox = gtk_hbox_new (FALSE, 6);
         gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
         gtk_widget_show (hbox); 
-
+        
         l = gtk_label_new (_("Check for mail every"));
 	gtk_widget_show(l);
 	gtk_box_pack_start (GTK_BOX (hbox), l, FALSE, FALSE, 0);
@@ -894,6 +913,13 @@ mailcheck_properties_page (MailCheck *mc)
 	gtk_widget_show(l);
 	gtk_box_pack_start (GTK_BOX (hbox), l, FALSE, FALSE, 0);
 	
+  mc->play_sound_check = gtk_check_button_new_with_label(_("Play a sound when new mail arrives"));
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mc->play_sound_check), mc->play_sound);
+	gtk_signal_connect(GTK_OBJECT(mc->play_sound_check), "toggled",
+                     GTK_SIGNAL_FUNC(property_box_changed), mc);
+  gtk_widget_show(mc->play_sound_check);
+  gtk_box_pack_start(GTK_BOX (vbox), mc->play_sound_check, FALSE, FALSE, 0);
+
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 	gtk_widget_show (hbox);  
@@ -973,6 +999,7 @@ applet_save_session(GtkWidget *w,
         gnome_config_set_string("mail/remote_password", 
 				mc->remote_password?mc->remote_password:"");
         gnome_config_set_int("mail/mailbox_type", (int) mc->mailbox_type);
+  gnome_config_set_bool("mail/play_sound", mc->play_sound);
         
 	gnome_config_pop_prefix();
 
@@ -1030,11 +1057,13 @@ make_mailcheck_applet(const gchar *goad_id)
 	char *emailfile;
 	char *query;
 
-	mc = g_new(MailCheck,1);
+	mc = g_new0(MailCheck,1);
 	mc->animation_tag = -1;
 	mc->animation_file = NULL;
 	mc->property_window = NULL;
 	mc->anim_changed = FALSE;
+  mc->soundplayed= FALSE;
+  mc->anymail = mc->unreadmail = mc->newmail = FALSE;
 
 	/*initial state*/
 	mc->report_mail_mode = REPORT_MAIL_USE_ANIMATION;
@@ -1084,6 +1113,8 @@ make_mailcheck_applet(const gchar *goad_id)
 	mc->remote_password = gnome_config_get_string("mail/remote_password");
 	mc->mailbox_type = gnome_config_get_int("mail/mailbox_type=0");
 
+  mc->play_sound = gnome_config_get_bool("mail/play_sound=false");
+
 	gnome_config_pop_prefix();
 
 	mc->mailcheck_text_only = _("Text only");