Port EmpathySpellDialog to new API

From: Xavier Claessens <xclaesse@gmail.com>

svn path=/trunk/; revision=2853

diff --git a/libempathy-gtk/empathy-spell-dialog.c b/libempathy-gtk/empathy-spell-dialog.c
index c5914ce9415fa3156872f18c7e775c6b69aeb740..9ce80eebbee651060cf865b302c36899635127fd 100644 (file)
--- a/libempathy-gtk/empathy-spell-dialog.c
+++ b/libempathy-gtk/empathy-spell-dialog.c
@@ -23,14 +23,7 @@
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
 #include <string.h>
 
 #include <glib/gi18n-lib.h>

-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtksizegroup.h>
-#include <glade/glade.h>
+#include <gtk/gtk.h>

 
 #include <libempathy/empathy-utils.h>
 
 
 #include <libempathy/empathy-utils.h>
 


@@ -225,9 +218,9 @@ empathy_spell_dialog_show (EmpathyChat  *chat,
                          const gchar *word)
 {
        EmpathySpellDialog *dialog;
                          const gchar *word)
 {
        EmpathySpellDialog *dialog;

-       GladeXML          *gui;
-       gchar             *str;
-       gchar             *filename;
+       GtkBuilder         *gui;
+       gchar              *str;
+       gchar              *filename;

 
        g_return_if_fail (chat != NULL);
        g_return_if_fail (word != NULL);
 
        g_return_if_fail (chat != NULL);
        g_return_if_fail (word != NULL);


@@ -241,11 +234,9 @@ empathy_spell_dialog_show (EmpathyChat  *chat,
        dialog->start = *start;
        dialog->end = *end;
 
        dialog->start = *start;
        dialog->end = *end;
 

-       filename = empathy_file_lookup ("empathy-spell-dialog.glade",
+       filename = empathy_file_lookup ("empathy-spell-dialog.ui",

                                        "libempathy-gtk");
                                        "libempathy-gtk");

-       gui = empathy_glade_get_file (filename,
-                                    "spell_dialog",
-                                    NULL,
+       gui = empathy_builder_get_file (filename,

                                     "spell_dialog", &dialog->window,
                                     "button_replace", &dialog->button_replace,
                                     "label_word", &dialog->label_word,
                                     "spell_dialog", &dialog->window,
                                     "button_replace", &dialog->button_replace,
                                     "label_word", &dialog->label_word,


@@ -253,8 +244,7 @@ empathy_spell_dialog_show (EmpathyChat  *chat,
                                     NULL);
        g_free (filename);
 
                                     NULL);
        g_free (filename);
 

-       empathy_glade_connect (gui,
-                             dialog,
+       empathy_builder_connect (gui, dialog,

                              "spell_dialog", "response", spell_dialog_response_cb,
                              "spell_dialog", "destroy", spell_dialog_destroy_cb,
                              NULL);
                              "spell_dialog", "response", spell_dialog_response_cb,
                              "spell_dialog", "destroy", spell_dialog_destroy_cb,
                              NULL);

diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c
index 4765e6b32b66dd629662653802067c2fb82af68d..a743f22c4913a372026c22fd2c2259428dae850b 100644 (file)
--- a/src/empathy-about-dialog.c
+++ b/src/empathy-about-dialog.c
@@ -27,7 +27,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtkaboutdialog.h>
 #include <gtk/gtksizegroup.h>
 #include <glib/gi18n.h>
 #include <gtk/gtkaboutdialog.h>
 #include <gtk/gtksizegroup.h>

-#include <glade/glade.h>

 
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 
 #include <libempathy-gtk/empathy-ui-utils.h>