Revert "-Fix use of include <config.h> to make sure translations work"

This reverts commit f0f99ffaa08240fbb72d7eed198368fd22fe4c47.

Sorry, I didn't mean to push that...

diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 7fbdd14669f7583514d600eebfba290e35e4cb04..a46820c5d8f1f015d328e8bc0a5da03fb8023d00 100644 (file)
--- 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 6e9473b8ba93605266b369497e55252bf5984679..aeb0767d377a30809d692eab07463ceb6507f341 100644 (file)
--- 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 12fbb55644d995e22490401f9033bcf160b410d6..4005d279031cde9aa1ec41ebde6f3f886ec89281 100644 (file)
--- 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 218b2dc2c62f96789e7f7c98ce137cde550219c0..36f7fda557d2ec120512b048c8ec95537b9f8183 100644 (file)
--- 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 c821bdc0c3c366dda385d388596be58d1811b71c..30a9b8471ea412c6d6c46b90d44a030c02019d8d 100644 (file)
--- 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 d3db917b990355ea6da6cb9bb7ca2a676ee3d70a..44e197792b69cf6be2f845f332c156e766549cd7 100644 (file)
--- 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 af0233aeff539cb21ea66e7c75c8ccd7f8dbe475..1c3f4209eb9b9cf4c7b88b30dded8d31c66f3c92 100644 (file)
--- 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 79d7046599795b7e15c348a5bcdc69608dcdcfd8..c3eae65834fae5f4e7afc2b5b00e7afd94593285 100644 (file)
--- 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 2fbaed7aef873a7ae776baf621f1d7d9c1eddea3..8c7fe884723f45f74df5cd1e0331fd80e3276b67 100644 (file)
--- 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 774fba9951d88425fcf8e9893c5c3ea820b5cda8..31afa276c58fa627c1d74d4c95a125572e398e29 100644 (file)
--- 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 302d344a3ba9f446d7568460825b8bf2f756a6fa..b79e4b6b5712748efded0f964cbeda8a954e4f0b 100644 (file)
--- 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 7621376bceee564b340aa2865d1984acc3118afe..da75e72cdb4cec19a12358df8576699cd81df0e9 100644 (file)
--- 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 81cec4492e47cd5d280f88698e14c3c2c2e0f277..bb6df685cebf58509a619ad1869788b1a8a8657a 100644 (file)
--- 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>