[Telepathy-commits] [telepathy-gabble/master] Fix merge errors

[Pierre-Luc Beaudoin]

---
 extensions/all.xml   |    3 ---
 src/presence-cache.c |   18 +++++-------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/extensions/all.xml b/extensions/all.xml
index 56bd36d..f44e72e 100644
--- a/extensions/all.xml
+++ b/extensions/all.xml
@@ -90,7 +90,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
   <tp:external-type name="DBus_Tube_Member" type="(us)"
     from="Telepathy specification"/>
 
-<<<<<<< HEAD:extensions/all.xml
   <!-- use types from Connection_Interface_Contact_Capabilities -->
   <tp:external-type name="Requestable_Channel_Class" type="(a{sv}as)"
     from="Telepathy specification"/>
@@ -103,8 +102,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
   <tp:external-type name="Unix_Timestamp" type="u"
     from="Telepathy specification"/>
 
-=======
->>>>>>> 68d5a39... Location: add spec Connection.Interface.Presence in extensions/ for Rich_Presence_Access_Control_Type:extensions/all.xml
 </tp:generic-types>
 
 </tp:spec>
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 1d6bf2c..575199d 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -363,7 +363,11 @@ gabble_presence_cache_class_init (GabblePresenceCacheClass *klass)
     g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT);
   signals[CAPABILITIES_DISCOVERED] = g_signal_new (
     "capabilities-discovered",
-    gabble_marshal_VOID__UINT, G_TYPE_NONE,
+    G_TYPE_FROM_CLASS (klass),
+    G_SIGNAL_RUN_LAST,
+    0,
+    NULL, NULL,
+    g_cclosure_marshal_VOID__UINT, G_TYPE_NONE,
     1, G_TYPE_UINT);
   signals[LOCATION_UPDATED] = g_signal_new (
     "location-update",
@@ -1790,18 +1794,6 @@ gabble_presence_cache_is_unsure (GabblePresenceCache *cache)
   return (diff < UNSURE_PERIOD);
 }
 
-static void update_location_for_each (gpointer key,
-                                      gpointer value,
-                                      gpointer user_data)
-static void
-update_location_for_each (gpointer key,
-                          gpointer value,
-                          gpointer user_data)
-{
-  GHashTable *location = (GHashTable*) user_data;
-  g_hash_table_insert (location, g_strdup(key), tp_g_value_slice_dup (value));
-}
-
 void
 gabble_presence_cache_update_location (GabblePresenceCache *cache,
                                        TpHandle handle,
-- 
1.5.6.5