[evolution-patches] Fix for incorrect initial init on i18n platform, .in.in distribution and gconf warning (bug #60859)

From: Frederic Crozat <fcrozat mandrakesoft com>
To: evolution-patches lists ximian com
Subject: [evolution-patches] Fix for incorrect initial init on i18n platform, .in.in distribution and gconf warning (bug #60859)
Date: Thu, 08 Jul 2004 11:33:28 +0200

These patches fixes three problems described in bug #60859 :

-default component id to be display by shell should not be translated
(that is why you should always run programs not in english locale :)

-schemas.in.in files are not shipped in tarball, which is a pain for
packagers when translations are updated or patches are needed. Moreover,
it is better to avoid shipping generated files when it is possible.

-don't add a empty default value to an int gconf schema (gconf warning)
(/schemas/apps/evolution/addressbook/display/vpane_position)

-- 
Frederic Crozat <fcrozat mandrakesoft com>
Mandrakesoft

? evolution-1.4.5-addressbookrename.patch
? evolution-addressbook.patch
? backend/Makefile
? backend/Makefile.in
? backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server
? backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server
? backend/ebook/Makefile
? backend/ebook/Makefile.in
? backend/ebook/addressbook-common.c
? backend/ebook/addressbook-skels.c
? backend/ebook/addressbook-stubs.c
? backend/ebook/addressbook.h
? backend/ebook/e-book-marshal.c
? backend/ebook/e-book-marshal.h
? backend/ebook/evolution-ldif-importer
? backend/ebook/evolution-vcard-importer
? backend/ebook/load-gnomecard-addressbook
? backend/ebook/load-pine-addressbook
? backend/ebook/test-card
? backend/ebook/test-client
? backend/ebook/test-client-list
? backend/ebook/tests/Makefile
? backend/ebook/tests/Makefile.in
? backend/ebook/tests/ebook/Makefile
? backend/ebook/tests/ebook/Makefile.in
? backend/ebook/tests/vcard/Makefile
? backend/ebook/tests/vcard/Makefile.in
? backend/idl/Makefile
? backend/idl/Makefile.in
? backend/pas/Makefile
? backend/pas/Makefile.in
? backend/pas/addressbook-common.c
? backend/pas/addressbook-skels.c
? backend/pas/addressbook-stubs.c
? backend/pas/addressbook.h
? backend/pas/pas-marshal.c
? backend/pas/pas-marshal.h
? gui/widgets/e-addressbook-marshal.c
? gui/widgets/e-addressbook-marshal.h
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1787
diff -u -p -r1.1787 ChangeLog
--- ChangeLog	2 Jul 2004 18:32:18 -0000	1.1787
+++ ChangeLog	8 Jul 2004 09:22:05 -0000
@@ -1,3 +1,12 @@
+2004-07-08  Frederic Crozat  <fcrozat mandrakesoft com>
+
+	* gui/component/Makefile.am:
+	tarball should ship .schemas.in.in files, not generated files.
+
+	* gui/component/apps_evolution_addressbook.schemas.in.in:
+	Don't set empty default value on an int, this causes gconf warning.
+	(bug #60859)
+
 2004-07-02  Hans Petter Jansson  <hpj ximian com>
 
 	* gui/contact-list-editor/e-contact-list-editor.c
Index: gui/component/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/Makefile.am,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile.am
--- gui/component/Makefile.am	15 Apr 2004 02:14:35 -0000	1.105
+++ gui/component/Makefile.am	8 Jul 2004 09:22:05 -0000
@@ -96,7 +96,7 @@ CLEANFILES    = $(BUILT_SOURCES)
 
 EXTRA_DIST =			\
 	$(glade_DATA)		\
-	$(schema_DATA)		\
+	$(schema_in_files)	\
 	$(server_in_files)
 
 dist-hook:
Index: gui/component/apps_evolution_addressbook.schemas.in.in
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in,v
retrieving revision 1.2
diff -u -p -r1.2 apps_evolution_addressbook.schemas.in.in
--- gui/component/apps_evolution_addressbook.schemas.in.in	16 Jan 2004 03:15:19 -0000	1.2
+++ gui/component/apps_evolution_addressbook.schemas.in.in	8 Jul 2004 09:22:05 -0000
@@ -45,7 +45,6 @@
       <applyto>/apps/evolution/addressbook/display/vpane_position</applyto>
       <owner>evolution-addressbook</owner>
       <type>int</type>
-      <default></default>
       <locale name="C">
         <short>Position of the vertical pane in main view</short>
       </locale>

? ChangeLog.new
? evolution-1.5.7-migrationcrash.patch
? evolution-calendar.patch
? cal-client/Makefile
? cal-client/Makefile.in
? cal-client/client-test
? cal-client/evolution-calendar-common.c
? cal-client/evolution-calendar-skels.c
? cal-client/evolution-calendar-stubs.c
? cal-client/evolution-calendar.h
? cal-util/Makefile
? cal-util/Makefile.in
? cal-util/cal-util-marshal.c
? cal-util/cal-util-marshal.h
? cal-util/test-recur
? pcs/Makefile
? pcs/Makefile.in
? pcs/evolution-calendar-common.c
? pcs/evolution-calendar-skels.c
? pcs/evolution-calendar-stubs.c
? pcs/evolution-calendar.h
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2436
diff -u -p -r1.2436 ChangeLog
--- ChangeLog	6 Jul 2004 15:10:16 -0000	1.2436
+++ ChangeLog	8 Jul 2004 09:20:07 -0000
@@ -1,3 +1,8 @@
+2004-07-08  Frederic Crozat  <fcrozat mandrakesoft com>
+
+	* gui/Makefile.am:
+	tarball should ship .schemas.in.in files, not generated files.
+
 2004-07-06  Rodrigo Moya <rodrigo novell com>
 
 	* gui/gnome-cal.c (gnome_calendar_init): setup the widgets before
Index: gui/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/Makefile.am,v
retrieving revision 1.296
diff -u -p -r1.296 Makefile.am
--- gui/Makefile.am	18 Apr 2004 18:01:19 -0000	1.296
+++ gui/Makefile.am	8 Jul 2004 09:20:07 -0000
@@ -249,7 +249,7 @@ schema_DATA = $(schema_in_files:.schemas
 EXTRA_DIST =	 			\
 	e-calendar-marshal.list		\
 	$(glade_DATA)			\
-	$(schema_DATA)                  \
+	$(schema_in_files)              \
 	$(etspec_DATA)			\
 	$(server_in_files)

? Mailer-common.c
? Mailer-skels.c
? Mailer-stubs.c
? Mailer.h
? evolution-1.4.5-scaledown.patch
? evolution-1.4.5-utf8user.patch
? evolution-1.4.5-utf8user1.patch
? evolution-mail.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3411
diff -u -p -r1.3411 ChangeLog
--- ChangeLog	5 Jul 2004 15:08:21 -0000	1.3411
+++ ChangeLog	8 Jul 2004 09:19:16 -0000
@@ -1,3 +1,8 @@
+2004-07-08  Frederic Crozat  <fcrozat mandrakesoft com>
+
+	* Makefile.am:
+	tarball should ship .schemas.in.in files, not generated files.
+
 2004-07-02  JP Rosevaer  <jpr novell com>
 
 	* Makefile.am (SUBDIRS): Revert previous error change
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/mail/Makefile.am,v
retrieving revision 1.253
diff -u -p -r1.253 Makefile.am
--- Makefile.am	5 Jul 2004 15:08:21 -0000	1.253
+++ Makefile.am	8 Jul 2004 09:19:16 -0000
@@ -237,7 +237,7 @@ EXTRA_DIST = 				\
 	$(error_DATA)			\
 	$(error_i18n)			\
 	$(glade_DATA)			\
-	$(schema_DATA)			\
+	$(schema_in_files)		\
 	$(server_in_files)		\
 	$(etspec_DATA)			\
 	filtertypes.xml			\

? Evolution-Addressbook-SelectNames-common.c
? Evolution-Addressbook-SelectNames-skels.c
? Evolution-Addressbook-SelectNames-stubs.c
? Evolution-Addressbook-SelectNames.h
? Evolution-Wombat-common.c
? Evolution-Wombat-skels.c
? Evolution-Wombat-stubs.c
? Evolution-Wombat.h
? evolution-shell.patch
? glade/Makefile
? glade/Makefile.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1460
diff -u -p -r1.1460 ChangeLog
--- ChangeLog	6 Jul 2004 21:33:46 -0000	1.1460
+++ ChangeLog	8 Jul 2004 09:17:34 -0000
@@ -1,3 +1,11 @@
+2004-07-08  Frederic Crozat  <fcrozat mandrakesoft com>
+
+	* Makefile.am:
+	tarball should ship .schemas.in.in files, not generated files.
+
+	* apps_evolution_shell.schemas.in.in:
+	Don't translate default component id (bug #60859)
+
 2004-07-06  Rodney Dawes  <dobey novell com>
 
 	* e-shell-errors.xml.h: Add this back to CVS for translators
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/Makefile.am,v
retrieving revision 1.199
diff -u -p -r1.199 Makefile.am
--- Makefile.am	10 Jun 2004 16:30:14 -0000	1.199
+++ Makefile.am	8 Jul 2004 09:17:34 -0000
@@ -233,7 +233,7 @@ EXTRA_DIST = 					\
 	$(error_DATA)				\
 	$(error_i18n)				\
 	$(glade_DATA)				\
-	$(schema_DATA)				\
+	$(schema_in_files)			\
 	ChangeLog.pre-1-4			\
 	e-shell-marshal.list			\
 	evolution-nognome.in
Index: apps_evolution_shell.schemas.in.in
===================================================================
RCS file: /cvs/gnome/evolution/shell/apps_evolution_shell.schemas.in.in,v
retrieving revision 1.3
diff -u -p -r1.3 apps_evolution_shell.schemas.in.in
--- apps_evolution_shell.schemas.in.in	2 Jun 2004 20:37:14 -0000	1.3
+++ apps_evolution_shell.schemas.in.in	8 Jul 2004 09:17:34 -0000
@@ -100,8 +100,8 @@
       <applyto>/apps/evolution/shell/view_defaults/component_id</applyto>
       <owner>evolution</owner>
       <type>string</type>
+      <default>mail</default>
       <locale name="C">
-        <default>mail</default>
         <short>ID or alias of the component to be shown by default at start-up.</short>
       </locale>
     </schema>

Follow-Ups:
- Re: [evolution-patches] Fix for incorrect initial init on i18n platform, .in.in distribution and gconf warning (bug #60859)
  - From: Rodrigo Moya
- Re: [evolution-patches] Fix for incorrect initial init on i18n platform, .in.in distribution and gconf warning (bug #60859)
  - From: Not Zed
- Re: [evolution-patches] Fix for incorrect initial init on i18n platform, .in.in distribution and gconf warning (bug #60859)
  - From: Chris Toshok
- Re: [evolution-patches] Fix for incorrect initial init on i18n platform, .in.in distribution and gconf warning (bug #60859)
  - From: Frederic Crozat

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]