Bug 628124 — Disallow activating group rows in the linking dialogue

diff --git a/libempathy-gtk/empathy-individual-linker.c b/libempathy-gtk/empathy-individual-linker.c
index 0fc67c00cff5a4d5a77c71b656330b8638ec371d..94c95cbdc08ca0ce6b805c84854ac6eea1a32c4e 100644 (file)
--- a/libempathy-gtk/empathy-individual-linker.c
+++ b/libempathy-gtk/empathy-individual-linker.c
@@ -185,6 +185,9 @@ toggle_individual_row (EmpathyIndividualLinker *self,
       EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual,
       -1);
 
       EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual,
       -1);
 

+  if (individual == NULL)
+    return;
+

   individual_added = GPOINTER_TO_UINT (g_hash_table_lookup (
       priv->changed_individuals, individual));
 
   individual_added = GPOINTER_TO_UINT (g_hash_table_lookup (
       priv->changed_individuals, individual));