[maemo-commits] [maemo-commits] r13912 - in projects/haf/trunk/hildon-plugins-settings: . src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-09-19 13:29:58 +0300 (Wed, 19 Sep 2007)
New Revision: 13912

Modified:
   projects/haf/trunk/hildon-plugins-settings/ChangeLog
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-cell-renderer-button.c
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-config-parser.c
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c
Log:
2007-09-19  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hildon-plugin-cell-renderer-button.c,
	src/hildon-plugin-settings-dialog.c
	(hildon_plugin_settings_dialog_init),
	src/hildon-plugin-config-parser.c, src/hildon-plugin-settings.c: never
	re-bind the gettext domain and explicitly use the plugin-specific
	domain on all translatable messages in order to avoid braking control
	panel translations (as the plugin runs in the same process than
	control panel). Fixes: NB#70144.


Modified: projects/haf/trunk/hildon-plugins-settings/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-09-19 10:05:17 UTC (rev 13911)
+++ projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-09-19 10:29:58 UTC (rev 13912)
@@ -1,3 +1,14 @@
+2007-09-19  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hildon-plugin-cell-renderer-button.c,
+	src/hildon-plugin-settings-dialog.c
+	(hildon_plugin_settings_dialog_init),
+	src/hildon-plugin-config-parser.c, src/hildon-plugin-settings.c: never
+	re-bind the gettext domain and explicitly use the plugin-specific
+	domain on all translatable messages in order to avoid braking control
+	panel translations (as the plugin runs in the same process than
+	control panel). Fixes: NB#70144.
+
 2007-09-13  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hildon-plugin-settings-dialog.c:

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-cell-renderer-button.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-cell-renderer-button.c	2007-09-19 10:05:17 UTC (rev 13911)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-cell-renderer-button.c	2007-09-19 10:29:58 UTC (rev 13912)
@@ -23,6 +23,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "hildon-plugin-cell-renderer-button.h"
 #include "hildon-plugin-module-settings.h"
 #include <gtk/gtkbutton.h>
@@ -31,7 +35,7 @@
 #include <gtk/gtkdialog.h>
 #include <glib/gi18n.h>
 
-#define CELL_RENDERER_ORGANISE _("tncpa_bv_tnsb_organise")
+#define CELL_RENDERER_ORGANISE dgettext(GETTEXT_PACKAGE, "tncpa_bv_tnsb_organise")
 
 static void hildon_plugin_cell_renderer_button_get_property  (GObject                    *object,
 						    	      guint                       param_id,

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-config-parser.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-config-parser.c	2007-09-19 10:05:17 UTC (rev 13911)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-config-parser.c	2007-09-19 10:29:58 UTC (rev 13912)
@@ -23,6 +23,11 @@
  *
  */
 
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "hildon-plugin-config-parser.h"
 #include "hildon-plugin-module-settings.h"
 
@@ -351,7 +356,7 @@
            (GTK_LIST_STORE (parser->tm), &iter,
 	    hildon_plugin_config_parser_get_key_id 
 	      (parser,(const gchar *)l->data)+HP_PREDEFINED_COLS,
-	    _(_string),
+	    dgettext(GETTEXT_PACKAGE, _string),
 	    -1);
        }
        else

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c	2007-09-19 10:05:17 UTC (rev 13911)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c	2007-09-19 10:29:58 UTC (rev 13912)
@@ -35,8 +35,10 @@
 #include <gtk/gtktreemodelfilter.h>
 #include <gtk/gtktreeview.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
 
+#include <libintl.h>
+#define _(a) dgettext(GETTEXT_PACKAGE, a)
+
 #include <hildon-desktop/hd-config.h>
 
 #include <hildon/hildon-helper.h>
@@ -155,10 +157,6 @@
   settings->priv->type = HILDON_PLUGIN_SETTINGS_DIALOG_TYPE_DIALOG;
 
   settings->priv->hide_home = TRUE;
-
-  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-  textdomain (GETTEXT_PACKAGE);
 }
 
 static void 

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c	2007-09-19 10:05:17 UTC (rev 13911)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c	2007-09-19 10:29:58 UTC (rev 13912)
@@ -43,9 +43,6 @@
 #define SB_CATEGORY_TEMPORAL "temporal"
 #define SB_CATEGORY_CONDITIONAL "conditional"
 
-#include <libintl.h>
-#define _(a) dgettext(PACKAGE, a)
-
 #define TN_MAX_ITEMS 3
 
 /* HARDCODE_PARTY */