← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/empathy-event-manager.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:
src/empathy-event-manager.c
1003
1003
      return;
1004
1004
    }
1005
1005
 
1006
 
  header = g_strdup_printf (_("Subscription requested by %s"),
 
1006
  header = g_strdup_printf (_("%s would like permission to see when you are available"),
1007
1007
    empathy_contact_get_alias (contact));
1008
1008
 
1009
1009
  if (!EMP_STR_EMPTY (message))