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

[mbarnes svn gnome org]

Author: mbarnes
Date: Tue Feb 26 05:35:13 2008
New Revision: 8755
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8755&view=rev

Log:
Merge revisions 8657:8754 from trunk.


Modified:
   branches/mbarnes-composer/ChangeLog
   branches/mbarnes-composer/NEWS
   branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c
   branches/mbarnes-composer/components/editor/gtkhtml-editor.ui
   branches/mbarnes-composer/components/editor/gtkhtml-spell-language.c
   branches/mbarnes-composer/components/editor/main.c
   branches/mbarnes-composer/configure.in
   branches/mbarnes-composer/gtkhtml/ChangeLog
   branches/mbarnes-composer/gtkhtml/gtkhtml.c
   branches/mbarnes-composer/po/ChangeLog
   branches/mbarnes-composer/po/ca.po
   branches/mbarnes-composer/po/cs.po
   branches/mbarnes-composer/po/fi.po
   branches/mbarnes-composer/po/fr.po
   branches/mbarnes-composer/po/he.po
   branches/mbarnes-composer/po/it.po
   branches/mbarnes-composer/po/ja.po
   branches/mbarnes-composer/po/ne.po
   branches/mbarnes-composer/po/nl.po
   branches/mbarnes-composer/po/oc.po
   branches/mbarnes-composer/po/pt_BR.po
   branches/mbarnes-composer/po/zh_CN.po
   branches/mbarnes-composer/po/zh_HK.po
   branches/mbarnes-composer/po/zh_TW.po

Modified: branches/mbarnes-composer/NEWS
==============================================================================
--- branches/mbarnes-composer/NEWS	(original)
+++ branches/mbarnes-composer/NEWS	Tue Feb 26 05:35:13 2008
@@ -1,3 +1,23 @@
+GtkHTML-3.17.91 2008-02-11
+--------------------------
+
+Other Contributors:
+	Build fix for G_STRFUNC (Srinivasa Ragavan)
+	Warning fix (Matthew Barnes)
+
+Updated Translations:
+	Duarte Loreto (pt)
+	Theppitak Karoonboonyanan (th)
+	Artur Flinta (pl)
+	Arangel Angov (mk)
+	Andre Klapper (de)
+	Ignacio Casal Quinteiro (gl)
+	Leonardo Ferreira Fontenelle (pt_BR)
+	Jorge Gonzalez (es)
+	Khaled Hosny (ar)
+	Djihed Afifi (ar)
+	Yannig Marchegay (oc)
+
 GtkHTML-3.17.90 2008-01-28
 --------------------------
 

Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c	Tue Feb 26 05:35:13 2008
@@ -1313,6 +1313,13 @@
 	  NULL,
 	  NULL },
 
+	{ "file-menu",
+	  NULL,
+	  N_("_File"),
+	  NULL,
+	  NULL,
+	  NULL },
+
 	{ "format-menu",
 	  NULL,
 	  N_("_Format"),
@@ -1353,6 +1360,13 @@
 	  N_("_Current Languages"),
 	  NULL,
 	  NULL,
+	  NULL },
+
+	{ "view-menu",
+	  NULL,
+	  N_("_View"),
+	  NULL,
+	  NULL,
 	  NULL }
 };
 

Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor.ui
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor.ui	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor.ui	Tue Feb 26 05:35:13 2008
@@ -1,5 +1,7 @@
 <ui>
   <menubar name='main-menu'>
+    <placeholder name='pre-file-menu'/>
+    <menu action='file-menu'/>
     <placeholder name='pre-edit-menu'/>
     <menu action='edit-menu'>
       <menuitem action='undo'/>
@@ -19,6 +21,8 @@
       <menuitem action='spell-check'/>
       <menu action='language-menu'/>
     </menu>
+    <placeholder name='pre-view-menu'/>
+    <menu action='view-menu'/>
     <placeholder name='pre-insert-menu'/>
     <menu action='insert-menu'>
       <menuitem action='insert-image'/>

Modified: branches/mbarnes-composer/components/editor/gtkhtml-spell-language.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-spell-language.c	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-spell-language.c	Tue Feb 26 05:35:13 2008
@@ -130,12 +130,15 @@
 
 	if (mapped_file != NULL) {
 		GMarkupParseContext *context;
+		const gchar *contents;
+		gsize length;
 
 		context = g_markup_parse_context_new (
 			parser, 0, hash_table, NULL);
+		contents = g_mapped_file_get_contents (mapped_file);
+		length = g_mapped_file_get_length (mapped_file);
 		g_markup_parse_context_parse (
-			context, g_mapped_file_get_contents (mapped_file),
-			g_mapped_file_get_length (mapped_file), &error);
+			context, contents, length, &error);
 		g_markup_parse_context_free (context);
 		g_mapped_file_free (mapped_file);
 	}

Modified: branches/mbarnes-composer/components/editor/main.c
==============================================================================
--- branches/mbarnes-composer/components/editor/main.c	(original)
+++ branches/mbarnes-composer/components/editor/main.c	Tue Feb 26 05:35:13 2008
@@ -30,30 +30,26 @@
 static const gchar *file_ui =
 "<ui>\n"
 "  <menubar name='main-menu'>\n"
-"    <placeholder name='pre-edit-menu'>\n"
-"      <menu action='file-menu'>\n"
-"       <menuitem action='save'/>\n"
-"       <menuitem action='save-as'/>\n"
-"       <separator/>\n"
-"       <menuitem action='print-preview'/>\n"
-"       <menuitem action='print'/>\n"
-"       <separator/>\n"
-"       <menuitem action='quit'/>\n"
-"      </menu>\n"
-"    </placeholder>\n"
+"    <menu action='file-menu'>\n"
+"     <menuitem action='save'/>\n"
+"     <menuitem action='save-as'/>\n"
+"     <separator/>\n"
+"     <menuitem action='print-preview'/>\n"
+"     <menuitem action='print'/>\n"
+"     <separator/>\n"
+"     <menuitem action='quit'/>\n"
+"    </menu>\n"
 "  </menubar>\n"
 "</ui>";
 
 static const gchar *view_ui =
 "<ui>\n"
 "  <menubar name='main-menu'>\n"
-"    <placeholder name='pre-insert-menu'>\n"
-"      <menu action='view-menu'>\n"
-"       <menuitem action='view-html-output'/>\n"
-"       <menuitem action='view-html-source'/>\n"
-"       <menuitem action='view-plain-source'/>\n"
-"      </menu>\n"
-"    </placeholder>\n"
+"    <menu action='view-menu'>\n"
+"     <menuitem action='view-html-output'/>\n"
+"     <menuitem action='view-html-source'/>\n"
+"     <menuitem action='view-plain-source'/>\n"
+"    </menu>\n"
 "  </menubar>\n"
 "</ui>";
 

Modified: branches/mbarnes-composer/configure.in
==============================================================================
--- branches/mbarnes-composer/configure.in	(original)
+++ branches/mbarnes-composer/configure.in	Tue Feb 26 05:35:13 2008
@@ -37,7 +37,7 @@
 
 AC_DEFINE(BONOBO_DISABLE_DEPRECATED,1,[No deprecated bonobo functions])
 
-AM_INIT_AUTOMAKE($PACKAGE, 3.17.91)
+AM_INIT_AUTOMAKE($PACKAGE, 3.17.92)
 
 AM_MAINTAINER_MODE
 

Modified: branches/mbarnes-composer/gtkhtml/gtkhtml.c
==============================================================================
--- branches/mbarnes-composer/gtkhtml/gtkhtml.c	(original)
+++ branches/mbarnes-composer/gtkhtml/gtkhtml.c	Tue Feb 26 05:35:13 2008
@@ -2359,6 +2359,7 @@
 			html_engine_jump_to_object (e, obj, offset);
 		}
 
+		update_primary_selection (GTK_HTML (w));
 		g_signal_emit (GTK_HTML (w), signals [CURSOR_CHANGED], 0);
 
 		return TRUE;
@@ -4402,9 +4403,15 @@
 	g_return_if_fail (html != NULL);
 	g_return_if_fail (GTK_IS_HTML (html));
 
+	if (!html->allow_selection)
+		return;
+
 	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (html), GDK_SELECTION_PRIMARY);
 
 	text = get_selection_string (html, &text_len, FALSE, TRUE, FALSE, FALSE);
+	if (!text)
+		return;
+
 	gtk_clipboard_set_text (clipboard, text, text_len);
 
 	g_free (text);
@@ -4605,6 +4612,7 @@
 		return;
 
 	if (skip == GTK_HTML_CURSOR_SKIP_NONE) {
+		update_primary_selection (html);
 		g_signal_emit (GTK_HTML (html), signals [CURSOR_CHANGED], 0);
 		return;
 	}
@@ -4701,6 +4709,7 @@
 	html->priv->update_styles = TRUE;
 	gtk_html_edit_make_cursor_visible (html);
 	html_engine_update_selection_active_state (html->engine, html->priv->event_time);
+	update_primary_selection (html);
 	g_signal_emit (GTK_HTML (html), signals [CURSOR_CHANGED], 0);
 }
 
@@ -5578,6 +5587,7 @@
 		html_engine_select_word (e);
 
 	html_engine_update_selection_active_state (html->engine, html->priv->event_time);
+	update_primary_selection (html);
 }
 
 void
@@ -5595,6 +5605,7 @@
 		html_engine_select_line (e);
 
 	html_engine_update_selection_active_state (html->engine, html->priv->event_time);
+	update_primary_selection (html);
 }
 
 void
@@ -5613,6 +5624,7 @@
 	   html_engine_select_paragraph (e); */
 
 	html_engine_update_selection_active_state (html->engine, html->priv->event_time);
+	update_primary_selection (html);
 }
 
 void
@@ -5631,6 +5643,7 @@
 	   html_engine_select_paragraph (e); */
 
 	html_engine_update_selection_active_state (html->engine, html->priv->event_time);
+	update_primary_selection (html);
 }
 
 void
@@ -5650,6 +5663,7 @@
 	}
 
 	html_engine_update_selection_active_state (html->engine, html->priv->event_time);
+	update_primary_selection (html);
 }
 
 void