sync from upstream up to 22:14a375563e2b
This includes the following commits: changeset: 22:14a375563e2b summary: chang "while" command to "type -P" in bash based configure changeset: 21:c4bf7c0f33d2 summary: updated codec paper for RS01 life cycle changeset: 20:dbcaad8128aa summary: replaced build count with mercurial changeset changeset: 19:fba258a6acfa summary: Added tag 0.79.10 for changeset 49950be5a2ef changeset: 18:49950be5a2ef summary: merged some debian patches changeset: 17:815be3929c41 summary: merged "easy" patches from Stéphane Lesimple's version changeset: 16:7d15f8a958cb summary: Made printf format strings 32/64bit safe as suggested by Stéphane; changeset: 15:1055a53b8d6d summary: reorganized code for --with-gui=[yes|no] option changeset: 14:fbe2ae12a32c summary: Added tag 0.79.9 for changeset f2fdd6d3a1f5 changeset: 13:f2fdd6d3a1f5 summary: updated TODO and CHANGELOG And other changes that were needed to resolve the (many) conflicts.
This commit is contained in:
@@ -20,6 +20,8 @@
|
||||
* along with dvdisaster. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/*** src type: some GUI code ***/
|
||||
|
||||
#include "dvdisaster.h"
|
||||
|
||||
#include "rs02-includes.h"
|
||||
@@ -54,7 +56,12 @@ void register_rs02(void)
|
||||
method->finalizeCksums = RS02FinalizeCksums;
|
||||
method->expectedImageSize = RS02ExpectedImageSize;
|
||||
|
||||
#ifndef WITH_CLI_ONLY_YES
|
||||
/*** Widget list must even exist with dummy values in CLI only version
|
||||
to prevent null ptr references in SetLabel() etc. */
|
||||
|
||||
method->widgetList = g_malloc0(sizeof(RS02Widgets));
|
||||
|
||||
#ifdef WITH_GUI_YES
|
||||
/*** Linkage to rs02-window.c */
|
||||
|
||||
method->createCreateWindow = CreateRS02EncWindow;
|
||||
@@ -72,7 +79,7 @@ void register_rs02(void)
|
||||
method->createVerifyWindow = CreateRS02VerifyWindow;
|
||||
method->resetVerifyWindow = ResetRS02VerifyWindow;
|
||||
#endif
|
||||
|
||||
|
||||
/*** Register ourself */
|
||||
|
||||
method->destroy = destroy;
|
||||
@@ -81,28 +88,23 @@ void register_rs02(void)
|
||||
}
|
||||
|
||||
static void destroy(Method *method)
|
||||
{
|
||||
#ifndef WITH_CLI_ONLY_YES
|
||||
RS02Widgets *wl = (RS02Widgets*)method->widgetList;
|
||||
#endif
|
||||
{ RS02Widgets *wl = (RS02Widgets*)method->widgetList;
|
||||
RS02CksumClosure *csc = (RS02CksumClosure*)method->ckSumClosure;
|
||||
|
||||
if(csc->lay)
|
||||
g_free(csc->lay);
|
||||
g_free(method->ckSumClosure);
|
||||
|
||||
#ifndef WITH_CLI_ONLY_YES
|
||||
if(wl)
|
||||
{ if(wl->fixCurve) FreeCurve(wl->fixCurve);
|
||||
|
||||
if(wl->cmpSpiral)
|
||||
FreeSpiral(wl->cmpSpiral);
|
||||
{
|
||||
#ifdef WITH_GUI_YES
|
||||
GuiFreeCurve(wl->fixCurve);
|
||||
GuiFreeSpiral(wl->cmpSpiral);
|
||||
|
||||
if(wl->cmpLayout)
|
||||
g_object_unref(wl->cmpLayout);
|
||||
|
||||
#endif
|
||||
g_free(wl);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user