Merge branch 'gnome-3-8'

[empathy.git] / libempathy / empathy-contact.c

diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 3963b52ed9182569f87edb815632ce31603a3ba8..356104434f7916546bd3a147508358ccb4313c5b 100644 (file)
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -20,24 +20,14 @@
  */
 
 #include "config.h"
-
-#include <string.h>
-
-#include <glib/gi18n-lib.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
+#include "empathy-contact.h"
 
 #ifdef HAVE_GEOCODE
 #include <geocode-glib/geocode-glib.h>
 #endif
 
-#include "empathy-contact.h"
-#include "empathy-camera-monitor.h"
-#include "empathy-individual-manager.h"
 #include "empathy-utils.h"
 #include "empathy-enum-types.h"
-#include "empathy-location.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
@@ -923,7 +913,7 @@ empathy_contact_change_group (EmpathyContact *contact, const gchar *group,
   if (priv->groups == NULL)
     {
       priv->groups = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup,
-          g_free, g_str_hash, g_str_equal);
+          g_free, NULL, NULL, NULL, NULL, NULL, NULL);
     }
 
   gee_collection_add (GEE_COLLECTION (priv->groups), group);
@@ -1632,7 +1622,7 @@ geocode_cb (GObject *source,
   if (priv->location == NULL)
     goto out;
 
-  res = geocode_forward_search_finish (GEOCODE_OBJECT (source), result,
+  res = geocode_forward_search_finish (GEOCODE_FORWARD (source), result,
       &error);
 
   if (res == NULL)
@@ -1652,7 +1642,7 @@ geocode_cb (GObject *source,
   DEBUG ("\t - Latitude: %f", loc->latitude);
   DEBUG ("\t - Longitude: %f", loc->longitude);
 
-  g_list_free_full (res, geocode_location_free);
+  g_list_free_full (res, (GDestroyNotify) geocode_location_free);
 
   /* Copy remaning fields. LAT and LON were not defined so we won't overwrite
    * the values we just set. */