Re: [evolution-patches] big setting patch

[Larry Ewing <lewing ximian com>]

On Tue, 2003-05-20 at 13:28, Ettore Perazzoli wrote:
> On Tue, 2003-05-20 at 14:17, Larry Ewing wrote:
> > yeah that is bad, I wasn't paying enough attention to the other keys, it
> > is simple enough to filter on the ones that should, but we may want to
> > change the schema before we get stuck with it?  Ettore thoughts?
> 
> At this point changing the schema sounds like too major a change to me. 
> Let's just filter out the events.
> 
> -- Ettore
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches lists ximian com
> http://lists.ximian.com/mailman/listinfo/evolution-patches

? .evolution-mail.schemas.swp
? gtkhtml-1.1.7-domain.patch
? mail-fonts.c
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2733
diff -u -p -r1.2733 ChangeLog
--- ChangeLog	20 May 2003 18:33:31 -0000	1.2733
+++ ChangeLog	20 May 2003 19:02:24 -0000
@@ -1,5 +1,7 @@
 2003-05-20  Larry Ewing  <lewing ximian com>
 
+	* mail-display.c: filter events.
+
 	* mail-composer-prefs.c: remove references to gtkhtml property
 	manager.  Connect to missing settings.
 
Index: mail-display.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-display.c,v
retrieving revision 1.279
diff -u -p -r1.279 mail-display.c
--- mail-display.c	20 May 2003 18:33:33 -0000	1.279
+++ mail-display.c	20 May 2003 19:02:25 -0000
@@ -2653,10 +2653,22 @@ static void
 display_notify (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, gpointer data)
 {
 	MailDisplay *md = data;
+	gchar *tkey;
+
+	g_return_if_fail (entry != NULL);
+	g_return_if_fail (gconf_entry_get_key (entry) != NULL);
+	g_return_if_fail (gconf_entry_get_value (entry) != NULL);
 	
-	/* this should really check which setting has changed but it is late */
-	gtk_html_set_animate (md->html, gconf_client_get_bool (gconf, "/apps/evolution/mail/display/animate_images", NULL));
-	mail_display_queue_redisplay ((MailDisplay *)data);
+	tkey = strrchr (entry->key, '/');
+	
+	g_return_if_fail (tkey != NULL);
+
+	if (!strcmp (tkey, "/animate_images")) {
+		gtk_html_set_animate (md->html, gconf_value_get_bool (gconf_entry_get_value(entry)));
+	} else if (!strcmp (tkey, "/citation_color") 
+		   || !strcmp (tkey, "/mark_citations")) {
+		mail_display_queue_redisplay (md);
+	}
 }
 
 GtkWidget *