Author: stephan
Date: 2008-11-17 22:20:34 +0000 (Mon, 17 Nov 2008)
New Revision: 28841
Modified:
xfconf/trunk/xfconf-query/Makefile.am
xfconf/trunk/xfconf-query/main.c
Log:
Prevent me from being kicked by ofourdan
Modified: xfconf/trunk/xfconf-query/Makefile.am
===================================================================
--- xfconf/trunk/xfconf-query/Makefile.am 2008-11-17 22:15:11 UTC (rev
28840)
+++ xfconf/trunk/xfconf-query/Makefile.am 2008-11-17 22:20:34 UTC (rev
28841)
@@ -6,6 +6,7 @@
xfconf_query_CFLAGS = \
$(GLIB_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
-I$(top_srcdir)/common \
-DDATADIR=\"$(datadir)\" \
@@ -16,6 +17,7 @@
$(top_builddir)/common/libxfconf-gvaluefuncs.la \
$(top_builddir)/xfconf/libxfconf-0.la \
$(GLIB_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
$(DBUS_GLIB_LIBS)
INCLUDES = \
Modified: xfconf/trunk/xfconf-query/main.c
===================================================================
--- xfconf/trunk/xfconf-query/main.c 2008-11-17 22:15:11 UTC (rev 28840)
+++ xfconf/trunk/xfconf-query/main.c 2008-11-17 22:20:34 UTC (rev 28841)
@@ -55,6 +55,8 @@
#include <glib/gi18n.h>
#endif
+#include <libxfce4util/libxfce4util.h>
+
#include "xfconf-gvaluefuncs.h"
#include "xfconf-common-private.h"
#include "xfconf/xfconf.h"
@@ -244,6 +246,12 @@
gboolean prop_exists;
gint fd = -1;
+ #ifdef ENABLE_NLS
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+ #endif
+
g_type_init();
if(!xfconf_init(&error))
{
@@ -251,10 +259,7 @@
g_error_free(error);
return 1;
}
-
- setlocale(LC_ALL, GETTEXT_PACKAGE);
-
GOptionContext *context = g_option_context_new("- xfconf commandline
utility");
g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
