Merge branch 'master' into ext-perl

[chaz/homebank] / src / ext-perl.xs

diff --git a/src/ext-perl.xs b/src/ext-perl.xs
index 5aa56b01df5480491909eb647b4d6ae6b48696b5..c8e1f25b5a4f82e4435cbac1658583c4e2ac2bff 100644 (file)
--- a/src/ext-perl.xs
+++ b/src/ext-perl.xs
@@ -11,8 +11,8 @@
 #include "refcount.h"
 
 extern struct HomeBank *GLOBALS;
-#include "dsp_mainwindow.h"
-#include "dsp_account.h"
+#include "dsp-mainwindow.h"
+#include "dsp-account.h"
 #include "ui-transaction.h"
 
 
@@ -172,10 +172,10 @@ static inline GObject* SvGobject(const SV* sv)
 
 static inline SV* newSVgobject(const GObject* o)
 {
-    SV* (*func)(const GObject*, gboolean) = ext_symbol_lookup("gperl_new_object");
-    if (func) {
-        return func(o, FALSE);
-    }
+       SV* (*func)(const GObject*, gboolean) = ext_symbol_lookup("gperl_new_object");
+       if (func) {
+               return func(o, FALSE);
+       }
        return &PL_sv_undef;
 }
 
@@ -910,7 +910,7 @@ transactions(Account* SELF)
 GObject*
 open(Account* SELF)
        CODE:
-               RETVAL = G_OBJECT(register_panel_window_new(SELF->key, SELF));
+               RETVAL = G_OBJECT(register_panel_window_new(SELF));
        OUTPUT:
                RETVAL
 
@@ -980,13 +980,13 @@ date(Transaction* SELF, ...)
                }
 
 const gchar*
-wording(Transaction* SELF, ...)
+memo(Transaction* SELF, ...)
        CODE:
                if (1 < items) {
-                       if (SELF->wording) g_free(SELF->wording);
-                       SELF->wording = g_strdup(SvGchar_ptr(ST(1)));
+                       if (SELF->memo) g_free(SELF->memo);
+                       SELF->memo = g_strdup(SvGchar_ptr(ST(1)));
                }
-               RETVAL = SELF->wording ? SELF->wording : "";
+               RETVAL = SELF->memo ? SELF->memo : "";
        OUTPUT:
                RETVAL
 
@@ -1004,7 +1004,7 @@ info(Transaction* SELF, ...)
 GObject*
 open(Transaction* SELF)
        CODE:
-               RETVAL = G_OBJECT(create_deftransaction_window(NULL, TRANSACTION_EDIT_MODIFY, FALSE));
+               RETVAL = G_OBJECT(create_deftransaction_window(NULL, TRANSACTION_EDIT_MODIFY, FALSE, 0));
                deftransaction_set_transaction(GTK_WIDGET(RETVAL), SELF);
        OUTPUT:
                RETVAL
@@ -1023,7 +1023,7 @@ pair_with(Transaction* SELF, Transaction* other, ...)
                                EXT_P2C_OBJECT("HomeBank::Transaction", sv, ptr, Transaction*);
                                list = g_list_append(list, ptr);
                        }
-                       other = ui_dialog_transaction_xfer_select_child(SELF, list);
+                       ui_dialog_transaction_xfer_select_child(NULL, SELF, list, &other);
                }
                if (other) {
                        transaction_xfer_change_to_child(SELF, other);
@@ -1039,5 +1039,5 @@ void
 dump(Transaction* SELF)
        CODE:
                g_print("txn: %p (%s) at %u (%d/%d) flags:%d, paymode:%d, kpay:%d, kcat:%d", SELF,
-                       SELF->wording, SELF->date, SELF->kacc, SELF->kxferacc, SELF->flags, SELF->paymode, SELF->kpay, SELF->kcat);
+                       SELF->memo, SELF->date, SELF->kacc, SELF->kxferacc, SELF->flags, SELF->paymode, SELF->kpay, SELF->kcat);