IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use GncQuotes in transfer dialog

Browse Source
This commit is contained in:
Geert Janssens 2021-03-16 12:16:10 +01:00 committed by John Ralls
parent 1a0be99bc6
commit fbf9aecd25
2 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gnucash/gnome-utils/dialog-transfer.cpp
View File

@ -27,7 +27,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <libguile.h> #include <gnc-quotes.hpp>
extern "C" { extern "C" {
#include "dialog-transfer.h" #include "dialog-transfer.h"
@ -45,10 +45,7 @@ extern "C" {
#include "gnc-ui.h" #include "gnc-ui.h"
#include "Transaction.h" #include "Transaction.h"
#include "Account.h" #include "Account.h"
#include "swig-runtime.h"
#include "guile-mappings.h"
#include "engine-helpers.h" #include "engine-helpers.h"
#include "gnc-engine-guile.h"
#include "QuickFill.h" #include "QuickFill.h"
#include <gnc-commodity.h> #include <gnc-commodity.h>
} }
@ -1784,44 +1781,25 @@ gnc_xfer_dialog_close_cb(GtkDialog *dialog, gpointer data)
void void
gnc_xfer_dialog_fetch (GtkButton *button, XferDialog *xferData) gnc_xfer_dialog_fetch (GtkButton *button, XferDialog *xferData)
{ {
PriceReq pr;
SCM quotes_func;
SCM book_scm;
SCM scm_window;
g_return_if_fail (xferData); g_return_if_fail (xferData);
ENTER(" "); ENTER(" ");
quotes_func = scm_c_eval_string ("gnc:book-add-quotes"); GncQuotes quotes (xferData->book);
if (quotes.cmd_result() != 0)
if (!scm_is_procedure (quotes_func))
{ {
if (!quotes.error_msg().empty())
PWARN ("%s", quotes.error_msg().c_str());
LEAVE("quote retrieval failed"); LEAVE("quote retrieval failed");
return; return;
} }
book_scm = gnc_book_to_scm (xferData->book); gnc_set_busy_cursor (nullptr, TRUE);
if (scm_is_true (scm_not (book_scm))) quotes.fetch_all();
{ gnc_unset_busy_cursor (nullptr);
LEAVE("no book");
return;
}
scm_window = SWIG_NewPointerObj(xferData->dialog,
SWIG_TypeQuery("_p_GtkWindow"), 0);
if (scm_is_true (scm_not (book_scm)))
{
LEAVE("no scm window");
return;
}
gnc_set_busy_cursor (NULL, TRUE);
scm_call_2 (quotes_func, scm_window, book_scm);
gnc_unset_busy_cursor (NULL);
/*the results should be in the price db now, but don't crash if not. */ /*the results should be in the price db now, but don't crash if not. */
PriceReq pr;
price_request_from_xferData(&pr, xferData); price_request_from_xferData(&pr, xferData);
if (lookup_price(&pr, LATEST)) if (lookup_price(&pr, LATEST))
{ {

1
libgnucash/app-utils/gnc-quotes.hpp
View File

@ -22,6 +22,7 @@
#ifndef GNC_QUOTES_HPP #ifndef GNC_QUOTES_HPP
#define GNC_QUOTES_HPP #define GNC_QUOTES_HPP
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <gnc-commodity.hpp> // For CommVec alias #include <gnc-commodity.hpp> // For CommVec alias