diff --git a/po/POTFILES.in b/po/POTFILES.in
index fd678a5411..3d3c2713ea 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -219,7 +219,6 @@ src/gnome/gnc-plugin-page-register.c
src/gnome/gnc-plugin-page-sx-list.c
src/gnome/gnc-plugin-register.c
src/gnome/gnc-split-reg.c
-src/gnome/gtkbuilder/account.glade
src/gnome/gtkbuilder/assistant-acct-period.glade
src/gnome/gtkbuilder/assistant-hierarchy.glade
src/gnome/gtkbuilder/assistant-loan.glade
@@ -234,8 +233,6 @@ src/gnome/gtkbuilder/dialog-progress.glade
src/gnome/gtkbuilder/dialog-sx.glade
src/gnome/gtkbuilder/gnc-plugin-page-budget.glade
src/gnome/gtkbuilder/gnc-plugin-page-register.glade
-src/gnome/gtkbuilder/owner.glade
-src/gnome/gtkbuilder/sched-xact.glade
src/gnome/gtkbuilder/tax.glade
src/gnome/gtkbuilder/window-autoclear.glade
src/gnome/gtkbuilder/window-reconcile.glade
@@ -351,12 +348,14 @@ src/gnome-utils/gnc-tree-view-owner.c
src/gnome-utils/gnc-tree-view-price.c
src/gnome-utils/gnc-tree-view-sx-list.c
src/gnome-utils/gnc-window.c
+src/gnome-utils/gtkbuilder/dialog-account.glade
src/gnome-utils/gtkbuilder/dialog-commodity.glade
src/gnome-utils/gtkbuilder/dialog-transfer.glade
src/gnome-utils/gtkbuilder/dialog-userpass.glade
src/gnome-utils/gtkbuilder/gnc-date-format.glade
src/gnome-utils/gtkbuilder/gnc-frequency.glade
src/gnome-utils/gtkbuilder/gnc-recurrence.glade
+src/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
src/gnome-utils/misc-gnome-utils.c
src/gnome-utils/print-session.c
src/gnome-utils/schemas/apps_gnucash_history.schemas.in
diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c
index 514de91c1e..026cf89449 100644
--- a/src/gnome-utils/dialog-account.c
+++ b/src/gnome-utils/dialog-account.c
@@ -1311,8 +1311,8 @@ gnc_account_window_create(AccountWindow *aw)
ENTER("aw %p, modal %d", aw, aw->modal);
builder = gtk_builder_new();
- gnc_builder_add_from_file (builder, "account.glade", "fraction_liststore");
- gnc_builder_add_from_file (builder, "account.glade", "Account Dialog");
+ gnc_builder_add_from_file (builder, "dialog-account.glade", "fraction_liststore");
+ gnc_builder_add_from_file (builder, "dialog-account.glade", "Account Dialog");
aw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Account Dialog"));
awo = G_OBJECT (aw->dialog);
@@ -1980,8 +1980,8 @@ gnc_account_renumber_create_dialog (GtkWidget *window, Account *account)
data->num_children = gnc_account_n_children(account);
builder = gtk_builder_new();
- gnc_builder_add_from_file (builder, "account.glade", "interval_adjustment");
- gnc_builder_add_from_file (builder, "account.glade", "Renumber Accounts");
+ gnc_builder_add_from_file (builder, "dialog-account.glade", "interval_adjustment");
+ gnc_builder_add_from_file (builder, "dialog-account.glade", "Renumber Accounts");
data->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Renumber Accounts"));
gtk_window_set_transient_for(GTK_WINDOW(data->dialog), GTK_WINDOW(window));
g_object_set_data_full(G_OBJECT(data->dialog), "builder", builder, g_object_unref);
diff --git a/src/gnome-utils/gnc-tree-view-account.c b/src/gnome-utils/gnc-tree-view-account.c
index 35a67365a3..c001b407e2 100644
--- a/src/gnome-utils/gnc-tree-view-account.c
+++ b/src/gnome-utils/gnc-tree-view-account.c
@@ -1928,13 +1928,11 @@ gppat_filter_response_cb (GtkWidget *dialog,
gint response,
AccountFilterDialog *fd)
{
- GtkWidget *view;
gpointer gptemp;
g_return_if_fail(GTK_IS_DIALOG(dialog));
ENTER("dialog %p, response %d", dialog, response);
- view = gnc_glade_lookup_widget(dialog, FILTER_TREE_VIEW);
if (response != GTK_RESPONSE_OK)
{
@@ -1973,7 +1971,7 @@ account_filter_dialog_create(AccountFilterDialog *fd, GncPluginPage *page)
/* Create the dialog */
builder = gtk_builder_new();
- gnc_builder_add_from_file (builder, "account.glade", "Filter By");
+ gnc_builder_add_from_file (builder, "dialog-account.glade", "Filter By");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Filter By"));
fd->dialog = dialog;
gtk_window_set_transient_for(GTK_WINDOW(dialog),
diff --git a/src/gnome-utils/gnc-tree-view-owner.c b/src/gnome-utils/gnc-tree-view-owner.c
index 3fce1c72ba..5340c7e62b 100644
--- a/src/gnome-utils/gnc-tree-view-owner.c
+++ b/src/gnome-utils/gnc-tree-view-owner.c
@@ -1348,13 +1348,11 @@ gppot_filter_response_cb (GtkWidget *dialog,
gint response,
OwnerFilterDialog *fd)
{
- GtkWidget *view;
gpointer gptemp;
g_return_if_fail(GTK_IS_DIALOG(dialog));
ENTER("dialog %p, response %d", dialog, response);
- view = gnc_glade_lookup_widget(dialog, FILTER_TREE_VIEW);
if (response != GTK_RESPONSE_OK)
{
@@ -1390,7 +1388,7 @@ owner_filter_dialog_create(OwnerFilterDialog *fd, GncPluginPage *page)
/* Create the dialog */
builder = gtk_builder_new();
- gnc_builder_add_from_file (builder, "owner.glade", "Filter By");
+ gnc_builder_add_from_file (builder, "gnc-tree-view-owner.glade", "Filter By");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Filter By"));
fd->dialog = dialog;
gtk_window_set_transient_for(GTK_WINDOW(dialog),
diff --git a/src/gnome-utils/gtkbuilder/Makefile.am b/src/gnome-utils/gtkbuilder/Makefile.am
index 7484176c22..fd21844986 100644
--- a/src/gnome-utils/gtkbuilder/Makefile.am
+++ b/src/gnome-utils/gtkbuilder/Makefile.am
@@ -1,10 +1,12 @@
gtkbuilderdir = $(GNC_GTKBUILDER_DIR)
gtkbuilder_DATA = \
+ dialog-account.glade \
dialog-commodity.glade \
dialog-transfer.glade \
dialog-userpass.glade \
gnc-date-format.glade \
gnc-frequency.glade \
+ gnc-tree-view-owner.glade \
gnc-recurrence.glade
EXTRA_DIST = $(gtkbuilder_DATA)
diff --git a/src/gnome/gtkbuilder/account.glade b/src/gnome-utils/gtkbuilder/dialog-account.glade
similarity index 100%
rename from src/gnome/gtkbuilder/account.glade
rename to src/gnome-utils/gtkbuilder/dialog-account.glade
diff --git a/src/gnome/gtkbuilder/owner.glade b/src/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
similarity index 98%
rename from src/gnome/gtkbuilder/owner.glade
rename to src/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
index e68cebf2a7..83a34242d8 100644
--- a/src/gnome/gtkbuilder/owner.glade
+++ b/src/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
@@ -14,7 +14,7 @@
vertical
6
-