[meego-commits] 5004: Changes to MeeGo:1.0:Netbook:Update:Testing/gtkhtml3

[mmeeks]

Hi,
I have made the following changes to gtkhtml3 in project MeeGo:1.0:Netbook:Update:Testing. Please review and accept ASAP.

Thank You,
mmeeks

[This message was auto-generated]

---

Request #5004:

  submit:   home:mmeeks:branches:MeeGo:1.0:Netbook:Update:Testing/gtkhtml3(r2)(cleanup) -> MeeGo:1.0:Netbook:Update:Testing/gtkhtml3


Message:
    fix bmc#182 - missing gettext calls breaking emoticon l10n

State:   new          2010-06-29T03:51:50 mmeeks
Comment: None



changes files:
--------------
--- gtkhtml3.changes
+++ gtkhtml3.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+* Tue Jun 29 2010 Michael Meeks <michael.meeks at novell.com> - 3.30.0
+- fix bmc#182 - emoticon translation
+

new:
----
  gtkhtml-emoticons-bug-182.patch

spec files:
-----------
--- gtkhtml3.spec
+++ gtkhtml3.spec
@@ -18,6 +18,7 @@
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Source: http://download.gnome.org/sources/gtkhtml/3.29/gtkhtml-%{version}.tar.bz2
 Patch0: htmltable.patch
+Patch1: gtkhtml-emoticons-bug-182.patch
 
 ### Dependencies ###
 
@@ -52,6 +53,7 @@
 %prep
 %setup -q -n gtkhtml-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 

other changes:
--------------

++++++ gtkhtml-emoticons-bug-182.patch (new)
--- gtkhtml-emoticons-bug-182.patch
+++ gtkhtml-emoticons-bug-182.patch
+commit e2fc37ebd85032fac0a72d534854362867e2c840
+Author: Mario Carrion <mario at carrion.mx>
+Date:   Fri Apr 9 12:20:29 2010 +0530
+
+    Bug 615205 - Translations not working in Emoticons and Find/Replace dialogs.
+
+diff --git a/components/editor/gtkhtml-editor-private.c b/components/editor/gtkhtml-editor-private.c
+index 0fed468..1c420e9 100644
+--- a/components/editor/gtkhtml-editor-private.c
++++ b/components/editor/gtkhtml-editor-private.c
+@@ -192,6 +192,8 @@ gtkhtml_editor_private_init (GtkhtmlEditor *editor)
+ 	filename = gtkhtml_editor_find_data_file ("gtkhtml-editor-builder.ui");
+ 
+ 	priv->builder = gtk_builder_new ();
++	/* To keep translated strings in subclasses */
++        gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE);
+ 	if (!gtk_builder_add_from_file (priv->builder, filename, &error)) {
+ 		g_critical ("Couldn't load builder file: %s\n", error->message);
+ 		g_clear_error (&error);
+diff --git a/components/editor/gtkhtml-face-chooser-menu.c b/components/editor/gtkhtml-face-chooser-menu.c
+index 86c2f23..a6aba96 100644
+--- a/components/editor/gtkhtml-face-chooser-menu.c
++++ b/components/editor/gtkhtml-face-chooser-menu.c
+@@ -18,8 +18,11 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include "gtkhtml-face-chooser.h"
+ #include "gtkhtml-face-chooser-menu.h"
+ 
++#include <glib/gi18n-lib.h>
++
+ #define GTKHTML_FACE_CHOOSER_MENU_GET_PRIVATE(obj) \
+ 	(G_TYPE_INSTANCE_GET_PRIVATE \
+ 	((obj), GTKHTML_TYPE_FACE_CHOOSER_MENU, GtkhtmlFaceChooserMenuPrivate))
+@@ -147,7 +150,8 @@ face_chooser_menu_init (GtkhtmlFaceChooserMenu *chooser_menu)
+ 		GtkhtmlFace *face = iter->data;
+ 		GtkWidget *item;
+ 
+-		item = gtk_image_menu_item_new_with_mnemonic (face->label);
++		/* To keep translated strings in subclasses */
++		item = gtk_image_menu_item_new_with_mnemonic (_(face->label));
+ 		gtk_image_menu_item_set_image (
+ 			GTK_IMAGE_MENU_ITEM (item),
+ 			gtk_image_new_from_icon_name (