Remove useless mission-control includes

[empathy.git] / libempathy-gtk / empathy-contact-dialogs.c

diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index 056ec2d856093b768a80ed0473e18b235a64f503..5b11ddc2e04ab01a19daea1368a2822677bd0a3b 100644 (file)
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -27,8 +27,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <libmissioncontrol/mission-control.h>
-
 #include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-account-manager.h>
 #include <libempathy/empathy-contact-list.h>
@@ -190,6 +188,7 @@ empathy_contact_information_dialog_show (EmpathyContact *contact,
 
        /* Contact info widget */
        contact_widget = empathy_contact_widget_new (contact,
+               EMPATHY_CONTACT_WIDGET_SHOW_LOCATION |
                EMPATHY_CONTACT_WIDGET_EDIT_NONE);
        gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8);
        gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
@@ -327,26 +326,18 @@ empathy_contact_personal_dialog_show (GtkWindow *parent)
  */
 
 static gboolean
-can_add_contact_to_account (McAccount *account,
+can_add_contact_to_account (EmpathyAccount *account,
                            gpointer   user_data)
 {
-       EmpathyAccountManager *account_manager;
        EmpathyContactManager *contact_manager;
        TpConnection          *connection;
        gboolean               result;
 
-       account_manager = empathy_account_manager_dup_singleton ();
-       connection = empathy_account_manager_get_connection (account_manager,
-                                                            account);
-       if (!connection) {
-               g_object_unref (account_manager);
-               return FALSE;
-       }
+       connection = empathy_account_get_connection (account);
 
        contact_manager = empathy_contact_manager_dup_singleton ();
        result = empathy_contact_manager_can_add (contact_manager, connection);
        g_object_unref (contact_manager);
-       g_object_unref (account_manager);
 
        return result;
 }
@@ -364,8 +355,7 @@ new_contact_response_cb (GtkDialog *dialog,
 
        if (contact && response == GTK_RESPONSE_OK) {
                empathy_contact_list_add (EMPATHY_CONTACT_LIST (manager),
-                                         contact,
-                                         _("I would like to add you to my contact list."));
+                                         contact, "");
        }
 
        new_contact_dialog = NULL;
@@ -398,7 +388,7 @@ empathy_new_contact_dialog_show (GtkWindow *parent)
                                      button,
                                      GTK_RESPONSE_CANCEL);
        gtk_widget_show (button);
-       
+
        /* Add button */
        button = gtk_button_new_with_label (GTK_STOCK_ADD);
        gtk_button_set_use_stock (GTK_BUTTON (button), TRUE);