Port EmpathySpellDialog to new API
authorXavier Claessens <xclaesse@gmail.com>
Thu, 16 Apr 2009 12:28:31 +0000 (12:28 +0000)
committerXavier Claessens <xclaesse@src.gnome.org>
Thu, 16 Apr 2009 12:28:31 +0000 (12:28 +0000)
From: Xavier Claessens <xclaesse@gmail.com>

svn path=/trunk/; revision=2853

libempathy-gtk/empathy-spell-dialog.c
src/empathy-about-dialog.c

index c5914ce9415fa3156872f18c7e775c6b69aeb740..9ce80eebbee651060cf865b302c36899635127fd 100644 (file)
 #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>
 
@@ -225,9 +218,9 @@ empathy_spell_dialog_show (EmpathyChat  *chat,
                          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);
@@ -241,11 +234,9 @@ empathy_spell_dialog_show (EmpathyChat  *chat,
        dialog->start = *start;
        dialog->end = *end;
 
-       filename = empathy_file_lookup ("empathy-spell-dialog.glade",
+       filename = empathy_file_lookup ("empathy-spell-dialog.ui",
                                        "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,
@@ -253,8 +244,7 @@ empathy_spell_dialog_show (EmpathyChat  *chat,
                                     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);
index 4765e6b32b66dd629662653802067c2fb82af68d..a743f22c4913a372026c22fd2c2259428dae850b 100644 (file)
@@ -27,7 +27,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtkaboutdialog.h>
 #include <gtk/gtksizegroup.h>
-#include <glade/glade.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>