summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Ruprecht <cmaiku@gmail.com>2018-12-08 21:59:14 -0600
committerMike Ruprecht <cmaiku@gmail.com>2018-12-08 21:59:14 -0600
commit459f898cdcb3e71284152f0304c5d3c927d67915 (patch)
tree7c4d11039a8a036f95052ccde75c6b0f651bd3e9
parentb9952a252de791ad6a5e1a72a3cc7a77f4482cdd (diff)
downloadpidgin-459f898cdcb3e71284152f0304c5d3c927d67915.tar.gz
Include 'locale.h' directly in files which use setlocale()
In preparation for making the 'nls' build option only enable/disable building the po/ directory, this patch includes 'locale.h' in files which use it directly.
-rw-r--r--finch/libfinch.c3
-rw-r--r--pidgin/libpidgin.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/finch/libfinch.c b/finch/libfinch.c
index d0f938c67c..ec5e2e7118 100644
--- a/finch/libfinch.c
+++ b/finch/libfinch.c
@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include <internal.h>
+#include <locale.h>
#include "finch.h"
#include "account.h"
@@ -156,11 +157,9 @@ init_libpurple(int argc, char **argv)
{NULL}
};
-#ifdef ENABLE_NLS
bindtextdomain(PACKAGE, PURPLE_LOCALEDIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
textdomain(PACKAGE);
-#endif
setlocale(LC_ALL, "");
diff --git a/pidgin/libpidgin.c b/pidgin/libpidgin.c
index ccfd85017e..ce9f88d850 100644
--- a/pidgin/libpidgin.c
+++ b/pidgin/libpidgin.c
@@ -21,6 +21,7 @@
*
*/
+#include <locale.h>
#include "internal.h"
#include "pidgin.h"
@@ -717,11 +718,9 @@ int pidgin_start(int argc, char *argv[])
purple_debug_set_enabled(TRUE);
#endif
-#ifdef ENABLE_NLS
bindtextdomain(PACKAGE, PURPLE_LOCALEDIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
textdomain(PACKAGE);
-#endif
/* Locale initialization is not complete here. See gtk_init_check() */
setlocale(LC_ALL, "");