camel/camel-i18n.h gone, adapt to it properly

mail/em-format-html-print.c

@@ -26,10 +26,10 @@
 #endif
 
 #include <string.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gtkhtml/gtkhtml.h>
 
-#include <camel/camel-i18n.h>
 #include "mail-ops.h"
 #include "mail-mt.h"
 #include "em-format-html-print.h"

mail/mail-session.c

@@ -30,6 +30,7 @@
 #include <string.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
 #include <gtk/gtk.h>
@@ -45,7 +46,6 @@
 
 #include <camel/camel.h>	/* FIXME: this is where camel_init is defined, it shouldn't include everything else */
 #include <camel/camel-filter-driver.h>
-#include <camel/camel-i18n.h>
 
 #include "e-util/e-util.h"
 #include "e-util/e-alert-dialog.h"

plugins/groupwise-features/camel-gw-listener.c

@@ -26,7 +26,7 @@
 
 #include "camel-gw-listener.h"
 #include <string.h>
-#include  <camel/camel-i18n.h>
+#include <glib/gi18n.h>
 #include <e-gw-connection.h>
 #include <libedataserverui/e-passwords.h>
 #include "e-util/e-alert-dialog.h"

plugins/hula-account-setup/camel-hula-listener.c

@@ -25,7 +25,7 @@
 #endif
 
 #include <string.h>
-#include <camel/camel-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-account.h>
 #include "camel-hula-listener.h"

plugins/sa-junk-plugin/em-junk-filter.c

@@ -40,12 +40,12 @@
 #include <camel/camel-data-wrapper.h>
 #include <camel/camel-stream-fs.h>
 #include <camel/camel-stream-mem.h>
-#include <camel/camel-i18n.h>
 #include <mail/em-junk.h>
 #include <mail/em-utils.h>
 #include <e-util/e-mktemp.h>
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include "mail/em-config.h"
 
 #include <gconf/gconf-client.h>