aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-accounts.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/mail-accounts.c')
-rw-r--r--mail/mail-accounts.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c
index 0d3eb4bc63..f00be07739 100644
--- a/mail/mail-accounts.c
+++ b/mail/mail-accounts.c
@@ -695,16 +695,16 @@ notify_radio_toggled (GtkWidget *radio, gpointer data)
else if (radio == (GtkWidget *) dialog->notify_beep)
mail_config_set_new_mail_notify (MAIL_CONFIG_NOTIFY_BEEP);
else
- mail_config_set_new_mail_notify (MAIL_CONFIG_NOTIFY_EXEC);
+ mail_config_set_new_mail_notify (MAIL_CONFIG_NOTIFY_PLAY_SOUND);
}
static void
-notify_command_changed (GtkWidget *entry, gpointer data)
+notify_sound_file_changed (GtkWidget *entry, gpointer data)
{
- char *command;
+ char *filename;
- command = gtk_entry_get_text (GTK_ENTRY (entry));
- mail_config_set_new_mail_notify_command (command);
+ filename = gtk_entry_get_text (GTK_ENTRY (entry));
+ mail_config_set_new_mail_notify_sound_file (filename);
}
static void
@@ -991,16 +991,17 @@ construct (MailAccountsDialog *dialog)
gtk_signal_connect (GTK_OBJECT (dialog->notify_beep), "toggled",
GTK_SIGNAL_FUNC (notify_radio_toggled), dialog);
- dialog->notify_exec = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radioNotifyExec"));
- gtk_toggle_button_set_active (dialog->notify_exec, mail_config_get_new_mail_notify () == MAIL_CONFIG_NOTIFY_EXEC);
- gtk_signal_connect (GTK_OBJECT (dialog->notify_exec), "toggled",
+ dialog->notify_play_sound = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radioNotifyPlaySound"));
+ gtk_toggle_button_set_active (dialog->notify_play_sound,
+ mail_config_get_new_mail_notify () == MAIL_CONFIG_NOTIFY_PLAY_SOUND);
+ gtk_signal_connect (GTK_OBJECT (dialog->notify_play_sound), "toggled",
GTK_SIGNAL_FUNC (notify_radio_toggled), dialog);
- dialog->command_line = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "fileNotifyExecCommandLine"));
- gtk_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry (dialog->command_line)),
- mail_config_get_new_mail_notify_command ());
- gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (dialog->command_line)),
- "changed", GTK_SIGNAL_FUNC (notify_command_changed), dialog);
+ dialog->notify_sound_file = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "fileNotifyPlaySound"));
+ gtk_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry (dialog->notify_sound_file)),
+ mail_config_get_new_mail_notify_sound_file ());
+ gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (dialog->notify_sound_file)),
+ "changed", GTK_SIGNAL_FUNC (notify_sound_file_changed), dialog);
/* now to fill in the clists */
dialog->accounts_row = -1;