aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2011-03-30 01:03:09 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-04-04 21:43:01 +0800
commitf0f99ffaa08240fbb72d7eed198368fd22fe4c47 (patch)
treee3215338702b00bbedec3776b9d08e481db11d32
parent9048ff4f63c8ac3174468ceb4787b658d948c6e0 (diff)
downloadgsoc2013-empathy-f0f99ffaa08240fbb72d7eed198368fd22fe4c47.tar
gsoc2013-empathy-f0f99ffaa08240fbb72d7eed198368fd22fe4c47.tar.gz
gsoc2013-empathy-f0f99ffaa08240fbb72d7eed198368fd22fe4c47.tar.bz2
gsoc2013-empathy-f0f99ffaa08240fbb72d7eed198368fd22fe4c47.tar.lz
gsoc2013-empathy-f0f99ffaa08240fbb72d7eed198368fd22fe4c47.tar.xz
gsoc2013-empathy-f0f99ffaa08240fbb72d7eed198368fd22fe4c47.tar.zst
gsoc2013-empathy-f0f99ffaa08240fbb72d7eed198368fd22fe4c47.zip
-Fix use of include <config.h> to make sure translations work
-rw-r--r--libempathy-gtk/empathy-contact-blocking-dialog.c4
-rw-r--r--libempathy-gtk/empathy-contact-search-dialog.c4
-rw-r--r--libempathy/empathy-account-settings.c3
-rw-r--r--libempathy/empathy-auth-factory.c4
-rw-r--r--libempathy/empathy-connection-managers.c3
-rw-r--r--libempathy/empathy-debug.h3
-rw-r--r--libempathy/empathy-ft-handler.c4
-rw-r--r--libempathy/empathy-presence-manager.c6
-rw-r--r--libempathy/empathy-server-sasl-handler.c4
-rw-r--r--libempathy/empathy-server-tls-handler.c4
-rw-r--r--libempathy/empathy-tp-streamed-media.c4
-rw-r--r--src/empathy-invite-participant-dialog.c4
-rw-r--r--src/empathy-streamed-media-window.c3
13 files changed, 45 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index a46820c5d..7fbdd1466 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -22,6 +22,10 @@
* 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 aeb0767d3..6e9473b8b 100644
--- a/libempathy-gtk/empathy-contact-search-dialog.c
+++ b/libempathy-gtk/empathy-contact-search-dialog.c
@@ -23,6 +23,10 @@
* 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 4005d2790..12fbb5564 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -18,6 +18,9 @@
* 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 36f7fda55..218b2dc2c 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -18,6 +18,10 @@
* 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 30a9b8471..c821bdc0c 100644
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -18,6 +18,9 @@
* 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 44e197792..d3db917b9 100644
--- a/libempathy/empathy-debug.h
+++ b/libempathy/empathy-debug.h
@@ -21,9 +21,6 @@
#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 1c3f4209e..af0233aef 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -21,6 +21,10 @@
/* 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 c3eae6583..79d704659 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -18,9 +18,11 @@
* Authors: Xavier Claessens <xclaesse@gmail.com>
*/
-#include "empathy-presence-manager.h"
-
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
+#include "empathy-presence-manager.h"
#include <string.h>
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index 8c7fe8847..2fbaed7ae 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -17,6 +17,10 @@
* 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 31afa276c..774fba995 100644
--- a/libempathy/empathy-server-tls-handler.c
+++ b/libempathy/empathy-server-tls-handler.c
@@ -18,6 +18,10 @@
* 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 b79e4b6b5..302d344a3 100644
--- a/libempathy/empathy-tp-streamed-media.c
+++ b/libempathy/empathy-tp-streamed-media.c
@@ -20,6 +20,10 @@
* 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 da75e72cd..7621376bc 100644
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -9,6 +9,10 @@
* 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 bb6df685c..81cec4492 100644
--- a/src/empathy-streamed-media-window.c
+++ b/src/empathy-streamed-media-window.c
@@ -18,6 +18,9 @@
* 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>