From 1ce0ee997b7fe65d2146d474d70233f0c1775539 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 6 May 2009 08:10:40 -0400 Subject: Make vcard-inline actually work. --- .../.libs/liborg-gnome-vcard-inline.la | 1 - .../.libs/liborg-gnome-vcard-inline.lai | 41 --------------------- .../.libs/liborg-gnome-vcard-inline.so | Bin 50526 -> 0 bytes plugins/vcard-inline/.libs/vcard-inline.o | Bin 55316 -> 0 bytes plugins/vcard-inline/org-gnome-vcard-inline.eplug | 4 +- .../vcard-inline/org-gnome-vcard-inline.eplug.xml | 4 +- plugins/vcard-inline/vcard-inline.c | 12 +++--- 7 files changed, 10 insertions(+), 52 deletions(-) delete mode 120000 plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la delete mode 100644 plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai delete mode 100755 plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so delete mode 100644 plugins/vcard-inline/.libs/vcard-inline.o (limited to 'plugins/vcard-inline') diff --git a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la deleted file mode 120000 index 4ffc357ca7..0000000000 --- a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la +++ /dev/null @@ -1 +0,0 @@ -../liborg-gnome-vcard-inline.la \ No newline at end of file diff --git a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai deleted file mode 100644 index 21c94c82d7..0000000000 --- a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai +++ /dev/null @@ -1,41 +0,0 @@ -# liborg-gnome-vcard-inline.la - a libtool library file -# Generated by ltmain.sh (GNU libtool) 2.2.6 -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='liborg-gnome-vcard-inline.so' - -# Names of this library. -library_names='liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so' - -# The name of the static archive. -old_library='' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags=' -pthread' - -# Libraries that this one depends upon. -dependency_libs=' -L/home/mbarnes/local/lib /home/mbarnes/local/lib/libedataserverui-1.2.la -L/usr/lib -L/usr/kerberos/lib -lgnome-keyring /home/mbarnes/local/lib/libebook-1.2.la /home/mbarnes/local/lib/libcamel-1.2.la -lssl3 -lsmime3 -lnss3 -lnssutil3 -lkrb5 -lk5crypto -lcom_err -lgssapi_krb5 /home/mbarnes/local/lib/libedataserver-1.2.la -lplds4 -lplc4 -lnspr4 -lsasl2 -lssl -lcrypto -lz -lsqlite3 -lsoup-2.4 /home/mbarnes/local/lib/libgtkhtml-editor.la /home/mbarnes/local/lib/libgtkhtml-3.14.la /home/mbarnes/local/lib/libgailutil.la -lXext -lXrender -lXinerama -lXrandr -lXcursor -lX11 -lXcomposite -lXdamage -lXfixes -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 /home/mbarnes/local/lib/libgthread-2.0.la -lpthread -lrt /home/mbarnes/local/lib/libgtk-x11-2.0.la -lxml2 /home/mbarnes/local/lib/libgdk-x11-2.0.la -latk-1.0 -lpangoft2-1.0 /home/mbarnes/local/lib/libgdk_pixbuf-2.0.la /home/mbarnes/local/lib/libgio-2.0.la -lselinux -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig /home/mbarnes/local/lib/libgobject-2.0.la /home/mbarnes/local/lib/libgmodule-2.0.la -ldl /home/mbarnes/local/lib/libglib-2.0.la' - -# Names of additional weak libraries provided by this library -weak_library_names='' - -# Version information for liborg-gnome-vcard-inline. -current=0 -age=0 -revision=0 - -# Is this an already installed library? -installed=yes - -# Should we warn about portability when linking against -modules? -shouldnotlink=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/home/mbarnes/local/lib/evolution/2.28/plugins' diff --git a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so deleted file mode 100755 index a7ab796fe3..0000000000 Binary files a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so and /dev/null differ diff --git a/plugins/vcard-inline/.libs/vcard-inline.o b/plugins/vcard-inline/.libs/vcard-inline.o deleted file mode 100644 index a75afa9adc..0000000000 Binary files a/plugins/vcard-inline/.libs/vcard-inline.o and /dev/null differ diff --git a/plugins/vcard-inline/org-gnome-vcard-inline.eplug b/plugins/vcard-inline/org-gnome-vcard-inline.eplug index 6221f9bcfc..bdfdb732d1 100644 --- a/plugins/vcard-inline/org-gnome-vcard-inline.eplug +++ b/plugins/vcard-inline/org-gnome-vcard-inline.eplug @@ -7,8 +7,8 @@ - - + + diff --git a/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml b/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml index c54587d369..f9b2c1693e 100644 --- a/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml +++ b/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml @@ -14,11 +14,11 @@ diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c index 68c9813da5..2d6a93a91d 100644 --- a/plugins/vcard-inline/vcard-inline.c +++ b/plugins/vcard-inline/vcard-inline.c @@ -175,16 +175,11 @@ org_gnome_vcard_inline_embed (EMFormatHTML *format, GtkWidget *button_box; GtkWidget *container; GtkWidget *widget; - EContact *contact; guint length; vcard_object = (VCardInlinePObject *) object; length = g_list_length (vcard_object->contact_list); - - if (vcard_object->contact_list != NULL) - contact = E_CONTACT (vcard_object->contact_list->data); - else - contact = NULL; + g_return_val_if_fail (length > 0, FALSE); container = GTK_WIDGET (embedded); @@ -208,6 +203,11 @@ org_gnome_vcard_inline_embed (EMFormatHTML *format, vcard_object->contact_display = g_object_ref (widget); gtk_widget_show (widget); + eab_contact_display_render ( + EAB_CONTACT_DISPLAY (vcard_object->contact_display), + E_CONTACT (vcard_object->contact_list->data), + vcard_object->mode); + widget = gtk_label_new (NULL); gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); vcard_object->message_label = g_object_ref (widget); -- cgit v1.2.3