diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-11 18:03:18 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-11 18:03:18 +0800 |
| commit | 36d503aaffffde7c795f62b77dbad61f48c55f23 (patch) | |
| tree | 2fc5601d18e8926d8973ef6fda3120283aa4747b | |
| parent | 2ef5340f19483a5845976332706886d60eea38dd (diff) | |
| parent | f4e2fc16b56fb94b896014692e5bf0eba402ffe3 (diff) | |
| download | gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.tar gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.tar.gz gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.tar.bz2 gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.tar.lz gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.tar.xz gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.tar.zst gsoc2013-empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.zip | |
Merge remote-tracking branch 'public-upstream/gnome-2-34' into empathy-skype
Conflicts:
libempathy/empathy-contact.c
| -rw-r--r-- | libempathy-gtk/empathy-contact-blocking-dialog.c | 3 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-search-dialog.c | 3 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-selector.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-location-manager.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-contact.c | 4 |
6 files changed, 9 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c index a46820c5d..08757545f 100644 --- a/libempathy-gtk/empathy-contact-blocking-dialog.c +++ b/libempathy-gtk/empathy-contact-blocking-dialog.c @@ -21,8 +21,9 @@ * * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk> */ +#include "config.h" -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <libempathy/empathy-utils.h> diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c index 68b06520a..9326183e3 100644 --- a/libempathy-gtk/empathy-contact-search-dialog.c +++ b/libempathy-gtk/empathy-contact-search-dialog.c @@ -22,8 +22,9 @@ * Danielle Madeley <danielle.madeley@collabora.co.uk> * Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> */ +#include "config.h" -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <telepathy-glib/telepathy-glib.h> diff --git a/libempathy-gtk/empathy-contact-selector.c b/libempathy-gtk/empathy-contact-selector.c index c70d2575a..a77ed43e2 100644 --- a/libempathy-gtk/empathy-contact-selector.c +++ b/libempathy-gtk/empathy-contact-selector.c @@ -22,7 +22,7 @@ #include "config.h" -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <libempathy/empathy-contact.h> diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c index 8f64e325f..62fa26336 100644 --- a/libempathy-gtk/empathy-location-manager.c +++ b/libempathy-gtk/empathy-location-manager.c @@ -24,7 +24,7 @@ #include <string.h> #include <time.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <telepathy-glib/account-manager.h> #include <telepathy-glib/util.h> diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 2569e7faf..88672554f 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -22,7 +22,7 @@ #include "config.h" #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <webkit/webkit.h> #include <telepathy-glib/dbus.h> diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 0cb3d0a95..42faad483 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -665,8 +665,8 @@ empathy_contact_from_tpl_contact (TpAccount *account, is_user = (TPL_ENTITY_SELF == tpl_entity_get_entity_type (tpl_entity)); retval = g_object_new (EMPATHY_TYPE_CONTACT, - "id", tpl_entity_get_alias (tpl_entity), - "alias", tpl_entity_get_identifier (tpl_entity), + "id", tpl_entity_get_identifier (tpl_entity), + "alias", tpl_entity_get_alias (tpl_entity), "account", account, "is-user", is_user, NULL); |