Include i18n header after defining GETTEXT_PACKAGE macro

21 files changed, 86 insertions, 46 deletions

diff --git a/gksu/libcaja-gksu.c b/gksu/libcaja-gksu.c
index 9b7410e..177acf3 100644
--- a/gksu/libcaja-gksu.c
+++ b/gksu/libcaja-gksu.c
@@ -1,3 +1,9 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -10,14 +16,8 @@
 #include <libcaja-extension/caja-extension-types.h>
 #include <libcaja-extension/caja-menu-provider.h>
 
-#include <config.h>
-
-#include <libintl.h>
-#define _(x) dgettext (GETTEXT_PACKAGE, x)
-
 #define GKSU_TYPE_CONTEXT_MENU (gksu_context_menu_get_type ())
 
-
 typedef struct {
     GObject parent;
 } GksuContextMenu;
diff --git a/image-converter/caja-image-converter.c b/image-converter/caja-image-converter.c
index 7598813..b7f80b8 100644
--- a/image-converter/caja-image-converter.c
+++ b/image-converter/caja-image-converter.c
@@ -22,16 +22,17 @@
  */
 
 #ifdef HAVE_CONFIG_H
- #include <config.h> /* for GETTEXT_PACKAGE */
+#include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include "caja-image-converter.h"
 #include "caja-image-resizer.h"
 #include "caja-image-rotator.h"
 
 #include <libcaja-extension/caja-menu-provider.h>
 
-#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
 #include <string.h> /* for strcmp */
diff --git a/image-converter/caja-image-resizer.c b/image-converter/caja-image-resizer.c
index c16de1e..d8c6221 100644
--- a/image-converter/caja-image-resizer.c
+++ b/image-converter/caja-image-resizer.c
@@ -22,14 +22,15 @@
  */
 
 #ifdef HAVE_CONFIG_H
- #include <config.h> /* for GETTEXT_PACKAGE */
+#include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include "caja-image-resizer.h"
 
 #include <string.h>
 
-#include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
diff --git a/image-converter/caja-image-rotator.c b/image-converter/caja-image-rotator.c
index aad9b12..83e76b0 100644
--- a/image-converter/caja-image-rotator.c
+++ b/image-converter/caja-image-rotator.c
@@ -22,14 +22,15 @@
  */
 
 #ifdef HAVE_CONFIG_H
- #include <config.h> /* for GETTEXT_PACKAGE */
+#include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include "caja-image-rotator.h"
 
 #include <string.h>
 
-#include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
diff --git a/image-converter/image-converter.c b/image-converter/image-converter.c
index d793ef9..868ebb4 100644
--- a/image-converter/image-converter.c
+++ b/image-converter/image-converter.c
@@ -22,12 +22,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
- #include <config.h>
+#include <config.h>
 #endif
 
-#include "caja-image-converter.h"
+#include <glib/gi18n-lib.h>
 
-#include <libintl.h>
+#include "caja-image-converter.h"
 
 static GType type_list[1];
 
diff --git a/open-terminal/caja-open-terminal.c b/open-terminal/caja-open-terminal.c
index f12ce12..45950b2 100644
--- a/open-terminal/caja-open-terminal.c
+++ b/open-terminal/caja-open-terminal.c
@@ -22,15 +22,16 @@
  */
 
 #ifdef HAVE_CONFIG_H
- #include <config.h> /* for GETTEXT_PACKAGE */
+#include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include "caja-open-terminal.h"
 
 #include <libcaja-extension/caja-menu-provider.h>
 #include <libcaja-extension/caja-configurable.h>
 
-#include <glib/gi18n-lib.h>
 #include <gtk/gtkicontheme.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkmain.h>
diff --git a/open-terminal/open-terminal.c b/open-terminal/open-terminal.c
index ff21ec1..b7a9e78 100644
--- a/open-terminal/open-terminal.c
+++ b/open-terminal/open-terminal.c
@@ -22,12 +22,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
- #include <config.h>
+#include <config.h>
 #endif
 
-#include "caja-open-terminal.h"
+#include <glib/gi18n-lib.h>
 
-#include <libintl.h>
+#include "caja-open-terminal.h"
 
 static GType type_list[1];
 
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"
 
diff --git a/share/caja-share.c b/share/caja-share.c
index e66fc3f..0f69921 100644
--- a/share/caja-share.c
+++ b/share/caja-share.c
@@ -23,6 +23,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include <libcaja-extension/caja-extension-types.h>
 #include <libcaja-extension/caja-column-provider.h>
 #include <libcaja-extension/caja-extension-types.h>
@@ -33,8 +35,6 @@
 
 #include "caja-share.h"
 
-#include <glib/gi18n-lib.h>
-
 #include <gio/gio.h>
 
 #include <gtk/gtk.h>
diff --git a/share/shares.c b/share/shares.c
index 927de49..b628321 100644
--- a/share/shares.c
+++ b/share/shares.c
@@ -1,9 +1,14 @@
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
 #include <string.h>
 #include <time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <glib/gi18n-lib.h>
+
 #include "shares.h"
 
 #undef DEBUG_SHARES
diff --git a/wallpaper/caja-wallpaper-command.c b/wallpaper/caja-wallpaper-command.c
index 0a7de1a..d1cb755 100644
--- a/wallpaper/caja-wallpaper-command.c
+++ b/wallpaper/caja-wallpaper-command.c
@@ -22,10 +22,15 @@
  *           Stefano Karapetsas <[email protected]>
  */
 
+#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-wallpaper-extension.h"
 
 void
diff --git a/wallpaper/caja-wallpaper-extension.c b/wallpaper/caja-wallpaper-extension.c
index 138c5c7..5f1e143 100644
--- a/wallpaper/caja-wallpaper-extension.c
+++ b/wallpaper/caja-wallpaper-extension.c
@@ -22,10 +22,14 @@
  *           Stefano Karapetsas <[email protected]>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
 #include <string.h>
 #include <gio/gio.h>
-#include <glib/gi18n-lib.h>
 #include <libcaja-extension/caja-extension-types.h>
 #include <libcaja-extension/caja-file-info.h>
 #include <libcaja-extension/caja-menu-provider.h>
diff --git a/xattr-tags/caja-xattr-tags-extension.c b/xattr-tags/caja-xattr-tags-extension.c
index 7b470ca..9435215 100644
--- a/xattr-tags/caja-xattr-tags-extension.c
+++ b/xattr-tags/caja-xattr-tags-extension.c
@@ -20,13 +20,19 @@
  *  Authors: Felipe Barriga Richards <[email protected]>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
 #include <string.h>
 #include <gio/gio.h>
-#include <glib/gi18n-lib.h>
+
 #include <libcaja-extension/caja-file-info.h>
 #include <libcaja-extension/caja-info-provider.h>
 #include <libcaja-extension/caja-column-provider.h>
+
 #include "caja-xattr-tags-extension.h"
 
 #define XATTR_TAGS_NAME "Xattr::Tags"