Bug 589153 - Use GtkBuilder instead of libglade

1 files changed, 8 insertions, 20 deletions

diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index a9a7afac1e..4c2b5cf9d0 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -31,7 +31,6 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <glade/glade.h>
 #include <e-util/e-binding.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-util-private.h>
@@ -49,10 +48,9 @@
 
 /* Private part of the SchedulePage structure */
 struct _SchedulePagePrivate {
-	/* Glade XML data */
-	GladeXML *xml;
+	GtkBuilder *builder;
 
-	/* Widgets from the Glade file */
+	/* Widgets from the UI file */
 	GtkWidget *main;
 
 	/* Model */
@@ -89,9 +87,9 @@ schedule_page_dispose (GObject *object)
 		priv->main = NULL;
 	}
 
-	if (priv->xml != NULL) {
-		g_object_unref (priv->xml);
-		priv->xml = NULL;
+	if (priv->builder != NULL) {
+		g_object_unref (priv->builder);
+		priv->builder = NULL;
 	}
 
 	if (priv->model != NULL) {
@@ -316,7 +314,7 @@ get_widgets (SchedulePage *spage)
 
 	priv = spage->priv;
 
-#define GW(name) glade_xml_get_widget (priv->xml, name)
+#define GW(name) e_builder_get_widget (priv->builder, name)
 
 	priv->main = GW ("schedule-page");
 	if (!priv->main)
@@ -389,23 +387,13 @@ schedule_page_construct (SchedulePage *spage, EMeetingStore *ems)
 	EShellSettings *shell_settings;
 	EShell *shell;
 	CompEditor *editor;
-	gchar *gladefile;
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (spage));
 	shell = comp_editor_get_shell (editor);
 	shell_settings = e_shell_get_shell_settings (shell);
 
-	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
-				      "schedule-page.glade",
-				      NULL);
-	priv->xml = glade_xml_new (gladefile, NULL, NULL);
-	g_free (gladefile);
-
-	if (!priv->xml) {
-		g_message ("schedule_page_construct(): "
-			   "Could not load the Glade XML file!");
-		return NULL;
-	}
+	priv->builder = gtk_builder_new ();
+	e_load_ui_builder_definition (priv->builder, "schedule-page.ui");
 
 	if (!get_widgets (spage)) {
 		g_message ("schedule_page_construct(): "