← Back to branch summary

~ubuntu-branches/ubuntu/natty/empathy/natty

« back to all changes in this revision

Viewing changes to .pc/20_libindicate.patch/libempathy-gtk/empathy-ui-utils.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell, Omer Akram
  • Date: 2011-01-06 14:32:31 UTC
  • Revision ID: james.westby@ubuntu.com-20110106143231-ol0gyfqi7h1ch8kv
Tags: 2.32.2-0ubuntu3
https://launchpad.net/bugs/622215
https://launchpad.net/bugs/670197
* debian/patches/00git_folks_api.patch:
  - Update to latest folks API

[ Omer Akram ]
* debian/patches/enable_pidgin_imported_contacts.patch:
  - Enable pidgin imported accounts by default. (LP: #622215)
* debian/patches/reword_subscription_dailog_to_be_less_technical.patch:
  - Reword subscription request dialog to be less technical. (LP: #670197)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/20_libindicate.patch/libempathy-gtk/empathy-ui-utils.c
231
231
        FolksPresenceType folks_presence;
232
232
        TpConnectionPresenceType presence;
233
233
 
234
 
        folks_presence =
235
 
            folks_presence_get_presence_type (FOLKS_PRESENCE (individual));
 
234
        folks_presence = folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (individual));
236
235
        presence = empathy_folks_presence_type_to_tp (folks_presence);
237
236
 
238
237
        return empathy_icon_name_for_presence (presence);
632
631
                        callback, user_data,
633
632
                        empathy_pixbuf_avatar_from_individual_scaled_async);
634
633
 
635
 
        avatar_file = folks_avatar_get_avatar (FOLKS_AVATAR (individual));
 
634
        avatar_file =
 
635
                folks_has_avatar_get_avatar (FOLKS_HAS_AVATAR (individual));
636
636
        if (avatar_file == NULL)
637
637
                goto out;
638
638