← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/empathy/oneiric-security

« back to all changes in this revision

Viewing changes to libempathy-gtk/empathy-persona-view.c

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine
  • Date: 2011-08-22 14:16:36 UTC
  • mfrom: (1.1.75 upstream)
  • Revision ID: james.westby@ubuntu.com-20110822141636-iiju0fvx1f9sl3oz
Tags: 3.1.5.1-1ubuntu1
https://launchpad.net/bugs/829826
* New upstream version
  - crashed with SIGSEGV in dbus_connection_dispatch (LP: #829826)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy-gtk/empathy-persona-view.c
174
174
{
175
175
  EmpathyPersonaViewPriv *priv = GET_PRIV (self);
176
176
  FolksPersona *persona;
 
177
  TpContact *tp_contact;
177
178
  EmpathyContact *contact;
178
179
  GtkTreeModel *model;
179
180
  GtkTreeIter iter;
201
202
  if (persona == NULL)
202
203
    goto OUT;
203
204
 
204
 
  contact = empathy_contact_dup_from_tp_contact (tpf_persona_get_contact (
205
 
      TPF_PERSONA (persona)));
 
205
  tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
 
206
  if (tp_contact == NULL)
 
207
    {
 
208
      g_clear_object (&persona);
 
209
      goto OUT;
 
210
    }
 
211
 
 
212
  contact = empathy_contact_dup_from_tp_contact (tp_contact);
206
213
 
207
214
  if (priv->tooltip_widget == NULL)
208
215
    {