From 0a52d890e3b75aa2d1fae3da6c206055cd723cc6 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Mon, 29 Oct 2001 12:31:45 +0000 Subject: Handle returning dates here. (e_card_simple_get_allow_newlines): New 2001-10-29 Christopher James Lahey * backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h (e_card_simple_get): Handle returning dates here. (e_card_simple_get_allow_newlines): New function. Returns whether it makes much sense to have newlines in this string. * gui/component/addressbook-config.c, gui/component/addressbook-config.h (addressbook_create_new_source): The first argument here should be const. * gui/component/addressbook-storage.c: Added #include "addressbook-config.h". * gui/widgets/e-minicard-label.c (e_minicard_label_event): On an escape here, cancel editing and remove the focus from the text. * gui/widgets/e-minicard.c (add_field): Set allow_newlines here. (field_activated): Stop editing on the activate signal and remove the focus from the text. Fixes Ximian bug #12286. svn path=/trunk/; revision=14335 --- addressbook/gui/component/addressbook-config.c | 2 +- addressbook/gui/component/addressbook-config.h | 2 +- addressbook/gui/component/addressbook-storage.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index d21ec43d14..de65019a97 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -269,7 +269,7 @@ addressbook_config_source_with_gui (GladeXML *gui, AddressbookSource *source, Gt } void -addressbook_create_new_source (char *new_source, GtkWidget *parent) +addressbook_create_new_source (const char *new_source, GtkWidget *parent) { AddressbookSourceDialog *dialog; GladeXML *gui; diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h index 48b797839f..b0adbd7330 100644 --- a/addressbook/gui/component/addressbook-config.h +++ b/addressbook/gui/component/addressbook-config.h @@ -26,6 +26,6 @@ #include "addressbook-storage.h" void addressbook_config (GNOME_Evolution_Shell shell); -void addressbook_create_new_source (char *new_source, GtkWidget *parent); +void addressbook_create_new_source (const char *new_source, GtkWidget *parent); #endif /* __ADDRESSBOOK_CONFIG_H__ */ diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c index ec0dda84fc..647c21ef52 100644 --- a/addressbook/gui/component/addressbook-storage.c +++ b/addressbook/gui/component/addressbook-storage.c @@ -40,6 +40,8 @@ #include #endif +#include "addressbook-storage.h" + #include #include #include @@ -62,9 +64,8 @@ #include "e-util/e-unicode-i18n.h" #include "evolution-shell-component.h" -#include "evolution-storage.h" -#include "addressbook-storage.h" +#include "addressbook-config.h" #define ADDRESSBOOK_SOURCES_XML "addressbook-sources.xml" -- cgit