gvfs r1330 - in trunk: . client gconf hal
- From: cneumair svn gnome org
- To: svn-commits-list gnome org
- Subject: gvfs r1330 - in trunk: . client gconf hal
- Date: Fri, 22 Feb 2008 12:46:01 +0000 (GMT)
Author: cneumair
Date: Fri Feb 22 12:46:00 2008
New Revision: 1330
URL: http://svn.gnome.org/viewvc/gvfs?rev=1330&view=rev
Log:
2007-02-22 Christian Neumair <cneumair gnome org>
* gconf/gconf-module.c: (g_io_module_load):
* gconf/Makefile.am:
* hal/hal-module.c: (g_io_module_load):
* hal/Makefile.am:
* client/gdaemonvfs.c: (g_daemon_vfs_init):
* client/Makefile.am:
Bind to GVFS text domain. Fixes #517892.
Modified:
trunk/ChangeLog
trunk/client/Makefile.am
trunk/client/gdaemonvfs.c
trunk/gconf/Makefile.am
trunk/gconf/gconf-module.c
trunk/hal/Makefile.am
trunk/hal/hal-module.c
Modified: trunk/client/Makefile.am
==============================================================================
--- trunk/client/Makefile.am (original)
+++ trunk/client/Makefile.am Fri Feb 22 12:46:00 2008
@@ -6,6 +6,7 @@
$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
-DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
-DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\" \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-DDBUS_API_SUBJECT_TO_CHANGE
module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_vfs_.*|g_io_module_load|g_io_module_unload'
Modified: trunk/client/gdaemonvfs.c
==============================================================================
--- trunk/client/gdaemonvfs.c (original)
+++ trunk/client/gdaemonvfs.c Fri Feb 22 12:46:00 2008
@@ -175,7 +175,10 @@
GVfsUriMapper *mapper;
GList *modules;
int i;
-
+
+ bindtextdomain (GETTEXT_PACKAGE, GVFS_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
vfs->async_bus = dbus_bus_get_private (DBUS_BUS_SESSION, NULL);
if (vfs->async_bus == NULL)
Modified: trunk/gconf/Makefile.am
==============================================================================
--- trunk/gconf/Makefile.am (original)
+++ trunk/gconf/Makefile.am Fri Feb 22 12:46:00 2008
@@ -20,6 +20,7 @@
$(GLIB_CFLAGS) \
$(GCONF_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-DG_DISABLE_DEPRECATED \
$(NULL)
Modified: trunk/gconf/gconf-module.c
==============================================================================
--- trunk/gconf/gconf-module.c (original)
+++ trunk/gconf/gconf-module.c Fri Feb 22 12:46:00 2008
@@ -22,7 +22,10 @@
* Author: David Zeuthen <davidz redhat com>
*/
+#include <config.h>
+
#include <glib.h>
+#include <glib/gi18n-lib.h>
#include <gmodule.h>
#include <gio/gio.h>
@@ -31,6 +34,9 @@
void
g_io_module_load (GIOModule *module)
{
+ bindtextdomain (GETTEXT_PACKAGE, GVFS_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
g_app_lookup_gconf_register (module);
}
Modified: trunk/hal/Makefile.am
==============================================================================
--- trunk/hal/Makefile.am (original)
+++ trunk/hal/Makefile.am Fri Feb 22 12:46:00 2008
@@ -33,6 +33,7 @@
$(GLIB_CFLAGS) \
$(HAL_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-DG_DISABLE_DEPRECATED \
$(NULL)
Modified: trunk/hal/hal-module.c
==============================================================================
--- trunk/hal/hal-module.c (original)
+++ trunk/hal/hal-module.c Fri Feb 22 12:46:00 2008
@@ -22,7 +22,10 @@
* Author: David Zeuthen <davidz redhat com>
*/
+#include <config.h>
+
#include <glib.h>
+#include <glib/gi18n-lib.h>
#include <gmodule.h>
#include <gio/gio.h>
@@ -36,6 +39,9 @@
void
g_io_module_load (GIOModule *module)
{
+ bindtextdomain (GETTEXT_PACKAGE, GVFS_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
hal_device_register (module);
hal_pool_register (module);
g_hal_drive_register (module);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]