colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2006-05-24 Robert Love <rml@novell.com>

Browse Source 
* gnome/applet/main.c, gnome/vpn-properties/nm-vpn-properties.c,
	  src/NetworkManager.c: Take care to call bindtextdomain with the
	  location of msgid files.
	* src/Makefile.am: Set GNOMELOCALEDIR to the location of GNOME mo
	  files.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1758 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2006-05-24 14:16:48 +00:00
committed by Robert Love
parent e8f14d0ffc
commit a4ac9ec0fb
5 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2006-05-24 Robert Love <rml@novell.com>
* gnome/applet/main.c, gnome/vpn-properties/nm-vpn-properties.c,
src/NetworkManager.c: Take care to call bindtextdomain with the
location of msgid files.
* src/Makefile.am: Set GNOMELOCALEDIR to the location of GNOME mo
files.
2006-05-22 Robert Love <rml@novell.com> 2006-05-22 Robert Love <rml@novell.com>
* src/nm-device-802-11-wireless.c: Don't chain up to the parent's * src/nm-device-802-11-wireless.c: Don't chain up to the parent's

2
gnome/applet/main.c
View File

@@ -52,7 +52,7 @@ int main (int argc, char *argv[])
g_signal_connect (client, "save_yourself", G_CALLBACK (gtk_true), NULL); g_signal_connect (client, "save_yourself", G_CALLBACK (gtk_true), NULL);
g_signal_connect (client, "die", G_CALLBACK (session_die), NULL); g_signal_connect (client, "die", G_CALLBACK (session_die), NULL);
bindtextdomain (GETTEXT_PACKAGE, NULL); bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);

2
gnome/vpn-properties/nm-vpn-properties.c
View File

@@ -1086,7 +1086,7 @@ main (int argc, char *argv[])
{ NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL } { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
}; };
bindtextdomain (GETTEXT_PACKAGE, NULL); bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);

1
src/Makefile.am
View File

@@ -106,6 +106,7 @@ NetworkManager_CPPFLAGS = \
-DSYSCONFDIR=\"$(sysconfdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \
-DLOCALSTATEDIR=\"$(localstatedir)\" \ -DLOCALSTATEDIR=\"$(localstatedir)\" \
-DNM_RUN_DIR=\"$(rundir)\" \ -DNM_RUN_DIR=\"$(rundir)\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DARP_DEBUG -DARP_DEBUG

9
src/NetworkManager.c
View File

@@ -19,6 +19,10 @@
* (C) Copyright 2004 Red Hat, Inc. * (C) Copyright 2004 Red Hat, Inc.
*/ */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <glib.h> #include <glib.h>
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h> #include <dbus/dbus-glib-lowlevel.h>
@@ -32,6 +36,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <libintl.h>
#include "NetworkManager.h" #include "NetworkManager.h"
#include "nm-utils.h" #include "nm-utils.h"
@@ -684,6 +689,10 @@ int main( int argc, char *argv[] )
return (EXIT_FAILURE); return (EXIT_FAILURE);
} }
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
/* Parse options */ /* Parse options */
while (1) while (1)
{ {