diff options
author | Shi Pu <shi.pu@sun.com> | 2006-04-30 11:25:15 +0800 |
---|---|---|
committer | Irene Huang <ireneh@src.gnome.org> | 2006-04-30 11:25:15 +0800 |
commit | 9b9eea0891366a8c52287a5fc9942e061a450f21 (patch) | |
tree | 8d1079123a91b372d935fbe7336c7c791d4fb820 /mail/em-mailer-prefs.c | |
parent | b1cb5ad05f1ad24b1621e5fc5c56752f91671614 (diff) | |
download | gsoc2013-evolution-9b9eea0891366a8c52287a5fc9942e061a450f21.tar gsoc2013-evolution-9b9eea0891366a8c52287a5fc9942e061a450f21.tar.gz gsoc2013-evolution-9b9eea0891366a8c52287a5fc9942e061a450f21.tar.bz2 gsoc2013-evolution-9b9eea0891366a8c52287a5fc9942e061a450f21.tar.lz gsoc2013-evolution-9b9eea0891366a8c52287a5fc9942e061a450f21.tar.xz gsoc2013-evolution-9b9eea0891366a8c52287a5fc9942e061a450f21.tar.zst gsoc2013-evolution-9b9eea0891366a8c52287a5fc9942e061a450f21.zip |
** Fixes bug #323853
2006-04-30 Shi Pu <shi.pu@sun.com>
** Fixes bug #323853
* em-composer-prefs.c: (sig_edit_cb), (sig_add_script_response):
* em-mailer-prefs.c: (notify_sound_changed),
(em_mailer_prefs_construct):
* em-mailer-prefs.h:
* mail-config.glade:
Replace GnomeFileEntry by GtkFileChooserButton.
svn path=/trunk/; revision=31933
Diffstat (limited to 'mail/em-mailer-prefs.c')
-rw-r--r-- | mail/em-mailer-prefs.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index bf32fd9fb3..f15dcf3990 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -37,7 +37,7 @@ #include <libgnomeui/gnome-color-picker.h> #include <libgnomeui/gnome-font-picker.h> -#include <libgnomeui/gnome-file-entry.h> +#include <gtk/gtkfilechooserbutton.h> #include <glade/glade.h> @@ -662,10 +662,8 @@ static void notify_sound_changed (GtkWidget *widget, EMMailerPrefs *prefs) { const char *filename; - GtkWidget *entry; - - entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (prefs->notify_sound_file)); - filename = gtk_entry_get_text (GTK_ENTRY (entry)); + + 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); } @@ -806,10 +804,10 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) if (locked) gtk_widget_set_sensitive ((GtkWidget *) prefs->notify_play_sound, FALSE); - prefs->notify_sound_file = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "fileNotifyPlaySound")); + 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_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry (prefs->notify_sound_file)), buf ? buf : ""); - g_signal_connect (gnome_file_entry_gtk_entry (prefs->notify_sound_file), "changed", + 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", G_CALLBACK (notify_sound_changed), prefs); if (!gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/notify/sound", NULL)) gtk_widget_set_sensitive ((GtkWidget *) prefs->notify_sound_file, FALSE); |