aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog12
-rw-r--r--addressbook/gui/component/apps_evolution_addressbook.schemas.in.in18
-rw-r--r--addressbook/gui/component/component-factory.c4
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c8
4 files changed, 34 insertions, 8 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 0839ed0d34..191c5866f0 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,15 @@
+2004-09-21 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):
diff --git a/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in b/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in
index d885f545ba..1f835d9414 100644
--- a/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in
+++ b/addressbook/gui/component/apps_evolution_addressbook.schemas.in.in
@@ -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>
diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c
index b42322440a..382722785e 100644
--- a/addressbook/gui/component/component-factory.c
+++ b/addressbook/gui/component/component-factory.c
@@ -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 ());
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 236b53f16f..518daefd10 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -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);