From a09f4c7c08cb5a7e171b6a71ae4465b8dfd94152 Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Wed, 13 Jul 2005 10:38:07 +0000 Subject: Free font name Free font name and name of citation color. Free search 2005-07-13 Kjartan Maraas * em-mailer-prefs.c: (em_mailer_prefs_construct): Free font name * mail-config.c: (config_write_style): Free font name and name of citation color. * message-list.c: (regen_list_regened), (regen_list_free): Free search string. Thanks to Michael Zucchi for walking me through this one. My brain wasn't running on all it's cylinders... svn path=/trunk/; revision=29759 --- mail/ChangeLog | 9 +++++++++ mail/em-mailer-prefs.c | 1 + mail/mail-config.c | 9 +++++++-- mail/message-list.c | 2 ++ 4 files changed, 19 insertions(+), 2 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 0cdd62fcf9..87fa77144d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2005-07-13 Kjartan Maraas + + * em-mailer-prefs.c: (em_mailer_prefs_construct): Free font name + * mail-config.c: (config_write_style): Free font name and name + of citation color. + * message-list.c: (regen_list_regened), (regen_list_free): Free + search string. Thanks to Michael Zucchi for walking me through + this one. My brain wasn't running on all it's cylinders... + 2005-07-10 Shreyas Srinivasan * mail-config.[ch]: Add new functions to remove proxy accounts and diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index 09a61e50cd..ff2f68713d 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -814,6 +814,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) font = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/fonts/variable", NULL); prefs->font_variable = GNOME_FONT_PICKER (glade_xml_get_widget (gui, "FontVariable")); gnome_font_picker_set_font_name (prefs->font_variable, font); + g_free (font); g_object_set_data ((GObject *) prefs->font_variable, "key", "/apps/evolution/mail/display/fonts/variable"); g_signal_connect (prefs->font_variable, "font-set", G_CALLBACK (font_changed), prefs); if (!gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/display/fonts/variable", NULL)) diff --git a/mail/mail-config.c b/mail/mail-config.c index 520aec3091..92620b6494 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -249,6 +249,7 @@ config_write_style (void) gboolean custom; char *fix_font; char *var_font; + char *citation_color; FILE *rc; if (!(rc = fopen (config->gtkrc, "wt"))) { @@ -259,7 +260,7 @@ config_write_style (void) custom = gconf_client_get_bool (config->gconf, "/apps/evolution/mail/display/fonts/use_custom", NULL); var_font = gconf_client_get_string (config->gconf, "/apps/evolution/mail/display/fonts/variable", NULL); fix_font = gconf_client_get_string (config->gconf, "/apps/evolution/mail/display/fonts/monospace", NULL); - + citation_color = gconf_client_get_string (config->gconf, "/apps/evolution/mail/display/citation_colour", NULL); CONFIG_GET_SPELL_VALUE (int, "/spell_error_color_red", red, (void)0, (int)); CONFIG_GET_SPELL_VALUE (int, "/spell_error_color_green", green, (void)0, (int)); CONFIG_GET_SPELL_VALUE (int, "/spell_error_color_blue", blue, (void)0, (int)); @@ -270,7 +271,8 @@ config_write_style (void) if (gconf_client_get_bool (config->gconf, "/apps/evolution/mail/display/mark_citations", NULL)) fprintf (rc, " GtkHTML::cite_color = \"%s\"\n", - gconf_client_get_string (config->gconf, "/apps/evolution/mail/display/citation_colour", NULL)); + citation_color); + g_free (citation_color); if (custom && var_font && fix_font) { fprintf (rc, @@ -278,6 +280,9 @@ config_write_style (void) " font_name = \"%s\"\n", fix_font, var_font); } + g_free (fix_font); + g_free (var_font); + fprintf (rc, "}\n\n"); fprintf (rc, "widget \"*.EMFolderView.*.GtkHTML\" style \"evolution-mail-custom-fonts\"\n"); diff --git a/mail/message-list.c b/mail/message-list.c index da1766c13c..861d2d2381 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -3587,6 +3587,7 @@ regen_list_regened (struct _mail_msg *mm) if (m->ml->search && m->ml->search != m->search) g_free (m->ml->search); m->ml->search = m->search; + m->search = NULL; m->ml->regen = g_list_remove(m->ml->regen, m); @@ -3618,6 +3619,7 @@ regen_list_free (struct _mail_msg *mm) if (m->tree) camel_folder_thread_messages_unref (m->tree); + g_free (m->search); g_free (m->hideexpr); camel_object_unref (m->folder); -- cgit