diff options
| -rw-r--r-- | addressbook/ChangeLog | 5 | ||||
| -rw-r--r-- | addressbook/gui/minicard/e-minicard-control.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard-control.c | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index b994404cd0..f3dee0c41e 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,10 @@ 2000-07-18 Christopher James Lahey <clahey@helixcode.com> + * gui/minicard/e-minicard-control.c: Added "text/vCard" to the + list of mime types we support. + +2000-07-18 Christopher James Lahey <clahey@helixcode.com> + * gui/minicard/Makefile.am: Added gui/minicard/e-minicard-control.c, gui/minicard/e-minicard-control.h, diff --git a/addressbook/gui/minicard/e-minicard-control.c b/addressbook/gui/minicard/e-minicard-control.c index 3946618627..3cda9b4ead 100644 --- a/addressbook/gui/minicard/e-minicard-control.c +++ b/addressbook/gui/minicard/e-minicard-control.c @@ -140,6 +140,7 @@ pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream, GtkWidget *minicard = data; if (*type && g_strcasecmp (type, "text/plain") != 0 && + g_strcasecmp (type, "text/vCard") != 0 && g_strcasecmp (type, "text/x-vCard") != 0) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Bonobo_Persist_WrongDataType, NULL); @@ -176,6 +177,7 @@ pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream, int length; if (*type && g_strcasecmp (type, "text/plain") != 0 && + g_strcasecmp (type, "text/vCard") != 0 && g_strcasecmp (type, "text/x-vCard") != 0) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Bonobo_Persist_WrongDataType, NULL); @@ -240,7 +242,7 @@ static Bonobo_Persist_ContentTypeList * pstream_get_content_types (BonoboPersistStream *ps, void *closure, CORBA_Environment *ev) { - return bonobo_persist_generate_content_types (2, "text/plain", "text/x-vCard"); + return bonobo_persist_generate_content_types (3, "text/plain", "text/vCard", "text/x-vCard"); } static BonoboObject * diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c index 3946618627..3cda9b4ead 100644 --- a/addressbook/gui/widgets/e-minicard-control.c +++ b/addressbook/gui/widgets/e-minicard-control.c @@ -140,6 +140,7 @@ pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream, GtkWidget *minicard = data; if (*type && g_strcasecmp (type, "text/plain") != 0 && + g_strcasecmp (type, "text/vCard") != 0 && g_strcasecmp (type, "text/x-vCard") != 0) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Bonobo_Persist_WrongDataType, NULL); @@ -176,6 +177,7 @@ pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream, int length; if (*type && g_strcasecmp (type, "text/plain") != 0 && + g_strcasecmp (type, "text/vCard") != 0 && g_strcasecmp (type, "text/x-vCard") != 0) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Bonobo_Persist_WrongDataType, NULL); @@ -240,7 +242,7 @@ static Bonobo_Persist_ContentTypeList * pstream_get_content_types (BonoboPersistStream *ps, void *closure, CORBA_Environment *ev) { - return bonobo_persist_generate_content_types (2, "text/plain", "text/x-vCard"); + return bonobo_persist_generate_content_types (3, "text/plain", "text/vCard", "text/x-vCard"); } static BonoboObject * |