From cf5ae6bf0560a62e108eb43b172e1ee837d0aa9c Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 4 Apr 2011 15:50:58 +0200
Subject: Revert "-Fix use of include <config.h> to make sure translations
 work"

This reverts commit f0f99ffaa08240fbb72d7eed198368fd22fe4c47.

Sorry, I didn't mean to push that...
---
 libempathy-gtk/empathy-contact-blocking-dialog.c | 4 ----
 libempathy-gtk/empathy-contact-search-dialog.c   | 4 ----
 libempathy/empathy-account-settings.c            | 3 ---
 libempathy/empathy-auth-factory.c                | 4 ----
 libempathy/empathy-connection-managers.c         | 3 ---
 libempathy/empathy-debug.h                       | 3 +++
 libempathy/empathy-ft-handler.c                  | 4 ----
 libempathy/empathy-presence-manager.c            | 6 ++----
 libempathy/empathy-server-sasl-handler.c         | 4 ----
 libempathy/empathy-server-tls-handler.c          | 4 ----
 libempathy/empathy-tp-streamed-media.c           | 4 ----
 src/empathy-invite-participant-dialog.c          | 4 ----
 src/empathy-streamed-media-window.c              | 3 ---
 13 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 7fbdd1466..a46820c5d 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -22,10 +22,6 @@
  * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib/gi18n.h>
 
 #include <libempathy/empathy-utils.h>
diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c
index 6e9473b8b..aeb0767d3 100644
--- a/libempathy-gtk/empathy-contact-search-dialog.c
+++ b/libempathy-gtk/empathy-contact-search-dialog.c
@@ -23,10 +23,6 @@
  *     Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib/gi18n.h>
 
 #include <telepathy-glib/telepathy-glib.h>
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 12fbb5564..4005d2790 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index 218b2dc2c..36f7fda55 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -18,10 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "empathy-auth-factory.h"
 
 #include <telepathy-glib/interfaces.h>
diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
index c821bdc0c..30a9b8471 100644
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h
index d3db917b9..44e197792 100644
--- a/libempathy/empathy-debug.h
+++ b/libempathy/empathy-debug.h
@@ -21,6 +21,9 @@
 #ifndef __EMPATHY_DEBUG_H__
 #define __EMPATHY_DEBUG_H__
 
+#include "config.h"
+
+
 #include <glib.h>
 #include <telepathy-glib/debug.h>
 
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index af0233aef..1c3f4209e 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -21,10 +21,6 @@
 
 /* empathy-ft-handler.c */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <telepathy-glib/account-channel-request.h>
diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index 79d704659..c3eae6583 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -18,12 +18,10 @@
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "empathy-presence-manager.h"
 
+#include <config.h>
+
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index 2fbaed7ae..8c7fe8847 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -17,10 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "empathy-server-sasl-handler.h"
 
 #include <telepathy-glib/telepathy-glib.h>
diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c
index 774fba995..31afa276c 100644
--- a/libempathy/empathy-server-tls-handler.c
+++ b/libempathy/empathy-server-tls-handler.c
@@ -18,10 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "empathy-server-tls-handler.h"
 
 #include <telepathy-glib/interfaces.h>
diff --git a/libempathy/empathy-tp-streamed-media.c b/libempathy/empathy-tp-streamed-media.c
index 302d344a3..b79e4b6b5 100644
--- a/libempathy/empathy-tp-streamed-media.c
+++ b/libempathy/empathy-tp-streamed-media.c
@@ -20,10 +20,6 @@
  *          Xavier Claessens <xclaesse@gmail.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <string.h>
 
 #include <telepathy-glib/proxy-subclass.h>
diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index 7621376bc..da75e72cd 100644
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -9,10 +9,6 @@
  *    Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib/gi18n.h>
 
 #include "empathy-invite-participant-dialog.h"
diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c
index 81cec4492..bb6df685c 100644
--- a/src/empathy-streamed-media-window.c
+++ b/src/empathy-streamed-media-window.c
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
-- 
cgit v1.2.3