GNOME.org
 

[Fwd: [evolution-patches] addressbook fixes]

Hello,

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.

Thanks,
Jon
--- Begin Message --- 
Hi,

The addressbook bug that I referred to previously has already been fixed by Siva (http://cvs.gnome.org/viewcvs/evolution/addressbook/gui/widgets/e-addressbook-view.c?r1=1.146&r2=1.147). Thanks!

Here are a few more minor fixes.

Look ok?

Jon 
? addressbook/gui/widgets/e-addressbook-view.c.new
Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1831
diff -p -u -r1.1831 ChangeLog
--- addressbook/ChangeLog	20 Sep 2004 05:59:53 -0000	1.1831
+++ addressbook/ChangeLog	21 Sep 2004 14:18:26 -0000
@@ -1,3 +1,15 @@
+2004-09-20  William Jon McCann  <mccann jhu edu>
+
+	* gui/component/component-factory.c (factory): Quiet debug messages.
+
+	* gui/widgets/e-addressbook-view.c (eab_view_new): Remove
+	unnecessary label widget placeholder.  Make vertical scrollbar
+	policy automatic.  Use gtk_paned_add2 instead of
+	gtk_container_add.
+
+	* gui/component/apps_evolution_addressbook.schemas.in.in: Add
+	missing show_preview schema.  Add missing long descriptions.
+
 2004-09-13  Rodney Dawes  <dobey novell com>
 
 	* gui/contact-editor/e-contact-editor.c (show_help_cb):
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	21 Sep 2004 14:18:26 -0000
@@ -10,7 +10,8 @@
       <type>string</type>
       <default></default>
       <locale name="C">
-        <short>EFolderList xml for the list of completion uris</short>
+        <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	21 Sep 2004 14:18:26 -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 ());
Index: addressbook/gui/widgets/e-addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v
retrieving revision 1.147
diff -p -u -r1.147 e-addressbook-view.c
--- addressbook/gui/widgets/e-addressbook-view.c	7 Sep 2004 04:59:54 -0000	1.147
+++ addressbook/gui/widgets/e-addressbook-view.c	21 Sep 2004 14:18:26 -0000
@@ -480,16 +480,12 @@ eab_view_new (void)
 	g_signal_connect_swapped (eav->paned, "button_release_event",
 				  G_CALLBACK (get_paned_position), eav);
 
-	eav->widget = gtk_label_new ("empty label here");
-	gtk_container_add (GTK_CONTAINER (eav->paned), eav->widget);
-	gtk_widget_show (eav->widget);
-
 	eav->contact_display = eab_contact_display_new ();
 	eav->contact_display_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (eav->contact_display_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (eav->contact_display_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (eav->contact_display_window), GTK_SHADOW_IN);
 	gtk_container_add (GTK_CONTAINER (eav->contact_display_window), eav->contact_display);
-	gtk_container_add (GTK_CONTAINER (eav->paned), eav->contact_display_window);
+	gtk_paned_add2 (GTK_PANED (eav->paned), eav->contact_display_window);
 	gtk_widget_show (eav->contact_display);
 	gtk_widget_show (eav->contact_display_window);
 	gtk_widget_show (eav->paned);

--- End Message ---
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]