Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/evolution-06-mail-config.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 17348 63933167ebde
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17348
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset 
     1
 
--- evolution-2.23.3.1/mail/mail-config.c.old	Fri May 30 15:23:14 2008
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset 
     2
 
+++ evolution-2.23.3.1/mail/mail-config.c	Wed Jun 11 15:48:42 2008
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset 
     3
 
@@ -184,7 +184,7 @@
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset 
     4
 
 	spell_color = gconf_client_get_string (client, key, NULL);
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset 
     5
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset 
     6
 
 	fprintf (rc, "style \"evolution-mail-custom-fonts\" {\n");
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset 
     7
 
-	fprintf (rc, "        GtkHTML::spell_error_color = \"%s\"\n", spell_color);
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset 
     8
 
+	fprintf (rc, "        GtkHTML::spell_error_color = \"%s\"\n", spell_color ? spell_color : "");
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset 
     9
 
 	g_free (spell_color);
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset 
    10
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset 
    11
 
 	if (gconf_client_get_bool (config->gconf, "/apps/evolution/mail/display/mark_citations", NULL))
upstream/oracle/spec-files