patches/evolution-04-lost-tab.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
diff -r -u evolution-2.23.2/composer/e-msg-composer.c /export/home/evo212/packages/BUILD/SUNWevolution-2.23.2/evolution-2.23.2/composer/e-msg-composer.c
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     2
--- evolution-2.23.2/composer/e-msg-composer.c	2008-05-12 13:34:58.000000000 +0800
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     3
+++ /export/home/evo212/packages/BUILD/SUNWevolution-2.23.2/evolution-2.23.2/composer/e-msg-composer.c	2008-06-02 19:56:55.547892000 +0800
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     4
@@ -4360,7 +4360,7 @@
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     5
 	smime_encrypt = gtk_toggle_action_get_active (action);
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     6
 	gtk_toggle_action_set_active (action, FALSE);
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     7
 
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     8
-	msg = build_message (composer, TRUE, TRUE);
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
     9
+	msg = build_message (composer, html_content, TRUE);
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    10
 	if (msg == NULL)
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    11
 		return NULL;
63933167ebde 2010-01-15 Jedy Wang <[email protected]>
jedy
parents:
diff changeset
    12