Re: [evolution-patches] Patch for Evolution (Head) to work with new API version in GtkHTML

[Gary Ekker <gekker novell com>]

On Sat, 2004-09-25 at 13:16 +0200, Rodrigo Moya wrote: 
> 
> > -2004-09-13  Tomasz Kłoczko <kloczek pld org pl>
> > +2004-09-13  Tomasz Kłoczko <kloczek pld org pl>
> >  
> >         * data/evolution.desktop.in: added missing Encoding=UTF-8
> > field 
> >           (validate desktop file).
> > @@ -42,7 +49,7 @@
> >  
> >  2004-08-18  Kjartan Maraas  <kmaraas gnome org>
> >  
> > -       * configure.in: Added «nb» to ALL_LINGUAS.
> > +       * configure.in: Added nb to ALL_LINGUAS.
> >  
> seems you are losing some UTF-8 characters here, maybe you're saving the
> file in a wrong locale?

Good catch. I didn't have Mule-UCS installed on the new laptop. The
attached patch reflects this change.

-Gary

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1372
diff -u -r1.1372 ChangeLog
--- ChangeLog	24 Sep 2004 02:51:13 -0000	1.1372
+++ ChangeLog	25 Sep 2004 14:51:34 -0000
@@ -1,3 +1,10 @@
+2004-09-24  Gary Ekker <gekker novell com>
+
+	* composer/e-msg-composer.c: Fix to work with new EDITOR_API_VERSION in
+	GtkHTML
+	* mail/mail-signature-editor.c: Ditto
+	* tools/killev.c: Ditto
+	
 2004-09-13  Not Zed  <NotZed Ximian com>
 
 	* configure.in: change the way ipv6 stuff is done.  separate ipv6
Index: composer/e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.481
diff -u -r1.481 e-msg-composer.c
--- composer/e-msg-composer.c	20 Sep 2004 15:21:59 -0000	1.481
+++ composer/e-msg-composer.c	25 Sep 2004 14:51:34 -0000
@@ -129,7 +129,7 @@
 #include "Editor.h"
 #include "listener.h"
 
-#define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor:3.1"
+#define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor:3.6"
 
 #define d(x) x
 
Index: mail/mail-signature-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-signature-editor.c,v
retrieving revision 1.40
diff -u -r1.40 mail-signature-editor.c
--- mail/mail-signature-editor.c	1 Jun 2004 03:53:59 -0000	1.40
+++ mail/mail-signature-editor.c	25 Sep 2004 14:51:35 -0000
@@ -384,7 +384,7 @@
 			       EVOLUTION_UIDIR "/evolution-signature-editor.xml",
 			       "evolution-signature-editor", NULL);
 	
-	editor->control = bonobo_widget_new_control ("OAFIID:GNOME_GtkHTML_Editor:3.1",
+	editor->control = bonobo_widget_new_control ("OAFIID:GNOME_GtkHTML_Editor:3.6",
 						     bonobo_ui_component_get_container (component));
 	
 	if (editor->control == NULL) {
Index: tools/killev.c
===================================================================
RCS file: /cvs/gnome/evolution/tools/killev.c,v
retrieving revision 1.8
diff -u -r1.8 killev.c
--- tools/killev.c	30 Apr 2004 06:23:28 -0000	1.8
+++ tools/killev.c	25 Sep 2004 14:51:35 -0000
@@ -213,7 +213,7 @@
 	add_matching_repo_id ("IDL:GNOME/Spell/Dictionary:0.3");
 
 	add_matching_iid ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory:" BASE_VERSION);
-	add_matching_iid ("OAFIID:GNOME_GtkHTML_Editor_Factory:3.1");
+	add_matching_iid ("OAFIID:GNOME_GtkHTML_Editor_Factory:3.6");
 
 	g_hash_table_foreach_remove (components, kill_component, NULL);