gtkhtml r8732 - in branches/mbarnes-composer: . components/html-editor gtkhtml po

[mbarnes svn gnome org]

Author: mbarnes
Date: Tue Feb 12 03:43:09 2008
New Revision: 8732
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8732&view=rev

Log:
Merge revisions 8698:8731 from trunk.


Modified:
   branches/mbarnes-composer/ChangeLog
   branches/mbarnes-composer/NEWS
   branches/mbarnes-composer/components/html-editor/ChangeLog
   branches/mbarnes-composer/components/html-editor/image.c
   branches/mbarnes-composer/components/html-editor/spellchecker.c
   branches/mbarnes-composer/configure.in
   branches/mbarnes-composer/gtkhtml/ChangeLog
   branches/mbarnes-composer/gtkhtml/htmlclueflow.c
   branches/mbarnes-composer/gtkhtml/htmlengine-edit-clueflowstyle.c
   branches/mbarnes-composer/po/ChangeLog
   branches/mbarnes-composer/po/ar.po
   branches/mbarnes-composer/po/de.po
   branches/mbarnes-composer/po/es.po
   branches/mbarnes-composer/po/gl.po
   branches/mbarnes-composer/po/mk.po   (contents, props changed)
   branches/mbarnes-composer/po/oc.po
   branches/mbarnes-composer/po/pl.po
   branches/mbarnes-composer/po/pt.po
   branches/mbarnes-composer/po/pt_BR.po
   branches/mbarnes-composer/po/sl.po
   branches/mbarnes-composer/po/th.po

Modified: branches/mbarnes-composer/NEWS
==============================================================================
--- branches/mbarnes-composer/NEWS	(original)
+++ branches/mbarnes-composer/NEWS	Tue Feb 12 03:43:09 2008
@@ -1,3 +1,24 @@
+GtkHTML-3.17.90 2008-01-28
+--------------------------
+
+New in 2.21.90:
+	Support for Anchors (Frame/IFRAME) (Milan Crha)
+
+Bug Fixes:
+	#371011: crash in undo_or_redo (Matthew Barnes/Johnny)
+	#431190: Look for anchors in FRAME and IFRAME too (Milan Crha)
+	#447122: Move to next character when searching forward also when found as first character of paragraph (Milan Crha)
+	#489456: evolution crashed when changing image alignment  (Bharath Acharya)
+	#491210: The GtkHTMLSearchDialog was being accessed after destroying it (Bharath Acharya)
+	#505819: We should not unref ourself (Milan Crha)
+
+Other Contributors:
+	libsoup updates (Dan Winship)
+	Build changes (Tor Lillqvist)
+
+Updated Translations:
+	Ivar Smolin (et)
+
 GtkHTML-3.17.5 2008-01-14
 -------------------------
 

Modified: branches/mbarnes-composer/components/html-editor/image.c
==============================================================================
--- branches/mbarnes-composer/components/html-editor/image.c	(original)
+++ branches/mbarnes-composer/components/html-editor/image.c	Tue Feb 12 03:43:09 2008
@@ -175,7 +175,7 @@
 changed_align (GtkWidget *w, GtkHTMLEditImageProperties *d)
 {
 	if (!d->disable_change && editor_has_html_object (d->cd, HTML_OBJECT (d->image)))
-		html_image_set_valign (d->image, g_list_index (GTK_MENU_SHELL (w)->children, gtk_menu_get_active (GTK_MENU (w))));
+		html_image_set_valign (d->image, gtk_combo_box_get_active (GTK_COMBO_BOX (d->option_align)));
 }
 
 static void

Modified: branches/mbarnes-composer/components/html-editor/spellchecker.c
==============================================================================
--- branches/mbarnes-composer/components/html-editor/spellchecker.c	(original)
+++ branches/mbarnes-composer/components/html-editor/spellchecker.c	Tue Feb 12 03:43:09 2008
@@ -28,6 +28,8 @@
 #include <glib/gi18n.h>
 #endif
 
+#include <string.h>
+
 #include "gtkhtml.h"
 #include "gtkhtml-properties.h"
 

Modified: branches/mbarnes-composer/configure.in
==============================================================================
--- branches/mbarnes-composer/configure.in	(original)
+++ branches/mbarnes-composer/configure.in	Tue Feb 12 03:43:09 2008
@@ -10,6 +10,7 @@
 m4_define([gail_minimum_version], [1.1.0])
 m4_define([gladeui_minimum_version], [3.0.0])
 m4_define([gnome_icon_theme_minimum_version], [1.2.0])
+m4_define([libbonobo_minimum_version], [2.20.3])
 m4_define([libbonoboui_minimum_version], [2.2.4])
 m4_define([libglade_minimum_version], [2.0.0])
 m4_define([libgnomeui_minimum_version], [2.0.0])
@@ -36,7 +37,7 @@
 
 AC_DEFINE(BONOBO_DISABLE_DEPRECATED,1,[No deprecated bonobo functions])
 
-AM_INIT_AUTOMAKE($PACKAGE, 3.17.90)
+AM_INIT_AUTOMAKE($PACKAGE, 3.17.91)
 
 AM_MAINTAINER_MODE
 
@@ -96,7 +97,7 @@
                 [build the older Bonobo-based editor [default=no]]),
         bonobo_editor="$withval", bonobo_editor="no")
 if test "x$bonobo_editor" = "xyes"; then
-        EDITOR_MODULES="${GTKHTML_MODULES} libbonoboui-2.0 >= libbonoboui_minimum_version"
+        EDITOR_MODULES="${GTKHTML_MODULES} libbonobo-2.0 >= libbonobo_mimimum_version libbonoboui-2.0 >= libbonoboui_minimum_version"
         PKG_CHECK_MODULES(EDITOR, $EDITOR_MODULES)
         AC_SUBST(EDITOR_CFLAGS)
         AC_SUBST(EDITOR_LIBS)

Modified: branches/mbarnes-composer/gtkhtml/htmlclueflow.c
==============================================================================
--- branches/mbarnes-composer/gtkhtml/htmlclueflow.c	(original)
+++ branches/mbarnes-composer/gtkhtml/htmlclueflow.c	Tue Feb 12 03:43:09 2008
@@ -2279,7 +2279,7 @@
 			if (info->start_pos > 0)
 				index = ((guchar *)g_utf8_offset_to_pointer ((gchar *) par, info->start_pos + ((info->forward) ? 1 : -1))) - par;
 			else
-				index = ((guchar *)g_utf8_offset_to_pointer ((gchar *) par, info->start_pos)) - par;
+				index = ((guchar *)g_utf8_offset_to_pointer ((gchar *) par, info->start_pos + ((info->forward) ? 1 : 0))) - par;
 		} else {
 			index = (info->forward) ? 0 : text_bytes - 1;
 		}

Modified: branches/mbarnes-composer/gtkhtml/htmlengine-edit-clueflowstyle.c
==============================================================================
--- branches/mbarnes-composer/gtkhtml/htmlengine-edit-clueflowstyle.c	(original)
+++ branches/mbarnes-composer/gtkhtml/htmlengine-edit-clueflowstyle.c	Tue Feb 12 03:43:09 2008
@@ -172,10 +172,10 @@
 
 	p = op->prop_list;
 
-	while (p != NULL) {
+	while (p != NULL && obj != NULL) {
 		if (HTML_OBJECT_TYPE (obj->parent) != HTML_TYPE_CLUEFLOW) {
 			g_warning ("(%s:%s)  Eeeek!  Unknown parent type `%s'.",
-				   __FILE__, G_GNUC_FUNCTION,
+				   __FILE__, G_STRFUNC,
 				   html_type_name (HTML_OBJECT_TYPE (obj->parent)));
 			break;
 		}
@@ -209,7 +209,7 @@
 				/* This should not happen.  */
 				g_warning ("(%s:%s)  There were not enough paragraphs for "
 					   "setting the paragraph style.",
-					   __FILE__, G_GNUC_FUNCTION);
+					   __FILE__, G_STRFUNC);
 				break;
 			}
 		} while (obj != NULL && HTML_CLUEFLOW (obj->parent) == clueflow);
@@ -217,7 +217,7 @@
 
 	if (prop_list == NULL) {
 		/* This should not happen.  */
-		g_warning ("%s:%s Eeek!  Nothing done?", __FILE__, G_GNUC_FUNCTION);
+		g_warning ("%s:%s Eeek!  Nothing done?", __FILE__, G_STRFUNC);
 		return;
 	}
 
@@ -280,7 +280,7 @@
 	while (p != NULL) {
 		if (HTML_OBJECT_TYPE (p->parent) != HTML_TYPE_CLUEFLOW) {
 			g_warning ("(%s:%s)  Eeeek!  Unknown parent type `%s'.",
-				   __FILE__, G_GNUC_FUNCTION,
+				   __FILE__, G_STRFUNC,
 				   html_type_name (HTML_OBJECT_TYPE (p->parent)));
 			break;
 		}