Allow passing the translation domain to ephy_dialog_construct, to make

2004-01-23  Christian Persch  <chpe@cvs.gnome.org>

	* embed/downloader-view.c: (downloader_view_build_ui):
	* embed/find-dialog.c: (find_dialog_init):
	* embed/mozilla/GtkNSSDialogs.cpp:
	* embed/print-dialog.c: (ephy_print_dialog_new),
	(ephy_print_setup_dialog_new):
	* lib/ephy-dialog.c: (impl_construct), (ephy_dialog_construct):
	* lib/ephy-dialog.h:
	* lib/ephy-glade.c: (ephy_glade_widget_new):
	* lib/ephy-glade.h:
	* src/ephy-encoding-dialog.c: (ephy_encoding_dialog_init):
	* src/pdm-dialog.c: (pdm_dialog_init):
	* src/prefs-dialog.c: (setup_add_language_dialog),
	(prefs_dialog_init):

	Allow passing the translation domain to ephy_dialog_construct,
	to make extension's dialogues translatable. Fix all callers.

11 files changed, 60 insertions, 30 deletions

diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index 54f94ea5c..f79f5c2c0 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -1,5 +1,6 @@
 /*
- *  Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti
+ *  Copyright (C) 2000-2004 Marco Pesenti Gritti
+ *  Copyright (C) 2003, 2004 Xan Lopez
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -434,7 +435,8 @@ downloader_view_build_ui (DownloaderView *dv)
 	ephy_dialog_construct (d,
                                properties,
 			       ephy_file ("epiphany.glade"),
-                               "download_manager_dialog");
+                               "download_manager_dialog",
+			       NULL);
 
 	/* lookup needed widgets */
 	priv->window = ephy_dialog_get_control(d, properties[PROP_WINDOW].id);
diff --git a/embed/find-dialog.c b/embed/find-dialog.c
index 4412539bd..53bb8e3b5 100755
--- a/embed/find-dialog.c
+++ b/embed/find-dialog.c
@@ -1,5 +1,7 @@
 /*
  *  Copyright (C) 2002 Jorn Baayen
+ *  Copyright (C) 2003 Marco Pesenti Gritti
+ *  Copyright (C) 2003, 2004 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -254,7 +256,9 @@ find_dialog_init (FindDialog *dialog)
 	ephy_dialog_construct (EPHY_DIALOG(dialog),
 			       properties,
 			       ephy_file ("epiphany.glade"),
-			       "find_dialog");
+			       "find_dialog",
+			       NULL);
+
 	update_navigation_controls (dialog, TRUE, TRUE);
 
 	window = ephy_dialog_get_control (EPHY_DIALOG (dialog),
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index 9c54f420c..fa86c08cf 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -1256,7 +1256,7 @@ GtkNSSDialogs::ViewCert(nsIInterfaceRequestor *ctx,
 
 	gxml = ephy_glade_widget_new (ephy_file ("certificate-dialogs.glade"),
 				      "viewcert_dialog",
-				      &dialog, NULL);
+				      &dialog, NULL, NULL);
 
 	nsCOMPtr<nsIDOMWindow> parent = do_GetInterface (ctx);
 	GtkWidget *gparent = MozillaFindGtkParent (parent);
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index 37953f015..4fc54788c 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2002 Jorn Baayen
- *  Copyright (C) 2003 Christian Persch
+ *  Copyright (C) 2003, 2004 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -330,8 +330,11 @@ ephy_print_dialog_new (GtkWidget *parent,
 		g_object_set (G_OBJECT (dialog), "parent-window", parent, NULL);
 	}
 
-	ephy_dialog_construct (dialog,  print_props,
-			       ephy_file ("print.glade"), "print_dialog");
+	ephy_dialog_construct (dialog, 
+			       print_props,
+			       ephy_file ("print.glade"),
+			       "print_dialog",
+			       NULL);
 
 	window = ephy_dialog_get_control (dialog, print_props[WINDOW_PROP].id);
 	icon = gtk_widget_render_icon (window, 
@@ -359,9 +362,11 @@ ephy_print_setup_dialog_new (void)
 
 	dialog = EPHY_DIALOG (g_object_new (EPHY_TYPE_DIALOG, NULL));
 
-	ephy_dialog_construct (dialog, setup_props,
+	ephy_dialog_construct (dialog,
+			       setup_props,
 			       ephy_file ("print.glade"),
-			       "print_setup_dialog");
+			       "print_setup_dialog",
+			       NULL);
 
 	ephy_dialog_add_enum (dialog, setup_props[PAPER_PROP].id,
 			      n_paper_format_enum, paper_format_enum);
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index ae2f8598c..61af99312 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2000-2003 Marco Pesenti Gritti
- *  Copyright (C) 2003 Christian Persch
+ *  Copyright (C) 2003, 2004 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -989,11 +989,13 @@ static void
 impl_construct (EphyDialog *dialog,
 		const EphyDialogProperty *properties,
 		const char *file,
-		const char *name)
+		const char *name,
+		const char *domain)
 {
 	GladeXML *gxml;
 
-	gxml = ephy_glade_widget_new (file, name, &(dialog->priv->dialog), dialog);
+	gxml = ephy_glade_widget_new
+		(file, name, &(dialog->priv->dialog), dialog, domain);
 
 	if (dialog->priv->name == NULL)
 	{
@@ -1139,10 +1141,11 @@ void
 ephy_dialog_construct (EphyDialog *dialog,
 		       const EphyDialogProperty *properties,
 		       const char *file,
-		       const char *name)
+		       const char *name,
+		       const char *domain)
 {
 	EphyDialogClass *klass = EPHY_DIALOG_GET_CLASS (dialog);
-	return klass->construct (dialog, properties, file, name);
+	return klass->construct (dialog, properties, file, name, domain);
 }
 
 void
diff --git a/lib/ephy-dialog.h b/lib/ephy-dialog.h
index 2a956464d..085f692cd 100644
--- a/lib/ephy-dialog.h
+++ b/lib/ephy-dialog.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2000-2003 Marco Pesenti Gritti
- *  Copyright (C) 2003 Christian Persch
+ *  Copyright (C) 2003, 2004 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -66,7 +66,8 @@ struct EphyDialogClass
 	void	(* construct)	(EphyDialog *dialog,
 				 const EphyDialogProperty *properties,
 				 const char *file,
-				 const char *name);
+				 const char *name,
+				 const char *domain);
 	void	(* show)	(EphyDialog *dialog);
 };
 
@@ -87,7 +88,8 @@ EphyDialog     *ephy_dialog_new_with_parent	(GtkWidget *parent_window);
 void		ephy_dialog_construct		(EphyDialog *dialog,
 						 const EphyDialogProperty *properties,
 						 const char *file,
-						 const char *name);
+						 const char *name,
+						 const char *domain);
 
 void		ephy_dialog_add_enum		(EphyDialog *dialog,
 						 const char *id,
diff --git a/lib/ephy-glade.c b/lib/ephy-glade.c
index 0c782bae9..39487d744 100644
--- a/lib/ephy-glade.c
+++ b/lib/ephy-glade.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000 Marco Pesenti Gritti
+ *  Copyright (C) 2000, 2004 Marco Pesenti Gritti
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -14,6 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
 #include "ephy-glade.h"
@@ -34,15 +36,18 @@ glade_signal_connect_func (const gchar *cb_name, GObject *obj,
  * signals attached and data set to the provided parameter.
  */
 GladeXML *
-ephy_glade_widget_new (const char *file, const char *widget_name,
-		       GtkWidget **root, gpointer data)
+ephy_glade_widget_new (const char *file,
+		       const char *widget_name,
+		       GtkWidget **root,
+		       gpointer data,
+		       const char *domain)
 {
 	GladeXML *gxml;
 
 	/* build the widget */
 	/* note that libglade automatically caches the parsed file,
 	 * so we don't need to worry about the efficiency of this */
-	gxml = glade_xml_new (file, widget_name, NULL);
+	gxml = glade_xml_new (file, widget_name, domain);
 	g_return_val_if_fail (gxml != NULL, NULL);
 
 	/* lookup the root widget if requested */
diff --git a/lib/ephy-glade.h b/lib/ephy-glade.h
index cccf22f24..0295fd00a 100644
--- a/lib/ephy-glade.h
+++ b/lib/ephy-glade.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000 Marco Pesenti Gritti
+ *  Copyright (C) 2000, 2004 Marco Pesenti Gritti
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -14,6 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
 #ifndef EPHY_GLADE_H
@@ -34,7 +36,8 @@ G_BEGIN_DECLS
 GladeXML   *ephy_glade_widget_new	(const char *file,
 					 const char *widget_name,
 					 GtkWidget **root,
-					 gpointer data);
+					 gpointer data,
+					 const char *domain);
 
 G_END_DECLS
 
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index f3df12558..69ccf13a1 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2000, 2001, 2002, 2003 Marco Pesenti Gritti
- *  Copyright (C) 2003 Christian Persch
+ *  Copyright (C) 2003, 2004 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -319,7 +319,8 @@ ephy_encoding_dialog_init (EphyEncodingDialog *dialog)
 	ephy_dialog_construct (EPHY_DIALOG (dialog),
 			       properties,
 			       ephy_file ("epiphany.glade"),
-			       "encoding_dialog");
+			       "encoding_dialog",
+			       NULL);
 
 	dialog->priv->filter = ephy_node_filter_new ();
 
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 6d77006d1..43525fedd 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -1,6 +1,7 @@
 /*
  *  Copyright (C) 2002 Jorn Baayen
  *  Copyright (C) 2003 Marco Pesenti Gritti
+ *  Copyright (C) 2003, 2004 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -786,7 +787,8 @@ pdm_dialog_init (PdmDialog *dialog)
 	ephy_dialog_construct (EPHY_DIALOG(dialog),
 			       properties,
 			       ephy_file ("epiphany.glade"),
-			       "pdm_dialog");
+			       "pdm_dialog",
+			       NULL);
 
 	/**
 	 * Group all Properties and Remove buttons in the same size group to
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index d0a9b1e4b..24abf552f 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 200-2003 Marco Pesenti Gritti
- *  Copyright (C) 2003 Christian Persch
+ *  Copyright (C) 2003, 2004 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -795,9 +795,11 @@ setup_add_language_dialog (PrefsDialog *pd)
 					     "parent-window", window,
 					     NULL));
 
-	ephy_dialog_construct (dialog,  add_lang_props,
+	ephy_dialog_construct (dialog, 
+			       add_lang_props,
 			       ephy_file ("prefs-dialog.glade"),
-			       "add_language_dialog");
+			       "add_language_dialog",
+			       NULL);
 
 	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
 
@@ -1147,7 +1149,8 @@ prefs_dialog_init (PrefsDialog *pd)
 	ephy_dialog_construct (dialog,
 			       properties,
 			       ephy_file ("prefs-dialog.glade"),
-			       "prefs_dialog");
+			       "prefs_dialog",
+			       NULL);
 
 	ephy_dialog_add_enum (dialog, properties[ACCEPT_COOKIES_PROP].id,
 			      n_cookies_accept_enum, cookies_accept_enum);