diff options
Diffstat (limited to 'plugins/vcard-inline')
| -rw-r--r-- | plugins/vcard-inline/Makefile.am | 22 | ||||
| -rw-r--r-- | plugins/vcard-inline/vcard-inline.c | 15 |
2 files changed, 19 insertions, 18 deletions
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am index f595145418..07b747af79 100644 --- a/plugins/vcard-inline/Makefile.am +++ b/plugins/vcard-inline/Makefile.am @@ -15,23 +15,23 @@ liborg_gnome_vcard_inline_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_vcard_inline_la_LIBADD = \ - $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/addressbook/util/libeabutil.la \ - $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ - $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ - $(top_builddir)/addressbook/printing/libecontactprint.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) +liborg_gnome_vcard_inline_la_LIBADD = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/addressbook/util/libeabutil.la \ + $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ + $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ + $(top_builddir)/addressbook/printing/libecontactprint.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-vcard-inline.eplug.xml diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c index 1b72958712..cfe461b163 100644 --- a/plugins/vcard-inline/vcard-inline.c +++ b/plugins/vcard-inline/vcard-inline.c @@ -119,14 +119,13 @@ org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object, } static void -org_gnome_vcard_inline_client_loaded_cb (GObject *source_object, +org_gnome_vcard_inline_client_loaded_cb (ESource *source, GAsyncResult *result, - gpointer user_data) + GSList *contact_list) { - ESource *source = E_SOURCE (source_object); EClient *client = NULL; EBookClient *book_client; - GSList *contact_list = user_data, *iter; + GSList *iter; GError *error = NULL; e_client_utils_open_new_finish (source, result, &client, &error); @@ -185,9 +184,11 @@ org_gnome_vcard_inline_save_cb (VCardInlinePObject *vcard_object) contact_list = e_client_util_copy_object_slist (NULL, vcard_object->contact_list); - e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, - e_client_utils_authenticate_handler, NULL, - org_gnome_vcard_inline_client_loaded_cb, contact_list); + e_client_utils_open_new ( + source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, + NULL, e_client_utils_authenticate_handler, NULL, + (GAsyncReadyCallback) org_gnome_vcard_inline_client_loaded_cb, + contact_list); } static void |