]>
Commit | Line | Data |
---|---|---|
eac0a1dd JB |
1 | --- aqbanking-3.0.1/src/plugins/backends/aqdtaus/plugin/provider.c.orig 2007-11-22 18:38:22.000000000 +0100 |
2 | +++ aqbanking-3.0.1/src/plugins/backends/aqdtaus/plugin/provider.c 2008-01-05 17:53:46.576640664 +0100 | |
3 | @@ -270,7 +270,7 @@ AD_JOB *AD_Provider_FindMyJob(AB_PROVIDE | |
4 | ||
5 | ||
6 | ||
7 | -int AD_Provider_UpdateJob(AB_PROVIDER *pro, AB_JOB *j){ | |
8 | +int AD_Provider_UpdateJob(AB_PROVIDER *pro, AB_JOB *j, uint32_t guiid){ | |
9 | AD_PROVIDER *dp; | |
10 | AB_ACCOUNT *da; | |
11 | AB_TRANSACTION_LIMITS *lim; | |
12 | @@ -303,7 +303,7 @@ int AD_Provider_UpdateJob(AB_PROVIDER *p | |
13 | ||
14 | ||
15 | ||
16 | -int AD_Provider_AddJob(AB_PROVIDER *pro, AB_JOB *j){ | |
17 | +int AD_Provider_AddJob(AB_PROVIDER *pro, AB_JOB *j, uint32_t guiid){ | |
18 | AD_PROVIDER *dp; | |
19 | AB_ACCOUNT *da; | |
20 | const AB_TRANSACTION *t; | |
21 | @@ -547,7 +547,7 @@ int AD_Provider_MountDisc(AB_PROVIDER *p | |
22 | ||
23 | bid=GWEN_Gui_ShowBox(0, | |
24 | I18N("Mounting disc"), | |
25 | - I18N("Mounting floppy disc, please wait...")); | |
26 | + I18N("Mounting floppy disc, please wait..."), 0); | |
27 | rv=AD_Provider_ExecCommand(pro, cmd); | |
28 | GWEN_Gui_HideBox(bid); | |
29 | if (rv) { | |
30 | @@ -570,7 +570,7 @@ int AD_Provider_UnmountDisc(AB_PROVIDER | |
31 | ||
32 | bid=GWEN_Gui_ShowBox(0, | |
33 | I18N("Unmounting disc"), | |
34 | - I18N("Unmounting floppy disc, please wait...")); | |
35 | + I18N("Unmounting floppy disc, please wait..."), 0); | |
36 | rv=AD_Provider_ExecCommand(pro, cmd); | |
37 | GWEN_Gui_HideBox(bid); | |
38 | if (rv) { | |
39 | @@ -776,7 +776,7 @@ int AD_Provider_PrintBegleitZettel(AB_PR | |
40 | "AQDTAUS:BEGLEITZETTEL", | |
41 | I18N("Diesen Zettel muessen Sie der Diskette " | |
42 | "beilegen."), | |
43 | - GWEN_Buffer_GetStart(abuf)); | |
44 | + GWEN_Buffer_GetStart(abuf), 0); | |
45 | GWEN_Buffer_free(hbuf); | |
46 | GWEN_Buffer_free(abuf); | |
47 | ||
48 | @@ -912,8 +912,8 @@ int AD_Provider_ProcessJob(AB_PROVIDER * | |
49 | bio=GWEN_BufferedIO_Buffer2_new(buf, 0); | |
50 | GWEN_BufferedIO_SetWriteBuffer(bio, 0, 1024); | |
51 | ||
52 | - if (GWEN_DBIO_Export(dbio, bio, GWEN_DB_FLAGS_DEFAULT, | |
53 | - dbTransfers, dbCfg)) { | |
54 | + if (GWEN_DBIO_Export(dbio, bio, | |
55 | + dbTransfers, dbCfg, GWEN_DB_FLAGS_DEFAULT, 0, 0)) { | |
56 | DBG_ERROR(AQDTAUS_LOGDOMAIN, "Error creating DTAUS object"); | |
57 | GWEN_BufferedIO_Abandon(bio); | |
58 | GWEN_BufferedIO_free(bio); | |
59 | @@ -951,8 +951,8 @@ int AD_Provider_ProcessJob(AB_PROVIDER * | |
60 | bio=GWEN_BufferedIO_Buffer2_new(buf, 0); | |
61 | GWEN_BufferedIO_SetReadBuffer(bio, 0, 1024); | |
62 | ||
63 | - err=GWEN_DBIO_Import(dbio, bio, GWEN_PATH_FLAGS_CREATE_GROUP, | |
64 | - dbTransfers, dbCfg); | |
65 | + err=GWEN_DBIO_Import(dbio, bio, | |
66 | + dbTransfers, dbCfg, GWEN_PATH_FLAGS_CREATE_GROUP, 0, 0); | |
67 | if (err) { | |
68 | DBG_ERROR(AQDTAUS_LOGDOMAIN, "Error re-importing DTAUS object"); | |
69 | GWEN_BufferedIO_Abandon(bio); | |
70 | @@ -995,7 +995,7 @@ int AD_Provider_ProcessJob(AB_PROVIDER * | |
71 | GWEN_GUI_MSG_FLAGS_SEVERITY_NORMAL, | |
72 | I18N("Insert Disc"), | |
73 | msgBuf, | |
74 | - I18N("Ok"), I18N("Abort"), 0); | |
75 | + I18N("Ok"), I18N("Abort"), NULL, 0); | |
76 | if (rv!=1) { | |
77 | DBG_ERROR(AQDTAUS_LOGDOMAIN, "User aborted"); | |
78 | GWEN_Buffer_free(buf); | |
79 | @@ -1027,7 +1027,7 @@ int AD_Provider_ProcessJob(AB_PROVIDER * | |
80 | "Please see console logs for details." | |
81 | "</p>" | |
82 | "</html>"), | |
83 | - I18N("Dismiss"), 0, 0); | |
84 | + I18N("Dismiss"), NULL, NULL, 0); | |
85 | AD_Job_SetResult(dj, rv, I18N("Could not mount disc")); | |
86 | return rv; | |
87 | } | |
88 | @@ -1059,7 +1059,7 @@ int AD_Provider_ProcessJob(AB_PROVIDER * | |
89 | "</html>"), | |
90 | I18N("Ok"), | |
91 | I18N("Use This Disc"), | |
92 | - I18N("Abort")); | |
93 | + I18N("Abort"), 0); | |
94 | if (rv==2) | |
95 | break; | |
96 | else if (rv!=1) { | |
97 | @@ -1086,7 +1086,7 @@ int AD_Provider_ProcessJob(AB_PROVIDER * | |
98 | "Please see console logs for details." | |
99 | "</p>" | |
100 | "</html>"), | |
101 | - I18N("Dismiss"), 0, 0); | |
102 | + I18N("Dismiss"), NULL, NULL, 0); | |
103 | GWEN_Buffer_free(buf); | |
104 | GWEN_DB_Group_free(dbTransfers); | |
105 | if (mounted) | |
106 | @@ -1130,7 +1130,7 @@ int AD_Provider_ProcessJob(AB_PROVIDER * | |
107 | "Please see console logs for details." | |
108 | "</p>" | |
109 | "</html>"), | |
110 | - I18N("Dismiss"), 0, 0); | |
111 | + I18N("Dismiss"), NULL, NULL, 0); | |
112 | AD_Job_SetResult(dj, rv, I18N("Could not write DTAUS file")); | |
113 | GWEN_Buffer_free(buf); | |
114 | GWEN_DB_Group_free(dbTransfers); | |
115 | @@ -1164,7 +1164,7 @@ int AD_Provider_ProcessJob(AB_PROVIDER * | |
116 | "printed." | |
117 | "</p>" | |
118 | "</html>"), | |
119 | - I18N("Dismiss"), 0, 0); | |
120 | + I18N("Dismiss"), NULL, NULL, 0); | |
121 | } | |
122 | else { | |
123 | GWEN_Gui_MessageBox(GWEN_GUI_MSG_FLAGS_TYPE_ERROR | | |
124 | @@ -1179,7 +1179,7 @@ int AD_Provider_ProcessJob(AB_PROVIDER * | |
125 | "Please see console logs for details." | |
126 | "</p>" | |
127 | "</html>"), | |
128 | - I18N("Dismiss"), 0, 0); | |
129 | + I18N("Dismiss"), NULL, NULL, 0); | |
130 | } | |
131 | ||
132 | } | |
133 | @@ -1267,7 +1267,7 @@ int AD_Provider__Execute(AB_PROVIDER *pr | |
134 | ||
135 | ||
136 | ||
137 | -int AD_Provider_Execute(AB_PROVIDER *pro, AB_IMEXPORTER_CONTEXT *ctx){ | |
138 | +int AD_Provider_Execute(AB_PROVIDER *pro, AB_IMEXPORTER_CONTEXT *ctx, uint32_t guiid){ | |
139 | AD_PROVIDER *dp; | |
140 | uint32_t pid; | |
141 | int cnt; | |
142 | @@ -1299,7 +1299,7 @@ int AD_Provider_Execute(AB_PROVIDER *pro | |
143 | GWEN_GUI_PROGRESS_ALLOW_EMBED | | |
144 | GWEN_GUI_PROGRESS_SHOW_PROGRESS | | |
145 | GWEN_GUI_PROGRESS_SHOW_ABORT, | |
146 | - I18N("Creating DTAUS Disc(s)"), msgBuf, cnt); | |
147 | + I18N("Creating DTAUS Disc(s)"), msgBuf, cnt, 0 /*guiid?*/); | |
148 | rv=AD_Provider__Execute(pro); | |
149 | GWEN_Gui_ProgressEnd(pid); | |
150 | ||
151 | --- aqbanking-3.0.1/src/plugins/backends/aqdtaus/plugin/provider_p.h.orig 2007-11-22 18:38:22.000000000 +0100 | |
152 | +++ aqbanking-3.0.1/src/plugins/backends/aqdtaus/plugin/provider_p.h 2008-01-05 17:54:52.620033177 +0100 | |
153 | @@ -69,9 +69,9 @@ static int AD_Provider__Execute(AB_PROVI | |
154 | ||
155 | static int AD_Provider_Init(AB_PROVIDER *pro, GWEN_DB_NODE *dbData); | |
156 | static int AD_Provider_Fini(AB_PROVIDER *pro, GWEN_DB_NODE *dbData); | |
157 | -static int AD_Provider_UpdateJob(AB_PROVIDER *pro, AB_JOB *j); | |
158 | -static int AD_Provider_AddJob(AB_PROVIDER *pro, AB_JOB *j); | |
159 | -static int AD_Provider_Execute(AB_PROVIDER *pro, AB_IMEXPORTER_CONTEXT *ctx); | |
160 | +static int AD_Provider_UpdateJob(AB_PROVIDER *pro, AB_JOB *j, uint32_t guiid); | |
161 | +static int AD_Provider_AddJob(AB_PROVIDER *pro, AB_JOB *j, uint32_t guiid); | |
162 | +static int AD_Provider_Execute(AB_PROVIDER *pro, AB_IMEXPORTER_CONTEXT *ctx, uint32_t guiid); | |
163 | static int AD_Provider_ResetQueue(AB_PROVIDER *pro); | |
164 | static int AD_Provider_ExtendAccount(AB_PROVIDER *pro, AB_ACCOUNT *a, | |
165 | AB_PROVIDER_EXTEND_MODE em); | |
166 | --- aqbanking-3.0.1/src/plugins/backends/aqdtaus/Makefile.am.orig 2007-11-22 18:38:23.000000000 +0100 | |
167 | +++ aqbanking-3.0.1/src/plugins/backends/aqdtaus/Makefile.am 2008-01-05 17:57:53.125972106 +0100 | |
168 | @@ -2,7 +2,6 @@ SUBDIRS=plugin ui | |
169 | ||
170 | EXTRA_DIST=ChangeLog README aqdtaus.m4 version.h.in | |
171 | ||
172 | -bin_SCRIPTS=aqdtaus-config | |
173 | M4dir=${prefix}/share/aclocal | |
174 | dist_M4_DATA=aqdtaus.m4 | |
175 | ||
176 | @@ -10,12 +9,7 @@ iheaderdir=${includedir}/aqdtaus | |
177 | iheader_HEADERS=\ | |
178 | version.h | |
179 | BUILT_SOURCES = version.h | |
180 | -CLEANFILES = $(BUILT_SOURCES) aqdtaus-config aqdtaus-config.in | |
181 | - | |
182 | -aqdtaus-config: aqdtaus-config.in | |
183 | - echo "#! /bin/sh" >aqdtaus-config && \ | |
184 | - cat aqdtaus-config.in >>aqdtaus-config && \ | |
185 | - chmod a+x aqdtaus-config | |
186 | +CLEANFILES = $(BUILT_SOURCES) | |
187 | ||
188 | sources: | |
189 | for d in $(SUBDIRS); do \ | |
190 | --- aqbanking-3.0.1/src/plugins/backends/aqgeldkarte/plugin/provider.c.orig 2007-11-22 18:38:24.000000000 +0100 | |
191 | +++ aqbanking-3.0.1/src/plugins/backends/aqgeldkarte/plugin/provider.c 2008-01-05 18:00:33.150859039 +0100 | |
192 | @@ -194,7 +194,7 @@ int AG_Provider_ExtendAccount(AB_PROVIDE | |
193 | ||
194 | ||
195 | ||
196 | -int AG_Provider_UpdateJob(AB_PROVIDER *pro, AB_JOB *j){ | |
197 | +int AG_Provider_UpdateJob(AB_PROVIDER *pro, AB_JOB *j, uint32_t guiid){ | |
198 | AG_PROVIDER *dp; | |
199 | AB_ACCOUNT *da; | |
200 | ||
201 | @@ -222,7 +222,7 @@ int AG_Provider_UpdateJob(AB_PROVIDER *p | |
202 | ||
203 | ||
204 | ||
205 | -int AG_Provider_AddJob(AB_PROVIDER *pro, AB_JOB *bj){ | |
206 | +int AG_Provider_AddJob(AB_PROVIDER *pro, AB_JOB *bj, uint32_t guiid){ | |
207 | AG_PROVIDER *dp; | |
208 | AB_ACCOUNT *da; | |
209 | AG_CARD *card; | |
210 | @@ -597,7 +597,7 @@ int AG_Provider_ProcessCard(AB_PROVIDER | |
211 | ||
212 | bid=GWEN_Gui_ShowBox(0, | |
213 | I18N("Accessing Card"), | |
214 | - I18N("Reading card, please wait...")); | |
215 | + I18N("Reading card, please wait..."), 0); | |
216 | rv=AG_Provider_MountCard(pro, AG_Card_GetAccount(card), &gc); | |
217 | if (rv || !gc) { | |
218 | DBG_ERROR(AQGELDKARTE_LOGDOMAIN, "Could not mount card (%d)", rv); | |
219 | @@ -643,7 +643,7 @@ int AG_Provider_ProcessCard(AB_PROVIDER | |
220 | ||
221 | ||
222 | ||
223 | -int AG_Provider_Execute(AB_PROVIDER *pro, AB_IMEXPORTER_CONTEXT *ctx){ | |
224 | +int AG_Provider_Execute(AB_PROVIDER *pro, AB_IMEXPORTER_CONTEXT *ctx, uint32_t guiid){ | |
225 | AG_PROVIDER *dp; | |
226 | AG_CARD *card; | |
227 | int done=0; | |
228 | @@ -660,7 +660,7 @@ int AG_Provider_Execute(AB_PROVIDER *pro | |
229 | GWEN_GUI_PROGRESS_SHOW_ABORT, | |
230 | I18N("Executing GeldKarte jobs"), | |
231 | I18N("All GeldKarte jobs are now executed"), | |
232 | - AG_Card_List_GetCount(dp->cards)); | |
233 | + AG_Card_List_GetCount(dp->cards), 0 /* guiid? */); | |
234 | ||
235 | card=AG_Card_List_First(dp->cards); | |
236 | if (!card) { | |
237 | @@ -757,7 +757,7 @@ int AG_Provider_MountCard(AB_PROVIDER *p | |
238 | "Please insert your chipcard into the " | |
239 | "reader and click <i>ok</i>" | |
240 | "</html>"), | |
241 | - I18N("OK"), I18N("Abort"), 0); | |
242 | + I18N("OK"), I18N("Abort"), NULL, 0); | |
243 | if (mres!=1) { | |
244 | DBG_ERROR(AQGELDKARTE_LOGDOMAIN, "Error in user interaction"); | |
245 | LC_Client_Stop(dp->chipcardClient); | |
246 | @@ -848,7 +848,7 @@ int AG_Provider_MountCard(AB_PROVIDER *p | |
247 | " chipcard into the reader and " | |
248 | "click <i>ok</i>" | |
249 | "</html>"), | |
250 | - I18N("OK"), I18N("Abort"), 0); | |
251 | + I18N("OK"), I18N("Abort"), NULL, 0); | |
252 | if (mres!=1) { | |
253 | DBG_ERROR(AQGELDKARTE_LOGDOMAIN, "Error in user interaction"); | |
254 | LC_Client_Stop(dp->chipcardClient); | |
255 | --- aqbanking-3.0.1/src/plugins/backends/aqgeldkarte/plugin/provider_p.h.orig 2007-11-22 18:38:24.000000000 +0100 | |
256 | +++ aqbanking-3.0.1/src/plugins/backends/aqgeldkarte/plugin/provider_p.h 2008-01-05 18:00:04.156036271 +0100 | |
257 | @@ -48,9 +48,9 @@ static int AG_Provider_ProcessCard(AB_PR | |
258 | ||
259 | static int AG_Provider_Init(AB_PROVIDER *pro, GWEN_DB_NODE *dbData); | |
260 | static int AG_Provider_Fini(AB_PROVIDER *pro, GWEN_DB_NODE *dbData); | |
261 | -static int AG_Provider_UpdateJob(AB_PROVIDER *pro, AB_JOB *j); | |
262 | -static int AG_Provider_AddJob(AB_PROVIDER *pro, AB_JOB *j); | |
263 | -static int AG_Provider_Execute(AB_PROVIDER *pro, AB_IMEXPORTER_CONTEXT *ctx); | |
264 | +static int AG_Provider_UpdateJob(AB_PROVIDER *pro, AB_JOB *j, uint32_t guiid); | |
265 | +static int AG_Provider_AddJob(AB_PROVIDER *pro, AB_JOB *j, uint32_t guiid); | |
266 | +static int AG_Provider_Execute(AB_PROVIDER *pro, AB_IMEXPORTER_CONTEXT *ctx, uint32_t guiid); | |
267 | static int AG_Provider_ResetQueue(AB_PROVIDER *pro); | |
268 | static int AG_Provider_ExtendAccount(AB_PROVIDER *pro, AB_ACCOUNT *a, | |
269 | AB_PROVIDER_EXTEND_MODE em); | |
270 | --- aqbanking-3.0.1/src/plugins/backends/aqgeldkarte/ui/qt3/libs/dialogs/cfgtabpagk.cpp.orig 2007-11-22 18:38:23.000000000 +0100 | |
271 | +++ aqbanking-3.0.1/src/plugins/backends/aqgeldkarte/ui/qt3/libs/dialogs/cfgtabpagk.cpp 2008-01-05 18:01:42.487155154 +0100 | |
272 | @@ -121,7 +121,7 @@ void CfgTabPageAccountGeldKarte::slotRea | |
273 | (0, | |
274 | QBanking::QStringToUtf8String(tr("Accessing Card")).c_str(), | |
275 | QBanking::QStringToUtf8String(tr("Reading card, " | |
276 | - "please wait...")).c_str() | |
277 | + "please wait...")).c_str(), 0 | |
278 | ); | |
279 | rv=AG_Provider_MountCard(pro, a, &card); | |
280 | GWEN_Gui_HideBox(bid); | |
281 | --- aqbanking-3.0.1/src/plugins/backends/aqgeldkarte/Makefile.am.orig 2007-11-22 18:38:24.000000000 +0100 | |
282 | +++ aqbanking-3.0.1/src/plugins/backends/aqgeldkarte/Makefile.am 2008-01-05 18:02:27.172783951 +0100 | |
283 | @@ -2,7 +2,6 @@ SUBDIRS=plugin ui | |
284 | ||
285 | EXTRA_DIST=ChangeLog README aqgeldkarte.m4 version.h.in | |
286 | ||
287 | -bin_SCRIPTS=aqgeldkarte-config | |
288 | M4dir=${prefix}/share/aclocal | |
289 | dist_M4_DATA=aqgeldkarte.m4 | |
290 | ||
291 | @@ -10,12 +9,7 @@ iheaderdir=${includedir}/aqgeldkarte | |
292 | iheader_HEADERS=\ | |
293 | version.h | |
294 | BUILT_SOURCES = version.h | |
295 | -CLEANFILES = $(BUILT_SOURCES) aqgeldkarte-config aqgeldkarte-config.in | |
296 | - | |
297 | -aqgeldkarte-config: aqgeldkarte-config.in | |
298 | - echo "#! /bin/sh" >aqgeldkarte-config && \ | |
299 | - cat aqgeldkarte-config.in >>aqgeldkarte-config && \ | |
300 | - chmod a+x aqgeldkarte-config | |
301 | +CLEANFILES = $(BUILT_SOURCES) | |
302 | ||
303 | sources: | |
304 | for d in $(SUBDIRS); do \ |