empathy r2853 - in trunk: libempathy-gtk src

[xclaesse svn gnome org]

Author: xclaesse
Date: Thu Apr 16 12:28:31 2009
New Revision: 2853
URL: http://svn.gnome.org/viewvc/empathy?rev=2853&view=rev

Log:
Port EmpathySpellDialog to new API

From: Xavier Claessens <xclaesse gmail com>

Modified:
   trunk/libempathy-gtk/empathy-spell-dialog.c
   trunk/src/empathy-about-dialog.c

Modified: trunk/libempathy-gtk/empathy-spell-dialog.c
==============================================================================
--- trunk/libempathy-gtk/empathy-spell-dialog.c	(original)
+++ trunk/libempathy-gtk/empathy-spell-dialog.c	Thu Apr 16 12:28:31 2009
@@ -23,14 +23,7 @@
 #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 @@
 			  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 @@
 	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 @@
 				     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);

Modified: trunk/src/empathy-about-dialog.c
==============================================================================
--- trunk/src/empathy-about-dialog.c	(original)
+++ trunk/src/empathy-about-dialog.c	Thu Apr 16 12:28:31 2009
@@ -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>