Include i18n header after defining GETTEXT_PACKAGE macro

9 files changed, 36 insertions, 20 deletions

diff --git a/sendto/caja-nste.c b/sendto/caja-nste.c
index a59ae56..f730242 100644
--- a/sendto/caja-nste.c
+++ b/sendto/caja-nste.c
@@ -21,15 +21,18 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-#include <string.h>
+#endif
+
 #include <glib/gi18n-lib.h>
+
+#include <string.h>
 #include <libcaja-extension/caja-extension-types.h>
 #include <libcaja-extension/caja-file-info.h>
 #include <libcaja-extension/caja-menu-provider.h>
 #include "caja-nste.h"
 
-
 static GObjectClass *parent_class;
 
 static void
diff --git a/sendto/caja-sendto-command.c b/sendto/caja-sendto-command.c
index 9f46904..1574e7e 100644
--- a/sendto/caja-sendto-command.c
+++ b/sendto/caja-sendto-command.c
@@ -21,10 +21,13 @@
  * Author:  Roberto Majadas <[email protected]>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <stdlib.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
@@ -38,7 +41,6 @@
 
 #define SOEXT           ("." G_MODULE_SUFFIX)
 
-
 enum {
 	COLUMN_ICON,
 	COLUMN_DESCRIPTION,
diff --git a/sendto/caja-sendto-module.c b/sendto/caja-sendto-module.c
index 5c8c13b..af0fd0f 100644
--- a/sendto/caja-sendto-module.c
+++ b/sendto/caja-sendto-module.c
@@ -21,12 +21,16 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
 #include <libcaja-extension/caja-extension-types.h>
 #include <libcaja-extension/caja-column-provider.h>
-#include <glib/gi18n-lib.h>
-#include "caja-nste.h"
 
+#include "caja-nste.h"
 
 void
 caja_module_initialize (GTypeModule*module)
@@ -38,14 +42,12 @@ caja_module_initialize (GTypeModule*module)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 }
 
-
 void
 caja_module_shutdown (void)
 {
 	g_print ("Shutting down caja-sendto extension\n");
 }
 
-
 void
 caja_module_list_types (const GType **types,
 			    int          *num_types)
@@ -57,6 +59,3 @@ caja_module_list_types (const GType **types,
 
 	*num_types = 1;
 }
-
-
-
diff --git a/sendto/plugins/caja-burn/caja-burn.c b/sendto/plugins/caja-burn/caja-burn.c
index 91a4f2f..fe0570d 100644
--- a/sendto/plugins/caja-burn/caja-burn.c
+++ b/sendto/plugins/caja-burn/caja-burn.c
@@ -21,10 +21,13 @@
  * Author:  Jader Henrique da Silva <[email protected]>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
-#include <string.h>
 #include <glib/gi18n-lib.h>
+
+#include <string.h>
 #include "nst-common.h"
 #include "caja-sendto-plugin.h"
 
@@ -164,12 +167,11 @@ gboolean send_files (NstPlugin *plugin,
 }
 
 static
-gboolean destroy (NstPlugin *plugin){
-
+gboolean destroy (NstPlugin *plugin)
+{
 	g_object_unref (burn);
 	burn = NULL;
 	return TRUE;
-
 }
 
 static
@@ -187,4 +189,3 @@ NstPluginInfo plugin_info = {
 };
 
 NST_INIT_PLUGIN (plugin_info)
-
diff --git a/sendto/plugins/emailclient/emailclient.c b/sendto/plugins/emailclient/emailclient.c
index 6729efd..a3289c5 100644
--- a/sendto/plugins/emailclient/emailclient.c
+++ b/sendto/plugins/emailclient/emailclient.c
@@ -23,9 +23,12 @@
  *           Stefano Karapetsas <[email protected]>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n-lib.h>
+
 #include <string.h>
 #include "caja-sendto-plugin.h"
 #include <gio/gio.h>
@@ -275,4 +278,3 @@ NstPluginInfo plugin_info = {
 };
 
 NST_INIT_PLUGIN (plugin_info)
-
diff --git a/sendto/plugins/gajim/gajim.c b/sendto/plugins/gajim/gajim.c
index fe22fe1..881af6c 100644
--- a/sendto/plugins/gajim/gajim.c
+++ b/sendto/plugins/gajim/gajim.c
@@ -22,9 +22,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n-lib.h>
+
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include "caja-sendto-plugin.h"
@@ -38,7 +41,6 @@ const gchar *COMPLETION_PROPS[] = {"name", "jid"};
 static GHashTable *jid_table = NULL;
 static gchar *iconset;
 
-
 DBusGProxy *proxy = NULL;
 
 /*
@@ -516,4 +518,3 @@ NstPluginInfo plugin_info = {
 };
 
 NST_INIT_PLUGIN (plugin_info)
-
diff --git a/sendto/plugins/pidgin/pidgin.c b/sendto/plugins/pidgin/pidgin.c
index d4525e1..5ee4af2 100644
--- a/sendto/plugins/pidgin/pidgin.c
+++ b/sendto/plugins/pidgin/pidgin.c
@@ -25,9 +25,12 @@
  * Author:  Roberto Majadas <[email protected]>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n-lib.h>
+
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include "caja-sendto-plugin.h"
diff --git a/sendto/plugins/removable-devices/removable-devices.c b/sendto/plugins/removable-devices/removable-devices.c
index 191c2a7..f64b17c 100644
--- a/sendto/plugins/removable-devices/removable-devices.c
+++ b/sendto/plugins/removable-devices/removable-devices.c
@@ -19,10 +19,13 @@
  *           Bastien Nocera <[email protected]>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
-#include <string.h>
 #include <glib/gi18n-lib.h>
+
+#include <string.h>
 #include <gio/gio.h>
 #include "nst-common.h"
 #include "caja-sendto-plugin.h"
@@ -257,4 +260,3 @@ NstPluginInfo plugin_info = {
 };
 
 NST_INIT_PLUGIN (plugin_info)
-
diff --git a/sendto/plugins/upnp/upnp.c b/sendto/plugins/upnp/upnp.c
index 62cb2cb..9843cbb 100644
--- a/sendto/plugins/upnp/upnp.c
+++ b/sendto/plugins/upnp/upnp.c
@@ -25,9 +25,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n-lib.h>
+
 #include <libgupnp/gupnp.h>
 #include "caja-sendto-plugin.h"