callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the code to actually work. (sig_new_html): Same.

Browse Source 
2002-05-01  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-account-gui.c (sig_new_text): Update the code to actually
	work.
	(sig_new_html): Same.

	* mail-composer-prefs.c (mail_composer_prefs_new_signature): Allow
	'prefs' to be NULL.

svn path=/trunk/; revision=16659
This commit is contained in:
Jeffrey Stedfast
2002-05-02 00:16:56 +00:00
committed by Jeffrey Stedfast
parent e1f208de7d
commit 17c6af5d3e
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mail/ChangeLog
View File

@ -1,5 +1,12 @@
2002-05-01 Jeffrey Stedfast <fejj@ximian.com>
* mail-account-gui.c (sig_new_text): Update the code to actually
work.
(sig_new_html): Same.
* mail-composer-prefs.c (mail_composer_prefs_new_signature): Allow
'prefs' to be NULL.
* folder-browser.c (on_right_click): Fix the filter_menu static
array to use the E_POPUP_MENU_CC macros since we plan on using
custom closures for this.

9
mail/mail-account-gui.c
View File

@ -37,6 +37,7 @@
#include "mail-session.h"
#include "mail-send-recv.h"
#include "mail-signature-editor.h"
#include "mail-composer-prefs.h"
#define d(x)
@ -1322,39 +1323,35 @@ sig_set_and_write (MailAccountGui *gui)
static void
sig_new_text (GtkWidget *w, MailAccountGui *gui)
{
#if 0
if (!gui->dialog)
return;
sig_switch_to_list (w, gui);
gui->text_signature = mail_composer_prefs_new_signature (gui->dialog, FALSE);
gui->text_signature = mail_composer_prefs_new_signature (NULL, FALSE);
gui->text_random = FALSE;
gtk_option_menu_set_history (GTK_OPTION_MENU (gui->sig_option_text), sig_get_index (gui->text_signature));
sig_set_and_write (gui);
gtk_widget_set_sensitive (gui->sig_edit_text, TRUE);
#endif
}
static void
sig_new_html (GtkWidget *w, MailAccountGui *gui)
{
#if 0
if (!gui->dialog)
return;
sig_switch_to_list (w, gui);
gui->html_signature = mail_accounts_dialog_new_signature (gui->dialog, TRUE);
gui->html_signature = mail_composer_prefs_new_signature (NULL, TRUE);
gui->html_random = FALSE;
gtk_option_menu_set_history (GTK_OPTION_MENU (gui->sig_option_html), sig_get_index (gui->html_signature));
sig_set_and_write (gui);
gtk_widget_set_sensitive (gui->sig_edit_html, TRUE);
#endif
}
static void

17
mail/mail-composer-prefs.c
View File

@ -270,14 +270,17 @@ mail_composer_prefs_new_signature (MailComposerPrefs *prefs, gboolean html)
sig = mail_config_signature_add (html);
name[0] = sig->name;
name[1] = sig->random ? _("yes") : _("no");
row = gtk_clist_append (GTK_CLIST (prefs->sig_clist), name);
gtk_clist_set_row_data (GTK_CLIST (prefs->sig_clist), row, sig);
gtk_clist_select_row (GTK_CLIST (prefs->sig_clist), row, 0);
/*gtk_widget_grab_focus (prefs->sig_name);*/
if (prefs) {
name[0] = sig->name;
name[1] = sig->random ? _("yes") : _("no");
row = gtk_clist_append (GTK_CLIST (prefs->sig_clist), name);
gtk_clist_set_row_data (GTK_CLIST (prefs->sig_clist), row, sig);
gtk_clist_select_row (GTK_CLIST (prefs->sig_clist), row, 0);
/*gtk_widget_grab_focus (prefs->sig_name);*/
}
sig_edit (NULL, prefs);
if (sig->filename && *sig->filename)
mail_signature_editor (sig);
return sig;
}