diff options
| -rw-r--r-- | mail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail/mail-config.c | 18 | ||||
| -rw-r--r-- | mail/mail-config.h | 3 | ||||
| -rw-r--r-- | mail/mail-signature-editor.c | 40 |
4 files changed, 5 insertions, 60 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 288d345a5f..7088dbcb68 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,7 @@ +2002-08-27 Radek Doulik <rodo@ximian.com> + + * mail-signature-editor.c: removed tip frame + 2002-08-27 Jeffrey Stedfast <fejj@ximian.com> Fixes for bug #4480 diff --git a/mail/mail-config.c b/mail/mail-config.c index 4e28486af8..ad09ec03c8 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -974,9 +974,6 @@ config_read (void) } g_free (path); - config->signature_info = bonobo_config_get_boolean_with_default (config->db, - "/Mail/Info/show_signature_editor_info", TRUE, NULL); - config->week_start_day = bonobo_config_get_long_with_default(config->db, "/Calendar/Display/WeekStartDay", 1, NULL); if (locale_supports_12_hour_format()) { config->time_24hour = bonobo_config_get_boolean_with_default(config->db, "/Calendar/Display/Use24HourFormat", FALSE, NULL); @@ -1346,9 +1343,6 @@ mail_config_write_on_exit (void) if (config->preview_hash) g_hash_table_foreach_remove (config->preview_hash, hash_save_state, "Preview"); - /* signature editor info label */ - bonobo_config_set_boolean (config->db, "/Mail/Info/show_signature_editor_info", config->signature_info, NULL); - CORBA_exception_init (&ev); Bonobo_ConfigDatabase_sync (config->db, &ev); CORBA_exception_free (&ev); @@ -3177,18 +3171,6 @@ mail_config_signature_set_html (MailConfigSignature *sig, gboolean html) } } -gboolean -mail_config_get_show_signature_info (void) -{ - return config->signature_info; -} - -void -mail_config_set_show_signature_info (gboolean show) -{ - config->signature_info = show; -} - int mail_config_get_week_start_day(void) { diff --git a/mail/mail-config.h b/mail/mail-config.h index 7db91b2cfe..bcf45e9ca8 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -320,9 +320,6 @@ void mail_config_signature_emit_event (MailConfigSigEvent event, MailConfigSigna void mail_config_write_account_sig (MailConfigAccount *account, gint i); gchar * mail_config_signature_run_script (gchar *script); -gboolean mail_config_get_show_signature_info (void); -void mail_config_set_show_signature_info (gboolean show); - int mail_config_get_week_start_day(void); int mail_config_get_time_24hour(void); diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c index 1e83b678a8..36e65e985d 100644 --- a/mail/mail-signature-editor.c +++ b/mail/mail-signature-editor.c @@ -311,13 +311,6 @@ format_html_cb (BonoboUIComponent *component, bonobo_widget_set_property (BONOBO_WIDGET (editor->control), "FormatHTML", editor->html, NULL); } -static void -check_hide_info_toggled (GtkWidget *widget, ESignatureEditor *editor) -{ - gtk_widget_hide (editor->info_frame); - mail_config_set_show_signature_info (FALSE); -} - void mail_signature_editor (MailConfigSignature *sig) { @@ -325,7 +318,7 @@ mail_signature_editor (MailConfigSignature *sig) ESignatureEditor *editor; BonoboUIComponent *component; BonoboUIContainer *container; - GtkWidget *vbox, *hbox, *label, *frame, *vbox1, *pixmap, *check; + GtkWidget *vbox, *hbox, *label, *frame, *vbox1; gchar *title; if (!sig->filename || !*sig->filename) @@ -392,37 +385,6 @@ mail_signature_editor (MailConfigSignature *sig) gtk_widget_show_all (vbox); gtk_box_pack_start_defaults (GTK_BOX (vbox), editor->control); - /* info frame */ - if (mail_config_get_show_signature_info ()) { - editor->info_frame = gtk_frame_new (_("Signature hint")); - gtk_container_set_border_width (GTK_CONTAINER (editor->info_frame), 3); - - hbox = gtk_hbox_new (FALSE, 3); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 3); - - pixmap = gnome_pixmap_new_from_file (EVOLUTION_IMAGES "/info-bulb.png"); - gtk_box_pack_start (GTK_BOX (hbox), pixmap, FALSE, TRUE, 0); - - vbox1 = gtk_vbox_new (FALSE, 3); - label = gtk_label_new (_("If you would like to use an old signature, " - "you may import it by opening the \"Insert\" " - "menu, and select either the \"Text file\" " - "or the \"HTML file\" item.")); - gtk_widget_set_usize (label, 500, -2); - gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_box_pack_start (GTK_BOX (vbox1), label, FALSE, TRUE, 0); - gtk_box_pack_start_defaults (GTK_BOX (hbox), vbox1); - check = gtk_check_button_new_with_label (_("Hide signature hint")); - gtk_signal_connect (GTK_OBJECT (check), "toggled", check_hide_info_toggled, editor); - gtk_box_pack_end (GTK_BOX (vbox1), check, FALSE, TRUE, 3); - - gtk_container_add (GTK_CONTAINER (editor->info_frame), hbox); - gtk_widget_show_all (editor->info_frame); - gtk_box_pack_end (GTK_BOX (vbox), editor->info_frame, FALSE, TRUE, 0); - } - /* info frame end */ - bonobo_window_set_contents (BONOBO_WINDOW (editor->win), vbox); bonobo_widget_set_property (BONOBO_WIDGET (editor->control), "FormatHTML", editor->html, NULL); gtk_widget_show (GTK_WIDGET (editor->win)); |