From cba3097cad7443810117bded371a2e3088a33d12 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 20 Mar 2007 17:23:58 +0000
Subject: ** 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
---
 smime/ChangeLog                 | 6 ++++++
 smime/gui/ca-trust-dialog.c     | 2 +-
 smime/gui/cert-trust-dialog.c   | 2 +-
 smime/gui/certificate-manager.c | 2 +-
 smime/gui/certificate-viewer.c  | 2 +-
 smime/gui/component.c           | 2 +-
 smime/gui/e-cert-selector.c     | 2 +-
 smime/lib/e-cert-db.c           | 2 +-
 smime/lib/e-cert.c              | 2 +-
 smime/lib/e-pkcs12.c            | 2 +-
 10 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'smime')

diff --git a/smime/ChangeLog b/smime/ChangeLog
index 918785077e..fa82bf49f5 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2006-10-01  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* lib/e-asn1-object.c: (build_from_der): Initialize a pointer
diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c
index 9278a13537..e2035d5a31 100644
--- a/smime/gui/ca-trust-dialog.c
+++ b/smime/gui/ca-trust-dialog.c
@@ -30,7 +30,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 
 #include "e-util/e-util-private.h"
diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c
index 49efaea83c..d6c62e59c7 100644
--- a/smime/gui/cert-trust-dialog.c
+++ b/smime/gui/cert-trust-dialog.c
@@ -36,7 +36,7 @@
 #include <gtk/gtkdialog.h>
 #include <gtk/gtklabel.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 
 #include "e-util/e-util-private.h"
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 6ae1b7f4e2..3db0daf1c3 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -29,7 +29,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <glade/glade.h>
 #include "evolution-config-control.h"
diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index 1090b5eff3..66f7ab4c1f 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -31,7 +31,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 
 #include "e-util/e-util-private.h"
diff --git a/smime/gui/component.c b/smime/gui/component.c
index 6e424b3c67..5fcd6c0478 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -29,7 +29,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserverui/e-passwords.h>
 
 #include "ca-trust-dialog.h"
diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c
index 7241d867b6..b6f670e541 100644
--- a/smime/gui/e-cert-selector.c
+++ b/smime/gui/e-cert-selector.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <gtk/gtktextview.h>
 #include <gtk/gtkoptionmenu.h>
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index a735d57201..0ca814b2d6 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -90,7 +90,7 @@
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-util-private.h"
 #include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserverui/e-passwords.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index 5403912afa..215b5f492e 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -62,7 +62,7 @@
 
 #include <time.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>	/* for e_utf8_strftime, what about e_time_format_time? */
 
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index be5d16138a..d67767679e 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -63,7 +63,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserverui/e-passwords.h>
 
 #include <time.h>
-- 
cgit v1.2.3