diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-05-27 13:58:35 +0200 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-05-27 13:58:35 +0200 |
| commit | e91b3531384e1e75abdd039bc61a89c186f2b373 (patch) | |
| tree | 4c6ba75539986beefd12f72f0d45378dd23ecc23 | |
| parent | ab6c82bbc49a4faac136fe6b2422bb9508b1a960 (diff) | |
| parent | 1e42a9cd5fe1dce527c1074402763cd3d203cd4c (diff) | |
| download | telepathy-haze-e91b3531384e1e75abdd039bc61a89c186f2b373.tar.gz | |
Merge branch 'telepathy-haze-0.6'
Conflicts:
src/contact-list.c
src/im-channel.c
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/connection-mail.c | 1 | ||||
| -rw-r--r-- | src/contact-list.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 811dc01..c0e50a7 100644 --- a/configure.ac +++ b/configure.ac @@ -76,6 +76,10 @@ PKG_CHECK_MODULES(TP_GLIB,[telepathy-glib >= 0.15.1]) PKG_CHECK_MODULES(GLIB,[glib-2.0 >= 2.22, gobject-2.0, gio-2.0]) PKG_CHECK_MODULES(DBUS_GLIB,[dbus-glib-1 >= 0.73]) +dnl MIN_REQUIRED must stay to 2.30 because of GValueArray +AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30], [Ignore post 2.30 deprecations]) +AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_30], [Prevent post 2.30 APIs]) + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) diff --git a/src/connection-mail.c b/src/connection-mail.c index f286c27..9b71c9d 100644 --- a/src/connection-mail.c +++ b/src/connection-mail.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "extensions/extensions.h" diff --git a/src/contact-list.c b/src/contact-list.c index d162e8c..13bf348 100644 --- a/src/contact-list.c +++ b/src/contact-list.c @@ -193,9 +193,7 @@ haze_contact_list_dup_contacts (TpBaseContactList *cl) purple_buddy_get_name (sl_iter->data), NULL, NULL); if (G_LIKELY (handle != 0)) - { - tp_handle_set_add (handles, handle); - } + tp_handle_set_add (handles, handle); } g_slist_free (buddies); |