From cb8ba021dcaa816ceae8c81050800a8e2a458eb2 Mon Sep 17 00:00:00 2001 From: David Hampton Date: Tue, 19 Aug 2003 05:02:25 +0000 Subject: [PATCH] Fix various compile time warnings. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/gnucash-gnome2-dev@9120 57a11ea4-9604-0410-9ed3-97b8803252fd --- lib/egg/egg-action.c | 8 +++ lib/egg/egg-menu-merge.c | 2 + lib/egg/egg-toolbars-model.c | 17 +++--- src/business/business-gnome/dialog-customer.c | 8 ++- src/business/business-gnome/dialog-employee.c | 11 +++- src/business/business-gnome/dialog-invoice.c | 4 ++ src/business/business-gnome/dialog-job.c | 7 ++- src/business/business-gnome/dialog-order.c | 4 ++ src/business/business-gnome/dialog-vendor.c | 7 +++ .../dialog-tax-table/dialog-tax-table.c | 10 ++-- src/engine/gnc-commodity.c | 4 +- src/gnome-search/dialog-search.c | 2 + src/gnome-utils/dialog-commodity.c | 4 +- src/gnome-utils/dialog-transfer.c | 2 + src/gnome-utils/gnc-account-tree.c | 4 -- src/gnome-utils/gnc-date-edit.c | 2 + src/gnome-utils/gnc-date-edit.h | 2 +- src/gnome-utils/gnc-gui-query.c | 18 +------ src/gnome-utils/gnc-tree-model-commodity.h | 3 ++ src/gnome/dialog-commodities.c | 6 +-- src/gnome/dialog-price-edit-db.c | 53 +++++++++---------- src/gnome/gnc-plugin-page-register.c | 2 +- src/gnome/window-main.c | 4 +- src/import-export/hbci/dialog-hbcitrans.c | 1 - 24 files changed, 111 insertions(+), 74 deletions(-) diff --git a/lib/egg/egg-action.c b/lib/egg/egg-action.c index 430c398cf6..da546eb004 100644 --- a/lib/egg/egg-action.c +++ b/lib/egg/egg-action.c @@ -5,11 +5,13 @@ /* some code for making arbitrary GtkButtons that act like toolbar * buttons */ +#if 0 static GtkWidget *tool_button_new (GType button_type, const gchar *text, GtkWidget *icon); static GtkWidget *tool_button_get_label (GtkWidget *button); static GtkWidget *tool_button_get_icon (GtkWidget *button); +#endif enum { ACTIVATE, @@ -509,8 +511,10 @@ connect_proxy (EggAction *action, GtkWidget *proxy) } else if (EGG_IS_TOOL_BUTTON (proxy)) { +#if 0 GtkWidget *label; GtkWidget *icon; +#endif /* toolbar button specific synchronisers ... */ /* synchronise the label */ @@ -703,7 +707,9 @@ void egg_action_disconnect_proxy (EggAction *action, GtkWidget *proxy) { +#if 0 EggAction *prev_action; +#endif g_return_if_fail (EGG_IS_ACTION (action)); g_return_if_fail (GTK_IS_WIDGET (proxy)); @@ -770,6 +776,7 @@ egg_action_set_accel_path (EggAction *action, const gchar *accel_path) /* ---- code to create sort-of-toolbar-buttons ---- */ +#if 0 static GtkWidget * tool_button_get_label (GtkWidget *button) { @@ -966,3 +973,4 @@ tool_button_new (GType button_type, const gchar *text, GtkWidget *icon) return button; } +#endif diff --git a/lib/egg/egg-menu-merge.c b/lib/egg/egg-menu-merge.c index 7997692ac7..a599965052 100644 --- a/lib/egg/egg-menu-merge.c +++ b/lib/egg/egg-menu-merge.c @@ -929,7 +929,9 @@ update_node (EggMenuMerge *self, GNode *node) EggMenuMergeNode *info; GNode *child; EggAction *action; +#if 0 GList *tmp; +#endif g_return_if_fail (node != NULL); g_return_if_fail (NODE_INFO(node) != NULL); diff --git a/lib/egg/egg-toolbars-model.c b/lib/egg/egg-toolbars-model.c index 436f018d70..2d854b6689 100644 --- a/lib/egg/egg-toolbars-model.c +++ b/lib/egg/egg-toolbars-model.c @@ -20,6 +20,7 @@ #include "eggmarshalers.h" #include +#include #include #include @@ -134,7 +135,7 @@ egg_toolbars_model_to_xml (EggToolbarsModel *t) return doc; } -gboolean +static gboolean safe_save_xml (const char *xml_file, xmlDocPtr doc) { char *tmp_file; @@ -313,7 +314,7 @@ egg_toolbars_model_add_separator (EggToolbarsModel *t, toolbar_position, real_position); } -gboolean +static gboolean impl_add_item (EggToolbarsModel *t, int toolbar_position, int position, @@ -325,9 +326,9 @@ impl_add_item (EggToolbarsModel *t, EggToolbarsItem *item; int real_position; - g_return_if_fail (IS_EGG_TOOLBARS_MODEL (t)); - g_return_if_fail (id != NULL); - g_return_if_fail (type != NULL); + g_return_val_if_fail (IS_EGG_TOOLBARS_MODEL (t), FALSE); + g_return_val_if_fail (id != NULL, FALSE); + g_return_val_if_fail (type != NULL, FALSE); parent_node = g_node_nth_child (t->priv->toolbars, toolbar_position); item = toolbars_item_new (id, type, FALSE); @@ -440,7 +441,7 @@ egg_toolbars_model_load (EggToolbarsModel *t, xmlFreeDoc (doc); } -char * +static char * impl_get_item_id (EggToolbarsModel *t, const char *type, const char *name) @@ -453,7 +454,7 @@ impl_get_item_id (EggToolbarsModel *t, return NULL; } -char * +static char * impl_get_item_name (EggToolbarsModel *t, const char *type, const char *id) @@ -466,7 +467,7 @@ impl_get_item_name (EggToolbarsModel *t, return NULL; } -char * +static char * impl_get_item_type (EggToolbarsModel *t, GdkAtom type) { diff --git a/src/business/business-gnome/dialog-customer.c b/src/business/business-gnome/dialog-customer.c index 0b692d6eb5..2fb43fd1bb 100644 --- a/src/business/business-gnome/dialog-customer.c +++ b/src/business/business-gnome/dialog-customer.c @@ -36,6 +36,12 @@ #define DIALOG_NEW_CUSTOMER_CM_CLASS "dialog-new-customer" #define DIALOG_EDIT_CUSTOMER_CM_CLASS "dialog-edit-customer" +void gnc_customer_window_ok_cb (GtkWidget *widget, gpointer data); +void gnc_customer_window_cancel_cb (GtkWidget *widget, gpointer data); +void gnc_customer_window_help_cb (GtkWidget *widget, gpointer data); +void gnc_customer_window_destroy_cb (GtkWidget *widget, gpointer data); +void gnc_customer_name_changed_cb (GtkWidget *widget, gpointer data); + typedef enum { NEW_CUSTOMER, @@ -295,7 +301,7 @@ gnc_customer_window_help_cb (GtkWidget *widget, gpointer data) helpWindow(NULL, NULL, HH_CUSTOMER); } -static void +void gnc_customer_window_destroy_cb (GtkWidget *widget, gpointer data) { CustomerWindow *cw = data; diff --git a/src/business/business-gnome/dialog-employee.c b/src/business/business-gnome/dialog-employee.c index 26c7847c3f..42776b2a2a 100644 --- a/src/business/business-gnome/dialog-employee.c +++ b/src/business/business-gnome/dialog-employee.c @@ -34,6 +34,13 @@ #define DIALOG_NEW_EMPLOYEE_CM_CLASS "dialog-new-employee" #define DIALOG_EDIT_EMPLOYEE_CM_CLASS "dialog-edit-employee" +void gnc_employee_window_ok_cb (GtkWidget *widget, gpointer data); +void gnc_employee_window_cancel_cb (GtkWidget *widget, gpointer data); +void gnc_employee_window_help_cb (GtkWidget *widget, gpointer data); +void gnc_employee_window_destroy_cb (GtkWidget *widget, gpointer data); +void gnc_employee_name_changed_cb (GtkWidget *widget, gpointer data); +void gnc_employee_ccard_acct_toggled_cb (GtkToggleButton *button, gpointer data); + typedef enum { NEW_EMPLOYEE, @@ -239,7 +246,7 @@ gnc_employee_window_help_cb (GtkWidget *widget, gpointer data) helpWindow(NULL, NULL, HH_EMPLOYEE); } -static void +void gnc_employee_window_destroy_cb (GtkWidget *widget, gpointer data) { EmployeeWindow *ew = data; @@ -288,7 +295,7 @@ gnc_employee_name_changed_cb (GtkWidget *widget, gpointer data) g_free (title); } -static void +void gnc_employee_ccard_acct_toggled_cb (GtkToggleButton *button, gpointer data) { EmployeeWindow *ew = data; diff --git a/src/business/business-gnome/dialog-invoice.c b/src/business/business-gnome/dialog-invoice.c index 3a112edcb6..263ae7a6a9 100644 --- a/src/business/business-gnome/dialog-invoice.c +++ b/src/business/business-gnome/dialog-invoice.c @@ -52,6 +52,10 @@ #define DIALOG_NEW_INVOICE_CM_CLASS "dialog-new-invoice" #define DIALOG_VIEW_INVOICE_CM_CLASS "dialog-view-invoice" +void gnc_invoice_window_ok_cb (GtkWidget *widget, gpointer data); +void gnc_invoice_window_cancel_cb (GtkWidget *widget, gpointer data); +void gnc_invoice_window_help_cb (GtkWidget *widget, gpointer data); + typedef enum { NEW_INVOICE, diff --git a/src/business/business-gnome/dialog-job.c b/src/business/business-gnome/dialog-job.c index 46f29a974b..fdc92ddb5e 100644 --- a/src/business/business-gnome/dialog-job.c +++ b/src/business/business-gnome/dialog-job.c @@ -29,6 +29,11 @@ #define DIALOG_NEW_JOB_CM_CLASS "dialog-new-job" #define DIALOG_EDIT_JOB_CM_CLASS "dialog-edit-job" +void gnc_job_window_ok_cb (GtkWidget *widget, gpointer data); +void gnc_job_window_cancel_cb (GtkWidget *widget, gpointer data); +void gnc_job_window_help_cb (GtkWidget *widget, gpointer data); +void gnc_job_window_destroy_cb (GtkWidget *widget, gpointer data); + typedef enum { NEW_JOB, @@ -167,7 +172,7 @@ gnc_job_window_help_cb (GtkWidget *widget, gpointer data) } -static void +void gnc_job_window_destroy_cb (GtkWidget *widget, gpointer data) { JobWindow *jw = data; diff --git a/src/business/business-gnome/dialog-order.c b/src/business/business-gnome/dialog-order.c index b784ac7757..07b9e94029 100644 --- a/src/business/business-gnome/dialog-order.c +++ b/src/business/business-gnome/dialog-order.c @@ -34,6 +34,10 @@ #define DIALOG_EDIT_ORDER_CM_CLASS "dialog-edit-order" #define DIALOG_VIEW_ORDER_CM_CLASS "dialog-view-order" +void gnc_order_window_ok_cb (GtkWidget *widget, gpointer data); +void gnc_order_window_cancel_cb (GtkWidget *widget, gpointer data); +void gnc_order_window_help_cb (GtkWidget *widget, gpointer data); + typedef enum { NEW_ORDER, diff --git a/src/business/business-gnome/dialog-vendor.c b/src/business/business-gnome/dialog-vendor.c index b6cccbebbd..8a7e8affd7 100644 --- a/src/business/business-gnome/dialog-vendor.c +++ b/src/business/business-gnome/dialog-vendor.c @@ -34,6 +34,13 @@ #define DIALOG_NEW_VENDOR_CM_CLASS "dialog-new-vendor" #define DIALOG_EDIT_VENDOR_CM_CLASS "dialog-edit-vendor" +void gnc_vendor_taxtable_check_cb (GtkToggleButton *togglebutton, gpointer user_data); +void gnc_vendor_window_ok_cb (GtkWidget *widget, gpointer data); +void gnc_vendor_window_cancel_cb (GtkWidget *widget, gpointer data); +void gnc_vendor_window_help_cb (GtkWidget *widget, gpointer data); +void gnc_vendor_window_destroy_cb (GtkWidget *widget, gpointer data); +void gnc_vendor_name_changed_cb (GtkWidget *widget, gpointer data); + typedef enum { NEW_VENDOR, diff --git a/src/business/dialog-tax-table/dialog-tax-table.c b/src/business/dialog-tax-table/dialog-tax-table.c index 5771e4363c..d7a7ba19bc 100644 --- a/src/business/dialog-tax-table/dialog-tax-table.c +++ b/src/business/dialog-tax-table/dialog-tax-table.c @@ -24,6 +24,10 @@ #define DIALOG_TAX_TABLE_CM_CLASS "tax-table-dialog" +void new_tax_table_ok_cb (GtkWidget *widget, gpointer data); +void new_tax_table_cancel_cb (GtkWidget *widget, gpointer data); +void new_tax_table_dialog_destroy_cb (GtkWidget *widget, gpointer data); + struct _taxtable_window { GtkWidget * dialog; GtkWidget * names_clist; @@ -49,7 +53,7 @@ typedef struct _new_taxtable { } NewTaxTable; -static void +void new_tax_table_ok_cb (GtkWidget *widget, gpointer data) { NewTaxTable *ntt = data; @@ -146,7 +150,7 @@ new_tax_table_ok_cb (GtkWidget *widget, gpointer data) gnome_dialog_close (GNOME_DIALOG (ntt->dialog)); } -static void +void new_tax_table_cancel_cb (GtkWidget *widget, gpointer data) { NewTaxTable *ntt = data; @@ -154,7 +158,7 @@ new_tax_table_cancel_cb (GtkWidget *widget, gpointer data) gnome_dialog_close (GNOME_DIALOG (ntt->dialog)); } -static void +void new_tax_table_dialog_destroy_cb (GtkWidget *widget, gpointer data) { NewTaxTable *ntt = data; diff --git a/src/engine/gnc-commodity.c b/src/engine/gnc-commodity.c index 225d48c592..9180f3d35d 100644 --- a/src/engine/gnc-commodity.c +++ b/src/engine/gnc-commodity.c @@ -1513,10 +1513,10 @@ commodity_table_is_dirty (QofBook *book) gnc_commodity_table *ct; if (!book) - return; + return FALSE; ct = gnc_commodity_table_get_table (book); if (!ct) - return; + return FALSE; return(ct->dirty); } diff --git a/src/gnome-search/dialog-search.c b/src/gnome-search/dialog-search.c index c452f0cb2d..bdf82f2c9f 100644 --- a/src/gnome-search/dialog-search.c +++ b/src/gnome-search/dialog-search.c @@ -134,6 +134,7 @@ gnc_search_dialog_select_cb (GtkButton *button, GNCSearchWindow *sw) gnc_search_dialog_destroy (sw); } +#if 0 static void gnc_search_dialog_line_toggled (GNCQueryList *list, gpointer item, gpointer user_data) @@ -164,6 +165,7 @@ gnc_search_dialog_double_click_entry (GNCQueryList *list, gpointer item, /* Call the first button (usually view/edit) */ gnc_search_callback_button_execute (sw->buttons, sw); } +#endif static void gnc_search_dialog_select_row_cb (GtkCList *clist, gint row, gint column, diff --git a/src/gnome-utils/dialog-commodity.c b/src/gnome-utils/dialog-commodity.c index 900fb26746..a4a85c4780 100644 --- a/src/gnome-utils/dialog-commodity.c +++ b/src/gnome-utils/dialog-commodity.c @@ -104,7 +104,9 @@ void gnc_ui_commodity_quote_info_cb(GtkWidget *w, gpointer data); gboolean gnc_ui_commodity_dialog_to_object(CommodityWindow * w); #define GNC_RESPONSE_NEW 0 +#if 0 static void gnc_ui_select_commodity_response_cb (GtkDialog * dialog, gint response, gpointer data); +#endif /******************************************************************** @@ -435,6 +437,7 @@ gnc_ui_update_commodity_picker(GtkWidget * combobox, * gnc_ui_update_namespace_picker ********************************************************************/ +#if 0 void gnc_ui_select_commodity_destroy(SelectCommodityWindow * w) { g_return_if_fail (w != NULL); @@ -442,7 +445,6 @@ gnc_ui_select_commodity_destroy(SelectCommodityWindow * w) { gtk_widget_destroy (GTK_WIDGET (w->dialog)); } -#if 0 /******************************************************************** * gnc_ui_select_commodity_ok_cb() ********************************************************************/ diff --git a/src/gnome-utils/dialog-transfer.c b/src/gnome-utils/dialog-transfer.c index 94cdf86f17..339c30c925 100644 --- a/src/gnome-utils/dialog-transfer.c +++ b/src/gnome-utils/dialog-transfer.c @@ -137,6 +137,8 @@ static Account *gnc_transfer_dialog_get_selected_account (XferDialog *dialog, static void gnc_transfer_dialog_set_selected_account (XferDialog *dialog, Account *account, XferDirection direction); +void gnc_xfer_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data); +void gnc_xfer_dialog_close_cb(GnomeDialog *dialog, gpointer data); /** Implementations **********************************************/ diff --git a/src/gnome-utils/gnc-account-tree.c b/src/gnome-utils/gnc-account-tree.c index ac5738f127..9ecb4ece73 100644 --- a/src/gnome-utils/gnc-account-tree.c +++ b/src/gnome-utils/gnc-account-tree.c @@ -79,7 +79,6 @@ static void gnc_account_tree_fill (GNCAccountTree *tree, GHashTable *expanded_accounts, GtkCTreeNode *parent, AccountGroup *accts); -static void gnc_account_tree_set_view_info_real (GNCAccountTree *tree); static void gnc_account_tree_update_column_visibility (GNCAccountTree *tree); struct _acct_tree_defaults { @@ -199,9 +198,6 @@ gnc_account_tree_new_with_root (Account * root) static void gnc_account_tree_init (GNCAccountTree *tree) { - GtkStyle *style; - GdkFont *font; - gint width; int i; tree->root_account = *xaccGUIDNULL (); diff --git a/src/gnome-utils/gnc-date-edit.c b/src/gnome-utils/gnc-date-edit.c index 121dbe762f..5a7626191a 100644 --- a/src/gnome-utils/gnc-date-edit.c +++ b/src/gnome-utils/gnc-date-edit.c @@ -558,6 +558,7 @@ key_press_entry (GtkWidget *widget, GdkEventKey *event, gpointer data) return TRUE; } +#if 0 static int date_focus_out_event(GtkWidget *widget, GdkEventKey *event, gpointer data) { @@ -576,6 +577,7 @@ date_focus_out_event(GtkWidget *widget, GdkEventKey *event, gpointer data) return TRUE; } +#endif static void create_children (GNCDateEdit *gde) diff --git a/src/gnome-utils/gnc-date-edit.h b/src/gnome-utils/gnc-date-edit.h index ed06fb1e96..f3b509592a 100644 --- a/src/gnome-utils/gnc-date-edit.h +++ b/src/gnome-utils/gnc-date-edit.h @@ -102,5 +102,5 @@ void gnc_date_edit_set_flags (GNCDateEdit *gde, GNCDateEditFlags flags); int gnc_date_edit_get_flags (GNCDateEdit *gde); -void gnc_date_set_activates_default (GNCDateEdit *gde, gboolean state); +void gnc_date_editable_enters (GNCDateEdit *gde, gboolean state); #endif diff --git a/src/gnome-utils/gnc-gui-query.c b/src/gnome-utils/gnc-gui-query.c index ca69305ca9..a3cc3a1f32 100644 --- a/src/gnome-utils/gnc-gui-query.c +++ b/src/gnome-utils/gnc-gui-query.c @@ -31,7 +31,7 @@ /* This static indicates the debugging module that this .o belongs to. */ -static short module = MOD_GUI; +/* static short module = MOD_GUI; */ /********************************************************************\ @@ -55,7 +55,6 @@ gnc_ok_cancel_dialog(gncUIWidget parent, const gchar *format,...) { GtkWidget *dialog = NULL; - gint default_button; gint result; gchar *buffer; va_list args; @@ -389,21 +388,6 @@ gnc_generic_warning_dialog(GtkWidget *parent, const char **buttons, return(result); } -int -gnc_generic_error_dialog(GtkWidget *parent, const char **buttons, - const gchar *format, ...) -{ - int result; - va_list args; - - va_start(args, format); - result = gnc_generic_dialog_common(parent, - GNOME_MESSAGE_BOX_ERROR, - buttons, format, args); - va_end(args); - return(result); -} - static void gnc_choose_radio_button_cb(GtkWidget *w, gpointer data) { diff --git a/src/gnome-utils/gnc-tree-model-commodity.h b/src/gnome-utils/gnc-tree-model-commodity.h index 0b31e9aa38..b77423d603 100644 --- a/src/gnome-utils/gnc-tree-model-commodity.h +++ b/src/gnome-utils/gnc-tree-model-commodity.h @@ -59,6 +59,9 @@ GtkTreeModel *gnc_tree_model_commodity_new (GList *commodities); void gnc_tree_model_commodity_add_commodity (GncTreeModelCommodity *model, gpointer commodity); +void gnc_tree_model_commodity_remove_commodity (GncTreeModelCommodity *model, + gpointer commodity); + void gnc_tree_model_commodity_set_commodities (GncTreeModelCommodity *model, GList *commodities); diff --git a/src/gnome/dialog-commodities.c b/src/gnome/dialog-commodities.c index c4adf4313f..26223898ce 100644 --- a/src/gnome/dialog-commodities.c +++ b/src/gnome/dialog-commodities.c @@ -41,7 +41,7 @@ #define DIALOG_COMMODITIES_CM_CLASS "dialog-commodities" /* This static indicates the debugging module that this .o belongs to. */ -static short module = MOD_GUI; +/* static short module = MOD_GUI; */ typedef struct { @@ -307,7 +307,6 @@ gnc_commodities_dialog_create_tree_view (GtkWidget *tree_view) { GtkTreeViewColumn *column; GtkCellRenderer *renderer; - int i; renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (_("Type"), @@ -395,7 +394,6 @@ gnc_commodities_dialog_create (GtkWidget * parent, CommoditiesDialog *cd) { GtkWidget *dialog; GtkWidget *button; - GtkWidget *vbox; GtkWidget *list; GladeXML *xml; gnc_commodity_table *ct; @@ -480,7 +478,7 @@ static void refresh_handler (GHashTable *changes, gpointer user_data) { CommoditiesDialog *cd = user_data; - GtkTreeModel *sort_model, *filter_model, *model; + GtkTreeModel *sort_model, *filter_model; g_return_if_fail(cd != NULL); diff --git a/src/gnome/dialog-price-edit-db.c b/src/gnome/dialog-price-edit-db.c index 2101818b17..45653d3eda 100644 --- a/src/gnome/dialog-price-edit-db.c +++ b/src/gnome/dialog-price-edit-db.c @@ -100,6 +100,7 @@ load_price_helper (GNCPrice *price, gpointer data) return TRUE; } +#if 0 static int price_compare (gconstpointer a, gconstpointer b) { @@ -168,17 +169,13 @@ price_date_compare (gconstpointer a, gconstpointer b) return price_compare (a, b); } +#endif static int gnc_prices_load_prices (PricesDialog *pdb_dialog) { gnc_commodity *current_commodity; GNCPrintAmountInfo print_info; - gboolean sort_commodity; - GtkArrowType arrow_dir; - GtkWidget *show, *hide; - GCompareFunc sort_fn; - gboolean sort_ascending; GNCPrice *old_price; GNCBook *book; GList *prices; @@ -440,6 +437,7 @@ get_quotes_clicked (GtkWidget *widget, gpointer data) gnc_gui_refresh_all (); } +#if 0 /** * gnc_prices_click_column_cb * @@ -514,29 +512,30 @@ gnc_prices_unselect_price_cb (GtkCTree *ctre, gint row, gint col, static void prices_set_min_widths (PricesDialog *pdb_dialog) { -// const char *titles[] = { _("Commodity"), -// _("Currency"), -// _("Date"), -// _("Source"), -// _("Type"), -// _("Price") }; -// -// GtkStyle *style = gtk_widget_get_style (pdb_dialog->price_list); -// GdkFont *font = NULL; -// gint width; -// gint i; -// -// if (style != NULL) -// font = gdk_font_from_description (style->font_desc); -// -// if (font != NULL) -// for (i = 0; i < 6; i++) -// { -// width = gdk_string_width (font, titles[i]); -// gtk_clist_set_column_min_width (GTK_CLIST (pdb_dialog->price_list), -// i, width + 5); -// } + const char *titles[] = { _("Commodity"), + _("Currency"), + _("Date"), + _("Source"), + _("Type"), + _("Price") }; + + GtkStyle *style = gtk_widget_get_style (pdb_dialog->price_list); + GdkFont *font = NULL; + gint width; + gint i; + + if (style != NULL) + font = gdk_font_from_description (style->font_desc); + + if (font != NULL) + for (i = 0; i < 6; i++) + { + width = gdk_string_width (font, titles[i]); + gtk_clist_set_column_min_width (GTK_CLIST (pdb_dialog->price_list), + i, width + 5); + } } +#endif static void gnc_prices_dialog_create (GtkWidget * parent, PricesDialog *pdb_dialog) diff --git a/src/gnome/gnc-plugin-page-register.c b/src/gnome/gnc-plugin-page-register.c index 125ecceb39..9975d26be1 100644 --- a/src/gnome/gnc-plugin-page-register.c +++ b/src/gnome/gnc-plugin-page-register.c @@ -10,7 +10,7 @@ #include #include #include "egg-action-group.h" - +#include "global-options.h" #include "gnc-plugin-page-register.h" #include "gnc-plugin-register.h" #include "gnc-split-reg.h" diff --git a/src/gnome/window-main.c b/src/gnome/window-main.c index 0468fda184..922814254f 100644 --- a/src/gnome/window-main.c +++ b/src/gnome/window-main.c @@ -71,8 +71,9 @@ #include "messages.h" #include "guile-mappings.h" -static short module = MOD_GUI; +/* static short module = MOD_GUI; */ +#if INCLUDE_GNOME1_BASED_ROUTINES static void gnc_main_window_create_menus(GNCMDIInfo * maininfo); static GnomeUIInfo * gnc_main_window_toolbar_prefix (void); static GnomeUIInfo * gnc_main_window_toolbar_suffix (void); @@ -139,6 +140,7 @@ gnc_main_window_get_mdi_child (void) LEAVE("oops. No valid no child or app"); return(NULL); } +#endif /******************************************************************** * gnc_shutdown diff --git a/src/import-export/hbci/dialog-hbcitrans.c b/src/import-export/hbci/dialog-hbcitrans.c index 6bf1c26b18..ade9676e59 100644 --- a/src/import-export/hbci/dialog-hbcitrans.c +++ b/src/import-export/hbci/dialog-hbcitrans.c @@ -187,7 +187,6 @@ gnc_hbci_dialog_new (GtkWidget *parent, GladeXML *xml; const HBCI_Bank *bank; HBCITransDialog *td; - gboolean successful; td = g_new0(HBCITransDialog, 1);