Port EmpathyContactDialogs to new API

From: Xavier Claessens <xclaesse@gmail.com>

svn path=/trunk/; revision=2846

diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index f7a769d98e296e4f37f7fb0dd0b0e6ee5f4fbda9..d287b4d78353e82ad99b361b92275d143ae8def2 100644 (file)
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <glib/gi18n-lib.h>
 
 #include <libmissioncontrol/mission-control.h>
@@ -89,6 +88,7 @@ void
 empathy_subscription_dialog_show (EmpathyContact *contact,
                                  GtkWindow     *parent)
 {
+       GtkBuilder *gui;
        GtkWidget *dialog;
        GtkWidget *hbox_subscription;
        GtkWidget *contact_widget;
@@ -105,15 +105,14 @@ empathy_subscription_dialog_show (EmpathyContact *contact,
                return;
        }
 
-       filename = empathy_file_lookup ("empathy-contact-dialogs.glade",
+       filename = empathy_file_lookup ("empathy-contact-dialogs.ui",
                                        "libempathy-gtk");
-       empathy_glade_get_file_simple (filename,
-                                     "subscription_request_dialog",
-                                     NULL,
+       gui = empathy_builder_get_file (filename,
                                      "subscription_request_dialog", &dialog,
                                      "hbox_subscription", &hbox_subscription,
                                      NULL);
        g_free (filename);
+       g_object_unref (gui);
 
        contact_widget = empathy_contact_widget_new (contact,
                                                     EMPATHY_CONTACT_WIDGET_EDIT_ALIAS |