Re: [Fwd: [evolution-patches] addressbook fixes]

[William Jon McCann <mccannwj pha jhu edu>]

Christian Rose wrote:
> tis 2004-09-21 klockan 23.04 skrev Hans Petter Jansson:
>
> > > This patch has been approved by an addressbook maintainer (via the 
> > > evolution-patches list) and has been committed to head.  Is it OK to 
> > > commit to the 2.8 branch?  It is a minor change and has been tested.
> >
> > I just talked to JP about this, and we agreed that the string changes
> > can't go in to the gnome-2-8 branch. However, the string additions
> > related to the bug fix can go in if i18n approves.
>
> I'd like to know if this fixes some bug, and how important that bug is
> considered. If the patch and the string additions are just a polishing
> thing and not terribly important, it's most likely not gnome-2-8 branch
> material.

Here is an updated patch.  It is similar to the one that has been 
applied to head.  It fixes a missing default value and removes spurious 
debug messages.

It differs from the one on head in that it doesn't change existing 
strings and only adds one string to the schema.in.in file.  This is done 
by using long descriptions that duplicate the short descriptions.

Jon

Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1822.2.6
diff -p -u -r1.1822.2.6 ChangeLog
--- addressbook/ChangeLog	23 Sep 2004 20:31:20 -0000	1.1822.2.6
+++ addressbook/ChangeLog	28 Sep 2004 14:08:10 -0000
@@ -1,0 +1,7 @@
+2004-09-20  William Jon McCann  <mccann jhu edu>
+
+	* gui/component/component-factory.c (factory): Quiet debug messages.
+
+	* gui/component/apps_evolution_addressbook.schemas.in.in: Add
+	missing show_preview schema.  Add missing long descriptions.
+
Index: addressbook/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.3
diff -p -u -r1.3 apps_evolution_addressbook.schemas.in.in
--- addressbook/gui/component/apps_evolution_addressbook.schemas.in.in	9 Jul 2004 11:18:34 -0000	1.3
+++ addressbook/gui/component/apps_evolution_addressbook.schemas.in.in	28 Sep 2004 14:08:10 -0000
@@ -11,6 +11,7 @@
       <default></default>
       <locale name="C">
         <short>EFolderList xml for the list of completion uris</short>
+        <long>EFolderList xml for the list of completion uris</long>
       </locale>
     </schema>
 
@@ -22,6 +23,7 @@
       <default>3</default>
       <locale name="C">
         <short>The number of characters that must be typed before evolution will attempt to autocomplete</short>
+        <long>The number of characters that must be typed before evolution will attempt to autocomplete</long>
       </locale>
     </schema>
 
@@ -35,6 +37,7 @@
       <default></default>
       <locale name="C">
         <short>URI for the folder last used in the select names dialog</short>
+        <long>URI for the folder last used in the select names dialog</long>
       </locale>
     </schema>
 
@@ -47,6 +50,19 @@
       <type>int</type>
       <locale name="C">
         <short>Position of the vertical pane in main view</short>
+        <long>Position of the vertical pane in main view</long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/addressbook/display/show_preview</key>
+      <applyto>/apps/evolution/addressbook/display/show_preview</applyto>
+      <owner>evolution-addressbook</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+         <short>Show the "Preview" pane</short>
+         <long>Show the "Preview" pane</long>
       </locale>
     </schema>
 
Index: addressbook/gui/component/component-factory.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/component-factory.c,v
retrieving revision 1.14
diff -p -u -r1.14 component-factory.c
--- addressbook/gui/component/component-factory.c	21 Aug 2004 21:53:41 -0000	1.14
+++ addressbook/gui/component/component-factory.c	28 Sep 2004 14:08:10 -0000
@@ -46,13 +46,15 @@
 #define COMPLETION_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_Autocompletion_ConfigControl:" BASE_VERSION
 #define CERTIFICATE_MANAGER_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_SMime_CertificateManager_ConfigControl:" BASE_VERSION
 
+#define d(x)
+
 
 static BonoboObject *
 factory (BonoboGenericFactory *factory,
 	 const char *component_id,
 	 void *closure)
 {
-	printf ("asked to activate component_id `%s'\n", component_id);
+	d(printf ("asked to activate component_id `%s'\n", component_id));
 
 	if (strcmp (component_id, VCARD_CONTROL_ID) == 0)
 		return BONOBO_OBJECT (eab_vcard_control_new ());