Date:2012-10-08 08:19:59 (11 years 5 months ago)
Author:Paul Cercueil
Commit:909fef2f3a8d39cfa171637b5d2df16341e9fc7a
Message:Update to use the latest libopk API.

Files: src/imageio.cpp (1 diff)
src/linkapp.cpp (3 diffs)

Change Details

src/imageio.cpp
2626    struct OpkParams *params = (struct OpkParams *) png_get_io_ptr(png_ptr);
2727
2828    if (!params->buf) {
29        params->buf = unsquashfs_single_file(params->sqfs_file->c_str(),
29        params->buf = opk_extract_file(params->sqfs_file->c_str(),
3030                    params->icon_file->c_str());
3131        if (!params->buf) {
3232            png_error(png_ptr, "Unable to open OPK package\n");
src/linkapp.cpp
7373#ifdef HAVE_LIBOPK
7474    isOPK = opk;
7575    if (opk) {
76        struct ParserData *pdata = openMetadata(linkfile);
76        struct ParserData *pdata = opk_open(linkfile);
7777        char *param;
7878        if (!pdata) {
7979            ERROR("Unable to initialize libopk\n");
...... 
8282
8383        file = linkfile;
8484
85        param = readParam(pdata, "Name");
85        param = opk_read_param(pdata, "Name");
8686        if (!param)
8787            ERROR("Missing \"Name\" parameter\n");
8888        else
8989            title = param;
9090
91        param = readParam(pdata, "Comment");
91        param = opk_read_param(pdata, "Comment");
9292        if (param)
9393            description = param;
9494
9595        /* Read the icon from the OPK only
9696         * if it doesn't exist on the skin */
97        param = readParam(pdata, "Icon");
97        param = opk_read_param(pdata, "Icon");
9898        if (param) {
9999            this->icon = gmenu2x->sc.getSkinFilePath((string) param + ".png");
100100            if (this->icon.empty())
...... 
105105        if (iconPath.empty())
106106            searchIcon();
107107
108        param = readParam(pdata, "Exec");
108        param = opk_read_param(pdata, "Exec");
109109        if (!param)
110110            ERROR("Missing \"Exec\" parameter\n");
111111        else
112112            exec = param;
113113
114114#ifdef PLATFORM_DINGUX
115        param = readParam(pdata, "Terminal");
115        param = opk_read_param(pdata, "Terminal");
116116        if (param)
117117            consoleApp = !strcmp(param, "true");
118118#endif
119119
120        param = readParam(pdata, "X-OD-Manual");
120        param = opk_read_param(pdata, "X-OD-Manual");
121121        if (param)
122122            manual = param;
123123
124        param = readParam(pdata, "X-OD-Daemon");
124        param = opk_read_param(pdata, "X-OD-Daemon");
125125        if (param)
126126            dontleave = !strcmp(param, "true");
127127
128128        edited = false;
129        closeMetadata(pdata);
129        opk_close(pdata);
130130    }
131131#endif /* HAVE_LIBOPK */
132132

Archive Download the corresponding diff file



interactive