From c162a93f72d38ce37a2da2e5ead3126d79f0aed5 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Fri, 23 Jan 2004 18:07:44 +0000 Subject: Allow passing the translation domain to ephy_dialog_construct, to make 2004-01-23 Christian Persch * 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. --- lib/ephy-dialog.c | 13 ++++++++----- lib/ephy-dialog.h | 8 +++++--- lib/ephy-glade.c | 13 +++++++++---- lib/ephy-glade.h | 7 +++++-- 4 files changed, 27 insertions(+), 14 deletions(-) (limited to 'lib') 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 -- cgit v1.2.3