← Back to branch summary

~bcurtiswx/ubuntu/precise/empathy/3.4.2.1-0ubuntu1

« back to all changes in this revision

Viewing changes to libempathy-gtk/empathy-contact-dialogs.c

  • Committer: Bazaar Package Importer
  • Author(s): Laurent Bigonville
  • Date: 2009-11-16 23:40:52 UTC
  • mfrom: (1.1.39 upstream)
  • mto: (6.3.7 experimental)
  • mto: This revision was merged to the branch mainline in revision 80.
  • Revision ID: james.westby@ubuntu.com-20091116234052-7hhwrpeln4mwdyw7
Tags: upstream-2.29.2
Import upstream version 2.29.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy-gtk/empathy-contact-dialogs.c
27
27
#include <gtk/gtk.h>
28
28
#include <glib/gi18n-lib.h>
29
29
 
 
30
#include <telepathy-glib/account-manager.h>
 
31
 
30
32
#include <libempathy/empathy-contact-manager.h>
31
 
#include <libempathy/empathy-account-manager.h>
32
33
#include <libempathy/empathy-contact-list.h>
33
34
#include <libempathy/empathy-utils.h>
34
35
 
174
175
        dialog = gtk_dialog_new ();
175
176
        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
176
177
        gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
177
 
        gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Contact Information"));
 
178
        gtk_window_set_title (GTK_WINDOW (dialog),
 
179
                empathy_contact_get_name (contact));
178
180
 
179
181
        /* Close button */
180
182
        button = gtk_button_new_with_label (GTK_STOCK_CLOSE);
326
328
 */
327
329
 
328
330
static gboolean
329
 
can_add_contact_to_account (EmpathyAccount *account,
 
331
can_add_contact_to_account (TpAccount *account,
330
332
                            gpointer   user_data)
331
333
{
332
334
        EmpathyContactManager *contact_manager;
333
335
        TpConnection          *connection;
334
336
        gboolean               result;
335
337
 
336
 
        connection = empathy_account_get_connection (account);
 
338
        connection = tp_account_get_connection (account);
337
339
        if (connection == NULL)
338
340
                return FALSE;
339
341