Port EmpathyNewMessageDialog to new API

[empathy.git] / libempathy-gtk / empathy-new-message-dialog.c

diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 1db8db1b6bdb28968e830fd487019909e9465111..f6eb46a5fccaa674b74986a5d016651706f2c66d 100644 (file)
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <glib/gi18n-lib.h>
 
 #include <libmissioncontrol/mc-account.h>
@@ -191,7 +190,6 @@ new_message_dialog_response_cb (GtkWidget               *widget,
 
                factory = empathy_contact_factory_dup_singleton ();
                contact = empathy_contact_factory_get_from_id (factory, account, id);
-               empathy_start_call_with_contact (contact);
 
                call_factory = empathy_call_factory_get();
                empathy_call_factory_new_call (call_factory, contact);
@@ -232,7 +230,7 @@ GtkWidget *
 empathy_new_message_dialog_show (GtkWindow *parent)
 {
        static EmpathyNewMessageDialog *dialog = NULL;
-       GladeXML                       *glade;
+       GtkBuilder                     *gui;
        gchar                          *filename;
        GtkEntryCompletion             *completion;
        GtkListStore                   *model;
@@ -247,11 +245,9 @@ empathy_new_message_dialog_show (GtkWindow *parent)
        /* create a contact manager */
        dialog->contact_manager = empathy_contact_manager_dup_singleton ();
 
-       filename = empathy_file_lookup ("empathy-new-message-dialog.glade",
+       filename = empathy_file_lookup ("empathy-new-message-dialog.ui",
                                        "libempathy-gtk");
-       glade = empathy_glade_get_file (filename,
-                                       "new_message_dialog",
-                                       NULL,
+       gui = empathy_builder_get_file (filename,
                                        "new_message_dialog", &dialog->dialog,
                                        "table_contact", &dialog->table_contact,
                                        "entry_id", &dialog->entry_id,
@@ -275,7 +271,7 @@ empathy_new_message_dialog_show (GtkWindow *parent)
        g_object_unref(completion);
        g_object_unref(model);
 
-       empathy_glade_connect (glade, dialog,
+       empathy_builder_connect (gui, dialog,
                               "new_message_dialog", "destroy", new_message_dialog_destroy_cb,
                               "new_message_dialog", "response", new_message_dialog_response_cb,
                               "entry_id", "changed", new_message_change_state_button_cb,
@@ -283,7 +279,7 @@ empathy_new_message_dialog_show (GtkWindow *parent)
 
        g_object_add_weak_pointer (G_OBJECT (dialog->dialog), (gpointer) &dialog);
 
-       g_object_unref (glade);
+       g_object_unref (gui);
 
        /* Create account chooser */
        dialog->account_chooser = empathy_account_chooser_new ();