diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-05 19:57:30 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-05 19:57:30 +0800 |
| commit | 4ec46cc05fcb94d181fb9c2412984a1446647c85 (patch) | |
| tree | d16ce30e77dd539c03509237dd4c723d46aea97a /addressbook/util | |
| parent | 5ea7e23aef0c239af2600c95419ba0bda0f08b3c (diff) | |
| parent | 19163c2b71e6128fc9b32287b99b1f4422324c2d (diff) | |
| download | gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.gz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.bz2 gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.lz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.xz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.zst gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.zip | |
Merge from master
Diffstat (limited to 'addressbook/util')
| -rw-r--r-- | addressbook/util/Makefile.am | 6 | ||||
| -rw-r--r-- | addressbook/util/eab-book-util.c | 6 | ||||
| -rw-r--r-- | addressbook/util/eab-book-util.h | 23 |
3 files changed, 21 insertions, 14 deletions
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index fe45b3d7e2..ea70fbb9ca 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -11,8 +11,8 @@ libeabutil_la_CPPFLAGS = \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ -I$(top_srcdir)/widgets \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libeabutil_la_SOURCES = \ eab-book-util.c \ @@ -24,7 +24,7 @@ libeabutil_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) dist-hook: diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c index 5c8d3350fd..9839e5174f 100644 --- a/addressbook/util/eab-book-util.c +++ b/addressbook/util/eab-book-util.c @@ -180,7 +180,7 @@ eab_book_and_contact_list_from_string (const gchar *str, *book_client = e_book_client_new_from_uri (uri, NULL); g_free (uri); - return *book_client ? TRUE : FALSE; + return (*book_client != NULL); } gchar * @@ -193,11 +193,11 @@ eab_book_and_contact_list_to_string (EBookClient *book_client, if (!s0) s0 = g_strdup (""); - if (book_client) + if (book_client != NULL) { s1 = g_strconcat ( "Book: ", e_client_get_uri ( E_CLIENT (book_client)), "\r\n", s0, NULL); - else + } else s1 = g_strdup (s0); g_free (s0); diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h index 602e7bd44b..4376863973 100644 --- a/addressbook/util/eab-book-util.h +++ b/addressbook/util/eab-book-util.h @@ -28,14 +28,21 @@ G_BEGIN_DECLS -GSList * eab_contact_list_from_string (const gchar *str); -gchar * eab_contact_list_to_string (const GSList *contacts); - -gboolean eab_book_and_contact_list_from_string (const gchar *str, EBookClient **book_client, GSList **contacts); -gchar * eab_book_and_contact_list_to_string (EBookClient *book_client, const GSList *contacts); - -gint e_utf8_casefold_collate_len (const gchar *str1, const gchar *str2, gint len); -gint e_utf8_casefold_collate (const gchar *str1, const gchar *str2); +GSList * eab_contact_list_from_string (const gchar *str); +gchar * eab_contact_list_to_string (const GSList *contacts); + +gboolean eab_book_and_contact_list_from_string + (const gchar *str, + EBookClient **book_client, + GSList **contacts); +gchar * eab_book_and_contact_list_to_string + (EBookClient *book_client, + const GSList *contacts); +gint e_utf8_casefold_collate_len (const gchar *str1, + const gchar *str2, + gint len); +gint e_utf8_casefold_collate (const gchar *str1, + const gchar *str2); G_END_DECLS |