diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2007-03-21 01:23:58 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-03-21 01:23:58 +0800 |
commit | cba3097cad7443810117bded371a2e3088a33d12 (patch) | |
tree | b4bf9ba6b6c9b5433c8ac2614694d7bf76d87ff0 /e-util/e-i18n.h | |
parent | 2313e47dab3e8151743138892277b08cf78034cc (diff) | |
download | gsoc2013-evolution-cba3097cad7443810117bded371a2e3088a33d12.tar gsoc2013-evolution-cba3097cad7443810117bded371a2e3088a33d12.tar.gz gsoc2013-evolution-cba3097cad7443810117bded371a2e3088a33d12.tar.bz2 gsoc2013-evolution-cba3097cad7443810117bded371a2e3088a33d12.tar.lz gsoc2013-evolution-cba3097cad7443810117bded371a2e3088a33d12.tar.xz gsoc2013-evolution-cba3097cad7443810117bded371a2e3088a33d12.tar.zst gsoc2013-evolution-cba3097cad7443810117bded371a2e3088a33d12.zip |
** Fixes bug #419524
2007-03-20 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #419524
* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
* e-util/e-xml-utils.c (e_xml_get_child_by_name_by_lang_list):
* mail/em-migrate.c (emm_setup_initial):
* shell/e-component-registry.c (query_components):
* shell/e-shell-settings-dialog.c (load_pages):
* shell/e-shell-window-commands.c (command_quick_reference):
* tools/killev.c (main):
Use g_get_language_names() instead of gnome_i18n_get_language_list().
* e-util/e-util.c: Remove e_gettext().
* e-util/Makefile.am: Remove e-i18n.h.
svn path=/trunk/; revision=33319
Diffstat (limited to 'e-util/e-i18n.h')
-rw-r--r-- | e-util/e-i18n.h | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/e-util/e-i18n.h b/e-util/e-i18n.h deleted file mode 100644 index d98afa31c8..0000000000 --- a/e-util/e-i18n.h +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * e-i18n.h - * Copyright 2000, 2001, Ximian, Inc. - * - * Authors: - * Chris Lahey <clahey@ximian.com> - * - * Copied from gnome-i18nP.h, because this header is typically not installed - * - * This file has to be included before any file from the GNOME libraries - * to have this override the definitions that are pulled from the gnome-i18n.h - * - * the difference is that gnome-i18n.h is used for applications, and this is - * used by libraries (because libraries have to use dcgettext instead of - * gettext and they need to provide the translation domain, unlike apps). - * - * So you can just put this after you include config.h - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#ifndef __E_I18N_H__ -#define __E_I18N_H__ - -#include <libgnome/gnome-i18n.h> - -G_BEGIN_DECLS - -#ifdef ENABLE_NLS - /* this function is defined in e-util.c */ - extern char *e_gettext (const char *msgid); -# undef _ -# ifdef GNOME_EXPLICIT_TRANSLATION_DOMAIN -/* No parentheses allowed here since that breaks string concatenation. */ -# define E_I18N_DOMAIN GNOME_EXPLICIT_TRANSLATION_DOMAIN -# else -/* No parentheses allowed here since that breaks string concatenation. */ -# define E_I18N_DOMAIN GETTEXT_PACKAGE -# endif -# define _(String) e_gettext (String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -/* Stubs that do something close enough. */ -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -/* No parentheses allowed here since that breaks string concatenation. */ -# define E_I18N_DOMAIN "" -#endif - -G_END_DECLS - -#endif /* __E_I18N_H__ */ |