2001-06-15 Dave Peticolas <dave@krondo.com>

* src/gnome/dialog-find-transactions.c: use libglade


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4697 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -1,5 +1,7 @@
 2001-06-15  Dave Peticolas  <dave@krondo.com>
 
+	* src/gnome/dialog-find-transactions.c: use libglade
+
 	* src/guile/gnc.gwp: remove budgeting api
 
 	* src/gnome/dialog-budget.[ch]: remove

po/POTFILES.in

@@ -31,6 +31,7 @@ src/gnome/glade-support.c
 src/gnome/glade/account_strings.c
 src/gnome/glade/commodity_strings.c
 src/gnome/glade/fincalc_strings.c
+src/gnome/glade/find_strings.c
 src/gnome/glade/help_strings.c
 src/gnome/glade/price_strings.c
 src/gnome/glade/progress_strings.c

src/gnome/dialog-fincalc.h

@@ -27,8 +27,6 @@
 
 #include <gnome.h>
 
-#include "glade-gnc-dialogs.h"
-
 typedef struct _FinCalcDialog FinCalcDialog;
 
 FinCalcDialog * gnc_ui_fincalc_dialog_create(void);

src/gnome/dialog-find-transactions.c

@@ -37,8 +37,6 @@
 #include "account-tree.h"
 #include "dialog-find-transactions.h"
 #include "dialog-utils.h"
-#include "glade-cb-gnc-dialogs.h"
-#include "glade-gnc-dialogs.h"
 #include "gnc-amount-edit.h"
 #include "gnc-component-manager.h"
 #include "gnc-dateedit.h"
@@ -128,6 +126,23 @@ struct _FindTransactionsDialog {
 };
 
 
+static void gnc_ui_find_transactions_dialog_ok_cb(GtkButton * button, 
+                                                  gpointer user_data);
+static void gnc_ui_find_transactions_dialog_cancel_cb(GtkButton * button, 
+                                                      gpointer user_data);
+static void gnc_ui_find_transactions_dialog_help_cb(GtkButton * button, 
+                                                    gpointer user_data);
+static void
+gnc_ui_find_transactions_dialog_early_date_toggle_cb(GtkToggleButton * button, 
+                                                     gpointer user_data);
+static void
+gnc_ui_find_transactions_dialog_late_date_toggle_cb(GtkToggleButton * button, 
+                                                    gpointer user_data);
+static void
+gnc_ui_find_transactions_dialog_search_type_cb(GtkToggleButton * tb,
+                                               gpointer user_data);
+
+
 static int
 gnc_find_dialog_close_cb(GnomeDialog *dialog, gpointer data) {
   FindTransactionsDialog * ftd = data;
@@ -161,10 +176,38 @@ gnc_ui_find_transactions_dialog_create(xaccLedgerDisplay * orig_ledg) {
   GtkWidget *box;
   GtkWidget *edit;
   GtkWidget *notebook;
+  GladeXML  *xml;
   gint page_num;
 
-  /* call the glade-defined creator */
+  xml = gnc_glade_xml_new ("find.glade", "Find Transactions");
-  ftd->dialog = create_Find_Transactions();
+
+  glade_xml_signal_connect_data
+    (xml, "gnc_ui_find_transactions_dialog_ok_cb",
+     GTK_SIGNAL_FUNC (gnc_ui_find_transactions_dialog_ok_cb), ftd);
+
+  glade_xml_signal_connect_data
+    (xml, "gnc_ui_find_transactions_dialog_cancel_cb",
+     GTK_SIGNAL_FUNC (gnc_ui_find_transactions_dialog_cancel_cb), ftd);
+
+  glade_xml_signal_connect_data
+    (xml, "gnc_ui_find_transactions_dialog_help_cb",
+     GTK_SIGNAL_FUNC (gnc_ui_find_transactions_dialog_help_cb), ftd);
+
+  glade_xml_signal_connect_data
+    (xml, "gnc_ui_find_transactions_dialog_early_date_toggle_cb",
+     GTK_SIGNAL_FUNC (gnc_ui_find_transactions_dialog_early_date_toggle_cb),
+     ftd);
+
+  glade_xml_signal_connect_data
+    (xml, "gnc_ui_find_transactions_dialog_late_date_toggle_cb",
+     GTK_SIGNAL_FUNC (gnc_ui_find_transactions_dialog_late_date_toggle_cb),
+     ftd);
+
+  glade_xml_signal_connect_data
+    (xml, "gnc_ui_find_transactions_dialog_search_type_cb",
+     GTK_SIGNAL_FUNC (gnc_ui_find_transactions_dialog_search_type_cb), ftd);
+
+  ftd->dialog = glade_xml_get_widget (xml, "Find Transactions");
 
   if(orig_ledg) {
     ftd->q = xaccQueryCopy (xaccLedgerDisplayGetQuery (orig_ledg));
@@ -179,32 +222,32 @@ gnc_ui_find_transactions_dialog_create(xaccLedgerDisplay * orig_ledg) {
   ftd->search_type = 0;
 
   /* remove the tags page (unfinished) */
-  notebook = gtk_object_get_data (GTK_OBJECT (ftd->dialog), "find_notebook");
+  notebook = glade_xml_get_widget (xml, "find_notebook");
-  box = gtk_object_get_data (GTK_OBJECT (ftd->dialog), "tags_frame");
+  box = glade_xml_get_widget (xml, "tags_frame");
 
   page_num = gtk_notebook_page_num (GTK_NOTEBOOK (notebook), box);
   if (page_num >= 0)
     gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), page_num);
 
   /* find the important widgets */
-  ftd->new_search_radiobutton = 
+  ftd->new_search_radiobutton =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "new_search_radiobutton");
+    glade_xml_get_widget (xml, "new_search_radiobutton");
   ftd->narrow_search_radiobutton = 
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "narrow_search_radiobutton");
+    glade_xml_get_widget (xml, "narrow_search_radiobutton");
   ftd->add_search_radiobutton = 
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "add_search_radiobutton");
+    glade_xml_get_widget (xml, "add_search_radiobutton");
   ftd->delete_search_radiobutton = 
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "delete_search_radiobutton");
+    glade_xml_get_widget (xml, "delete_search_radiobutton");
 
   ftd->match_accounts_scroller =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "account_match_scroller");
+    glade_xml_get_widget (xml, "account_match_scroller");
   ftd->match_accounts_picker = 
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "account_match_picker");
+    glade_xml_get_widget (xml, "account_match_picker");
 
   ftd->date_start_toggle =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "date_start_toggle");
+    glade_xml_get_widget (xml, "date_start_toggle");
   ftd->date_start_frame =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "date_start_frame");
+    glade_xml_get_widget (xml, "date_start_frame");
 
   ftd->date_start_entry = gnc_date_edit_new(time(NULL), FALSE, FALSE);
   gtk_container_add(GTK_CONTAINER(ftd->date_start_frame), 
@@ -212,9 +255,9 @@ gnc_ui_find_transactions_dialog_create(xaccLedgerDisplay * orig_ledg) {
   gtk_widget_set_sensitive(ftd->date_start_entry, FALSE);
 
   ftd->date_end_toggle =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "date_end_toggle");
+    glade_xml_get_widget (xml, "date_end_toggle");
   ftd->date_end_frame =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "date_end_frame");
+    glade_xml_get_widget (xml, "date_end_frame");
 
   ftd->date_end_entry = gnc_date_edit_new(time(NULL), FALSE, FALSE);
   gtk_container_add(GTK_CONTAINER(ftd->date_end_frame), 
@@ -222,81 +265,70 @@ gnc_ui_find_transactions_dialog_create(xaccLedgerDisplay * orig_ledg) {
   gtk_widget_set_sensitive(ftd->date_end_entry, FALSE);
 
   ftd->description_entry =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "description_entry");
+    glade_xml_get_widget (xml, "description_entry");
   ftd->description_case_toggle =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "description_case_toggle");
+    glade_xml_get_widget (xml, "description_case_toggle");
   ftd->description_regexp_toggle =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "description_regexp_toggle");
+    glade_xml_get_widget (xml, "description_regexp_toggle");
 
   ftd->number_entry =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "number_entry");
+    glade_xml_get_widget (xml, "number_entry");
   ftd->number_case_toggle =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "number_case_toggle");
+    glade_xml_get_widget (xml, "number_case_toggle");
   ftd->number_regexp_toggle =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "number_regexp_toggle");
+    glade_xml_get_widget (xml, "number_regexp_toggle");
 
-  ftd->credit_debit_picker =
+  ftd->credit_debit_picker = glade_xml_get_widget (xml, "credit_debit_picker");
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "credit_debit_picker");
+  ftd->amount_comp_picker = glade_xml_get_widget (xml, "amount_comp_picker");
-  ftd->amount_comp_picker =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "amount_comp_picker");
 
-  box = gtk_object_get_data(GTK_OBJECT(ftd->dialog), "amount_box");
+  box = glade_xml_get_widget (xml, "amount_box");
   edit = gnc_amount_edit_new ();
   gtk_widget_show (edit);
   gtk_box_pack_start (GTK_BOX (box), edit, TRUE, TRUE, 0);
   ftd->amount_edit = edit;
 
-  ftd->memo_entry =
+  ftd->memo_entry = glade_xml_get_widget (xml, "memo_entry");
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "memo_entry");
+  ftd->memo_case_toggle = glade_xml_get_widget (xml, "memo_case_toggle");
-  ftd->memo_case_toggle =
+  ftd->memo_regexp_toggle = glade_xml_get_widget (xml, "memo_regexp_toggle");
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "memo_case_toggle");
-  ftd->memo_regexp_toggle =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "memo_regexp_toggle");
 
-  ftd->shares_comp_picker =
+  ftd->shares_comp_picker = glade_xml_get_widget (xml, "shares_comp_picker");
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "shares_comp_picker");
 
-  box = gtk_object_get_data(GTK_OBJECT(ftd->dialog), "shares_box");
+  box = glade_xml_get_widget (xml, "shares_box");
   edit = gnc_amount_edit_new ();
   gtk_widget_show (edit);
   gtk_box_pack_start (GTK_BOX (box), edit, TRUE, TRUE, 0);
   ftd->shares_edit = edit;
 
-  ftd->price_comp_picker =
+  ftd->price_comp_picker = glade_xml_get_widget (xml, "price_comp_picker");
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "price_comp_picker");
 
-  box = gtk_object_get_data(GTK_OBJECT(ftd->dialog), "price_box");
+  box = glade_xml_get_widget (xml, "price_box");
   edit = gnc_amount_edit_new ();
   gtk_widget_show (edit);
   gtk_box_pack_start (GTK_BOX (box), edit, TRUE, TRUE, 0);
   ftd->price_edit = edit;
 
   ftd->action_entry =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "action_entry");
+    glade_xml_get_widget (xml, "action_entry");
   ftd->action_case_toggle =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "action_case_toggle");
+    glade_xml_get_widget (xml, "action_case_toggle");
   ftd->action_regexp_toggle =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "action_regexp_toggle");
+    glade_xml_get_widget (xml, "action_regexp_toggle");
 
   ftd->cleared_cleared_toggle = 
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "cleared_cleared_toggle");
+    glade_xml_get_widget (xml, "cleared_cleared_toggle");
   ftd->cleared_reconciled_toggle = 
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "cleared_reconciled_toggle");
+    glade_xml_get_widget (xml, "cleared_reconciled_toggle");
   ftd->cleared_not_cleared_toggle = 
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "cleared_not_cleared_toggle");
+    glade_xml_get_widget (xml, "cleared_not_cleared_toggle");
 
   ftd->balance_balanced_toggle = 
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "balance_balanced_toggle");
+    glade_xml_get_widget (xml, "balance_balanced_toggle");
   ftd->balance_not_balanced_toggle = 
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog),
+    glade_xml_get_widget(xml, "balance_not_balanced_toggle");
-                        "balance_not_balanced_toggle");
 
-  ftd->tag_entry =
+  ftd->tag_entry = glade_xml_get_widget (xml, "tag_entry");
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "tag_entry");
+  ftd->tag_case_toggle = glade_xml_get_widget (xml, "tag_case_toggle");
-  ftd->tag_case_toggle =
+  ftd->tag_regexp_toggle = glade_xml_get_widget (xml, "tag_regexp_toggle");
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "tag_case_toggle");
-  ftd->tag_regexp_toggle =
-    gtk_object_get_data(GTK_OBJECT(ftd->dialog), "tag_regexp_toggle");
 
   /* add an account picker to the first tab */
   ftd->account_tree = gnc_account_tree_new();
@@ -319,10 +351,6 @@ gnc_ui_find_transactions_dialog_create(xaccLedgerDisplay * orig_ledg) {
   gnc_option_menu_init(ftd->shares_comp_picker);
   gnc_option_menu_init(ftd->price_comp_picker);
 
-  /* set data so we can find the struct in callbacks */
-  gtk_object_set_data(GTK_OBJECT(ftd->dialog), "find_transactions_structure",
-                      ftd);
-
   /* if there's no original query, make the narrow, add, delete 
    * buttons inaccessible */
   if(!ftd->q) {
@@ -371,20 +399,17 @@ gnc_ui_find_transactions_dialog_destroy(FindTransactionsDialog * ftd) {
  * callbacks for radio button selections 
 \********************************************************************/
 
-void
+static void
 gnc_ui_find_transactions_dialog_search_type_cb(GtkToggleButton * tb,
                                                gpointer user_data) {
+  FindTransactionsDialog * ftd = user_data;
   GSList * buttongroup = 
     gtk_radio_button_group(GTK_RADIO_BUTTON(tb));
   
-  FindTransactionsDialog * ftd = 
-    gtk_object_get_data(GTK_OBJECT(user_data), "find_transactions_structure");
-    
   if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tb))) {
     ftd->search_type = 
-      g_slist_length(buttongroup) -  g_slist_index(buttongroup, tb) - 1;
+      g_slist_length(buttongroup) - g_slist_index(buttongroup, tb) - 1;
   } 
-
 }
 
 
@@ -392,11 +417,10 @@ gnc_ui_find_transactions_dialog_search_type_cb(GtkToggleButton * tb,
  * gnc_ui_find_transactions_dialog_cancel_cb
 \********************************************************************/
 
-void
+static void
 gnc_ui_find_transactions_dialog_cancel_cb(GtkButton * button, 
                                           gpointer user_data) {
-  FindTransactionsDialog * ftd =
+  FindTransactionsDialog * ftd = user_data;
-    gtk_object_get_data(GTK_OBJECT(user_data), "find_transactions_structure");
 
   gnc_ui_find_transactions_dialog_destroy(ftd);
 }
@@ -406,7 +430,7 @@ gnc_ui_find_transactions_dialog_cancel_cb(GtkButton * button,
  * gnc_ui_find_transactions_dialog_help_cb
 \********************************************************************/
 
-void
+static void
 gnc_ui_find_transactions_dialog_help_cb(GtkButton * button, 
                                         gpointer user_data) {
   helpWindow(NULL, NULL, HH_FIND_TRANSACTIONS);
@@ -417,11 +441,10 @@ gnc_ui_find_transactions_dialog_help_cb(GtkButton * button,
  * gnc_ui_find_transactions_dialog_early_date_toggle_cb
 \********************************************************************/
 
-void
+static void
 gnc_ui_find_transactions_dialog_early_date_toggle_cb(GtkToggleButton * button, 
                                                      gpointer user_data) {
-  FindTransactionsDialog * ftd =
+  FindTransactionsDialog * ftd = user_data;
-    gtk_object_get_data(GTK_OBJECT(user_data), "find_transactions_structure");
   
   if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
     gtk_widget_set_sensitive(GTK_WIDGET(ftd->date_start_entry), TRUE);
@@ -436,11 +459,10 @@ gnc_ui_find_transactions_dialog_early_date_toggle_cb(GtkToggleButton * button,
  * gnc_ui_find_transactions_dialog_late_date_toggle_cb
 \********************************************************************/
 
-void
+static void
 gnc_ui_find_transactions_dialog_late_date_toggle_cb(GtkToggleButton * button, 
-                                                     gpointer user_data) {
+                                                    gpointer user_data) {
-  FindTransactionsDialog * ftd =
+  FindTransactionsDialog * ftd = user_data;
-    gtk_object_get_data(GTK_OBJECT(user_data), "find_transactions_structure");
   
   if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
     gtk_widget_set_sensitive(GTK_WIDGET(ftd->date_end_entry), TRUE);
@@ -455,12 +477,10 @@ gnc_ui_find_transactions_dialog_late_date_toggle_cb(GtkToggleButton * button,
  * gnc_ui_find_transactions_dialog_ok_cb
 \********************************************************************/
 
-void
+static void
 gnc_ui_find_transactions_dialog_ok_cb(GtkButton * button, 
                                       gpointer user_data) {
-  GtkWidget              * dialog = user_data;
+  FindTransactionsDialog * ftd = user_data;
-  FindTransactionsDialog * ftd = 
-    gtk_object_get_data(GTK_OBJECT(dialog), "find_transactions_structure");
 
   xaccLedgerDisplay *ledger;
 
@@ -517,8 +537,7 @@ gnc_ui_find_transactions_dialog_ok_cb(GtkButton * button,
     gtk_entry_get_text(GTK_ENTRY(ftd->action_entry));
   
   /* tag */
-  tag_match_text = 
+  tag_match_text = ""; /* gtk_entry_get_text(GTK_ENTRY(ftd->tag_entry)); */
-    gtk_entry_get_text(GTK_ENTRY(ftd->tag_entry));
   
   if(selected_accounts) {
     xaccQueryAddAccountMatch(q, selected_accounts,

src/gnome/dialog-find-transactions.h

@@ -37,16 +37,5 @@ FindTransactionsDialog *
 gnc_ui_find_transactions_dialog_create(xaccLedgerDisplay * ledger);
 
 void gnc_ui_find_transactions_dialog_destroy(FindTransactionsDialog * pcd);
-void gnc_ui_find_transactions_dialog_ok_cb(GtkButton * button,
-                                           gpointer  user_data);
-void gnc_ui_find_transactions_dialog_cancel_cb(GtkButton * button,
-                                               gpointer user_data);
-
-SelectDateDialog *
-gnc_ui_select_date_dialog_create(GtkWidget * w1, GtkWidget * w2, 
-                                 GtkWidget * w3, char * ymd_format);
-void gnc_ui_select_date_dialog_destroy(SelectDateDialog * sdd);
-void gnc_ui_select_date_cancel_cb(GtkWidget * w, gpointer user_data);
-void gnc_ui_select_date_ok_cb(GtkWidget * w, gpointer user_data);
 
 #endif

src/gnome/dialog-print-check.c

@@ -29,6 +29,7 @@
 #include <guile/gh.h>
 
 #include "messages.h"
+#include "glade-gnc-dialogs.h"
 #include "dialog-print-check.h"
 #include "dialog-utils.h"
 #include "window-help.h"

src/gnome/dialog-print-check.h

@@ -29,7 +29,6 @@
 #include <guile/gh.h>
 
 #include "print-session.h"
-#include "glade-gnc-dialogs.h"
 
 typedef struct {
   GtkWidget * dialog;

src/gnome/glade-gnc-dialogs.h

@@ -4,4 +4,3 @@
 
 GtkWidget* create_QIF_Import_Account_Picker (void);
 GtkWidget* create_Print_Check_Dialog (void);
-GtkWidget* create_Find_Transactions (void);

src/gnome/glade/Makefile.am

@@ -3,6 +3,7 @@ glade_DATA = \
 	account.glade \
 	commodity.glade \
 	fincalc.glade \
+	find.glade \
 	help.glade \
 	price.glade \
 	progress.glade \
@@ -18,6 +19,7 @@ STRING_FILES = \
 	account_strings.c \
 	commodity_strings.c \
 	fincalc_strings.c \
+	find_strings.c \
 	help_strings.c \
 	price_strings.c \
 	progress_strings.c \

src/gnome/glade/find_strings.c

@@ -0,0 +1,89 @@
+/*
+ * Translatable strings file generated by Glade.
+ * Add this file to your project's POTFILES.in.
+ * DO NOT compile it as part of your application.
+ */
+
+gchar *s = N_("Find Transactions");
+gchar *s = N_("Find");
+gchar *s = N_("Match Accounts");
+gchar *s = N_("Find transactions affecting");
+gchar *s = N_("All\n"
+              "Any\n"
+              "None\n"
+              "");
+gchar *s = N_("selected accounts:");
+gchar *s = N_("Account");
+gchar *s = N_("Match Date");
+gchar *s = N_("Find transactions occurring in the date range:");
+gchar *s = N_("Starting ");
+gchar *s = N_("Ending ");
+gchar *s = N_("Date");
+gchar *s = N_("Match Description");
+gchar *s = N_("Find transactions whose Description contains:");
+gchar *s = N_("Case sensitive");
+gchar *s = N_("Regular expression");
+gchar *s = N_("Description");
+gchar *s = N_("Match Description");
+gchar *s = N_("Find transactions whose Number contains:");
+gchar *s = N_("Case sensitive");
+gchar *s = N_("Regular expression");
+gchar *s = N_("Number");
+gchar *s = N_("Match Amount");
+gchar *s = N_("Find ");
+gchar *s = N_("Credit or Debit\n"
+              "Credit\n"
+              "Debit\n"
+              "");
+gchar *s = N_("splits having amounts of:");
+gchar *s = N_("At least\n"
+              "At most \n"
+              "Exactly\n"
+              "");
+gchar *s = N_("Amount");
+gchar *s = N_("Match Memo");
+gchar *s = N_("Find splits whose Memo contains:");
+gchar *s = N_("Case sensitive");
+gchar *s = N_("Regular expression");
+gchar *s = N_("Memo");
+gchar *s = N_("Match number of shares");
+gchar *s = N_("Find securities transactions of:");
+gchar *s = N_("At least\n"
+              "At most\n"
+              "Exactly\n"
+              "");
+gchar *s = N_("shares");
+gchar *s = N_("Shares");
+gchar *s = N_("Match share price");
+gchar *s = N_("Find securities transactions with share price of:");
+gchar *s = N_("At least\n"
+              "At most\n"
+              "Exactly\n"
+              "");
+gchar *s = N_("Price");
+gchar *s = N_("Match Action");
+gchar *s = N_("Find transactions whose Action contains:");
+gchar *s = N_("Case sensitive");
+gchar *s = N_("Regular expression");
+gchar *s = N_("Action");
+gchar *s = N_("Match Cleared state");
+gchar *s = N_("Find transactions whose Cleared status is:");
+gchar *s = N_("Not cleared (n)");
+gchar *s = N_("Cleared (c)");
+gchar *s = N_("Reconciled (y)");
+gchar *s = N_("Cleared");
+gchar *s = N_("Match Balance state");
+gchar *s = N_("Find transactions whose Balance status is:");
+gchar *s = N_("Balanced");
+gchar *s = N_("Not Balanced");
+gchar *s = N_("Balance");
+gchar *s = N_("Match transaction tags (CURRENTLY INOPERABLE)");
+gchar *s = N_("Find transactions with the tag:");
+gchar *s = N_("Case sensitive");
+gchar *s = N_("Regular expression");
+gchar *s = N_("Tags");
+gchar *s = N_("Type of search");
+gchar *s = N_("New search");
+gchar *s = N_("Refine current search");
+gchar *s = N_("Add results to current search");
+gchar *s = N_("Delete results from current search");

src/gnome/print-session.h

@@ -38,8 +38,6 @@
 /* #include <libgnomeprint/gnome-printer-profile.h> */
 #include <libgnomeprint/gnome-font.h>
 
-#include "glade-gnc-dialogs.h"
-
 typedef struct {
   GnomePrintMaster   * master;
   GnomePrintMeta     * meta;