diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2006-08-09 16:43:27 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2006-08-09 16:43:27 +0800 |
| commit | 25538fafd052091699c9b53d4fa216270a43ec10 (patch) | |
| tree | 6d39688b8ae2ed45641d2995a09c11ef8c1f1289 /mail | |
| parent | 57326d5f710851a2828d96e1177b20d61b84ed8b (diff) | |
| download | gsoc2013-evolution-25538fafd052091699c9b53d4fa216270a43ec10.tar gsoc2013-evolution-25538fafd052091699c9b53d4fa216270a43ec10.tar.gz gsoc2013-evolution-25538fafd052091699c9b53d4fa216270a43ec10.tar.bz2 gsoc2013-evolution-25538fafd052091699c9b53d4fa216270a43ec10.tar.lz gsoc2013-evolution-25538fafd052091699c9b53d4fa216270a43ec10.tar.xz gsoc2013-evolution-25538fafd052091699c9b53d4fa216270a43ec10.tar.zst gsoc2013-evolution-25538fafd052091699c9b53d4fa216270a43ec10.zip | |
Fix for bug #350411 & 350476
svn path=/trunk/; revision=32506
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/em-mailer-prefs.c | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 3cf20e7499..e9d992a2d4 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2006-08-09 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for bug #350411 #350476 + + * em-mailer-prefs.c (notify_sound_changed): When prefs comes up, + nothing is set in FILE chooser, so it returns NULL and bypass it. + (em_mailer_prefs_construct): Get the file chooser widget before + setting radio active. + 2006-08-08 Harish Krishnaswamy <kharish@novell.com> * em-folder-tree.c: Add header glib/gi18n.h to provide the missing diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index c7d0871c62..d665ba4913 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -679,7 +679,8 @@ notify_sound_changed (GtkWidget *widget, EMMailerPrefs *prefs) const char *filename; filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (prefs->notify_sound_file)); - gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/notify/sound", filename, NULL); + /* When we startup the file name will be NULL*/ + gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/notify/sound", filename ? filename : "", NULL); } static GtkWidget * @@ -818,6 +819,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) gtk_widget_set_sensitive ((GtkWidget *) prefs->notify_not, FALSE); prefs->notify_beep = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radNotifyBeep")); + prefs->notify_sound_file = GTK_FILE_CHOOSER_BUTTON (glade_xml_get_widget (gui, "fileNotifyPlaySoundButton")); gtk_toggle_button_set_active (prefs->notify_beep, val == MAIL_CONFIG_NOTIFY_BEEP); g_signal_connect (prefs->notify_beep, "toggled", G_CALLBACK (notify_type_changed), prefs); if (locked) @@ -829,7 +831,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) if (locked) gtk_widget_set_sensitive ((GtkWidget *) prefs->notify_play_sound, FALSE); - prefs->notify_sound_file = GTK_FILE_CHOOSER_BUTTON (glade_xml_get_widget (gui, "fileNotifyPlaySoundButton")); buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/notify/sound", NULL); gtk_file_chooser_set_filename (GTK_FILE_CHOOSER_BUTTON (prefs->notify_sound_file), buf ? buf : ""); g_signal_connect (GTK_FILE_CHOOSER_BUTTON (prefs->notify_sound_file), "selection-changed", |