Re: capplet NLS support

[Yuusuke Tahara <m5021212 u-aizu ac jp>]

tahara> Hi,

tahara> Please apply this patch for gettextized messages on a capplet.

Let's explain this patch.
In libgnome/gnome-i18n.h, nls definition will be disabled, if
no ENABLE_NLS is defined.  So, please move the line #include <config.h>
to head of the source file.

I also make a patch for nls support of other conduit capplets.

--- Tahara Yuusuke <m5021212@u-aizu.ac.jp>
-> The University of Aizu / Department of Computer Systems
-> http://www.u-aizu.ac.jp/~m5021212/
-> http://gehenna.u-aizu.ac.jp/~tahara/
-> ICQ: 38459330(@work), 35702748(@lab), 14439176(@home)
diff --exclude=debian --exclude=po -urN gnome-pilot-0.1.46.orig/conduits/backup/Makefile.in gnome-pilot-0.1.46/conduits/backup/Makefile.in
--- gnome-pilot-0.1.46.orig/conduits/backup/Makefile.in	Wed Dec  8 09:21:21 1999
+++ gnome-pilot-0.1.46/conduits/backup/Makefile.in	Wed Dec  8 20:01:06 1999
@@ -137,7 +137,7 @@
 ZVT_LIBS = @ZVT_LIBS@
 l = @l@
 
-INCLUDES = -I$(includedir) -I../../gpilotd $(GNOME_INCLUDEDIR) $(PISOCK_INCLUDEDIR) 	-DG_LOG_DOMAIN=\"backupconduit\"
+INCLUDES = -I$(includedir) -I../../gpilotd $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(PISOCK_INCLUDEDIR) 	-DG_LOG_DOMAIN=\"backupconduit\"
 
 
 backup_conduitsdir = $(libdir)/gnome-pilot/conduits
diff --exclude=debian --exclude=po -urN gnome-pilot-0.1.46.orig/conduits/backup/backup-conduit-control-applet.c gnome-pilot-0.1.46/conduits/backup/backup-conduit-control-applet.c
--- gnome-pilot-0.1.46.orig/conduits/backup/backup-conduit-control-applet.c	Fri Oct 29 03:07:21 1999
+++ gnome-pilot-0.1.46/conduits/backup/backup-conduit-control-applet.c	Wed Dec  8 20:00:37 1999
@@ -2,7 +2,7 @@
 /* based on                                                                 */
 /* gpilotd control applet ('capplet') for use with the GNOME control center */
 
-
+#include <config.h>
 #include <pwd.h>
 #include <sys/types.h>
 #include <signal.h>
@@ -13,7 +13,6 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include <config.h>
 #include <capplet-widget.h>
 
 #include <gpilotd/gpilotd-conduit-mgmt.h>
@@ -395,6 +394,9 @@
 int
 main( int argc, char *argv[] )
 {
+	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
+	textdomain (PACKAGE);
+
 	/* we're a capplet */
 	gnome_capplet_init ("backup conduit control applet", NULL, argc, argv, 
 			    NULL,
diff --exclude=debian --exclude=po -urN gnome-pilot-0.1.46.orig/conduits/email/Makefile.in gnome-pilot-0.1.46/conduits/email/Makefile.in
--- gnome-pilot-0.1.46.orig/conduits/email/Makefile.in	Wed Dec  8 09:21:22 1999
+++ gnome-pilot-0.1.46/conduits/email/Makefile.in	Wed Dec  8 19:57:14 1999
@@ -137,7 +137,7 @@
 ZVT_LIBS = @ZVT_LIBS@
 l = @l@
 
-INCLUDES = -I$(includedir) -I../../gpilotd $(GNOME_INCLUDEDIR) $(PISOCK_INCLUDEDIR)
+INCLUDES = -I$(includedir) -I../../gpilotd $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(PISOCK_INCLUDEDIR)
 
 email_conduitsdir = $(libdir)/gnome-pilot/conduits
 
diff --exclude=debian --exclude=po -urN gnome-pilot-0.1.46.orig/conduits/email/email-conduit-control-applet.c gnome-pilot-0.1.46/conduits/email/email-conduit-control-applet.c
--- gnome-pilot-0.1.46.orig/conduits/email/email-conduit-control-applet.c	Tue Nov  2 05:17:51 1999
+++ gnome-pilot-0.1.46/conduits/email/email-conduit-control-applet.c	Wed Dec  8 19:46:21 1999
@@ -3,12 +3,12 @@
 /* based on                                                                 */
 /* gpilotd control applet ('capplet') for use with the GNOME control center */
 
+#include <config.h>
 #include <pwd.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <gnome.h>
 
-#include <config.h>
 #include <capplet-widget.h>
 
 #include <gpilotd/gpilotd-conduit-mgmt.h>
@@ -477,6 +477,9 @@
 int
 main( int argc, char *argv[] )
 {
+    bindtextdomain (PACKAGE, GNOMELOCALEDIR);
+    textdomain (PACKAGE);
+
     /* we're a capplet */
     gnome_capplet_init ("email conduit control applet", NULL, argc, argv, 
 			NULL,
diff --exclude=debian --exclude=po -urN gnome-pilot-0.1.46.orig/conduits/expense/Makefile.in gnome-pilot-0.1.46/conduits/expense/Makefile.in
--- gnome-pilot-0.1.46.orig/conduits/expense/Makefile.in	Wed Dec  8 09:21:24 1999
+++ gnome-pilot-0.1.46/conduits/expense/Makefile.in	Wed Dec  8 20:02:48 1999
@@ -137,7 +137,7 @@
 ZVT_LIBS = @ZVT_LIBS@
 l = @l@
 
-INCLUDES = -I$(includedir) -I../../gpilotd $(GNOME_INCLUDEDIR) $(PISOCK_INCLUDEDIR)
+INCLUDES = -I$(includedir) -I../../gpilotd $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(PISOCK_INCLUDEDIR)
 
 expense_conduitsdir = $(libdir)/gnome-pilot/conduits
 
diff --exclude=debian --exclude=po -urN gnome-pilot-0.1.46.orig/conduits/expense/expense-conduit-control-applet.c gnome-pilot-0.1.46/conduits/expense/expense-conduit-control-applet.c
--- gnome-pilot-0.1.46.orig/conduits/expense/expense-conduit-control-applet.c	Wed Nov 10 05:06:52 1999
+++ gnome-pilot-0.1.46/conduits/expense/expense-conduit-control-applet.c	Wed Dec  8 20:02:30 1999
@@ -3,12 +3,12 @@
 /* based on                                                                 */
 /* gpilotd control applet ('capplet') for use with the GNOME control center */
 
+#include <config.h>
 #include <pwd.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <gnome.h>
 
-#include <config.h>
 #include <capplet-widget.h>
 
 #include <gpilotd/gpilotd-conduit-mgmt.h>
@@ -511,6 +511,9 @@
 int
 main( int argc, char *argv[] )
 {
+	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
+	textdomain (PACKAGE);
+
         /* we're a capplet */
         gnome_capplet_init ("Expense conduit control applet", NULL, argc, argv, 
                             NULL,
diff --exclude=debian --exclude=po -urN gnome-pilot-0.1.46.orig/conduits/file/Makefile.in gnome-pilot-0.1.46/conduits/file/Makefile.in
--- gnome-pilot-0.1.46.orig/conduits/file/Makefile.in	Wed Dec  8 09:21:19 1999
+++ gnome-pilot-0.1.46/conduits/file/Makefile.in	Wed Dec  8 20:06:36 1999
@@ -137,7 +137,7 @@
 ZVT_LIBS = @ZVT_LIBS@
 l = @l@
 
-INCLUDES = -I$(includedir) -I../../gpilotd $(GNOME_INCLUDEDIR) $(PISOCK_INCLUDEDIR) 	-DG_LOG_DOMAIN=\"fileconduit\"
+INCLUDES = -I$(includedir) -I../../gpilotd $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(PISOCK_INCLUDEDIR) 	-DG_LOG_DOMAIN=\"fileconduit\"
 
 
 file_conduitsdir = $(libdir)/gnome-pilot/conduits
diff --exclude=debian --exclude=po -urN gnome-pilot-0.1.46.orig/conduits/file/file-conduit-control-applet.c gnome-pilot-0.1.46/conduits/file/file-conduit-control-applet.c
--- gnome-pilot-0.1.46.orig/conduits/file/file-conduit-control-applet.c	Mon Nov 22 11:15:15 1999
+++ gnome-pilot-0.1.46/conduits/file/file-conduit-control-applet.c	Wed Dec  8 20:03:18 1999
@@ -2,12 +2,12 @@
 /* based on                                                                 */
 /* gpilotd control applet ('capplet') for use with the GNOME control center */
 
+#include <config.h>
 #include <pwd.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <gnome.h>
 
-#include <config.h>
 #include <capplet-widget.h>
 
 #include "gpilotd/gpilotd-conduit-mgmt.h"
@@ -257,6 +257,9 @@
 int
 main( int argc, char *argv[] )
 {
+    bindtextdomain (PACKAGE, GNOMELOCALEDIR);
+    textdomain (PACKAGE);
+
     /* we're a capplet */
     gnome_capplet_init ("file conduit control applet", NULL, argc, argv, 
 			NULL,
diff --exclude=debian --exclude=po -urN gnome-pilot-0.1.46.orig/conduits/memo_file/Makefile.in gnome-pilot-0.1.46/conduits/memo_file/Makefile.in
--- gnome-pilot-0.1.46.orig/conduits/memo_file/Makefile.in	Wed Dec  8 09:21:23 1999
+++ gnome-pilot-0.1.46/conduits/memo_file/Makefile.in	Wed Dec  8 20:04:05 1999
@@ -137,7 +137,7 @@
 ZVT_LIBS = @ZVT_LIBS@
 l = @l@
 
-INCLUDES = -I$(includedir) -I../../gpilotd $(GNOME_INCLUDEDIR) $(PISOCK_INCLUDEDIR)
+INCLUDES = -I$(includedir) -I../../gpilotd $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(PISOCK_INCLUDEDIR)
 
 memo_file_conduitsdir = $(libdir)/gnome-pilot/conduits
 
diff --exclude=debian --exclude=po -urN gnome-pilot-0.1.46.orig/conduits/memo_file/memo_file_capplet.c gnome-pilot-0.1.46/conduits/memo_file/memo_file_capplet.c
--- gnome-pilot-0.1.46.orig/conduits/memo_file/memo_file_capplet.c	Mon Nov 22 11:48:41 1999
+++ gnome-pilot-0.1.46/conduits/memo_file/memo_file_capplet.c	Wed Dec  8 20:03:48 1999
@@ -2,12 +2,12 @@
 /* based on                                                                 */
 /* gpilotd control applet ('capplet') for use with the GNOME control center */
 
+#include <config.h>
 #include <pwd.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <gnome.h>
 
-#include <config.h>
 #include <capplet-widget.h>
 
 #include <gpilotd/gpilotd-conduit-mgmt.h>
@@ -492,6 +492,9 @@
 int
 main( int argc, char *argv[] )
 {
+	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
+	textdomain (PACKAGE);
+
 	/* we're a capplet */
 	gnome_capplet_init ("memo_file conduit control applet", NULL, argc, argv, 
 			    NULL, 0, NULL);