Date:2013-09-19 17:26:32 (7 months 4 days ago)
Author:Paul Cercueil
Commit:6947997d4438d2872bee84c7c94e73f439f73c5a
Message:Fix build for platforms without libopk

Files: src/gmenu2x.cpp (2 diffs)
src/gmenu2x.h (1 diff)
src/inputmanager.cpp (2 diffs)
src/menu.cpp (1 diff)

Change Details

src/gmenu2x.cpp
231231    layers.insert(layers.begin(), make_shared<Background>(*this));
232232    initMenu();
233233
234#ifdef ENABLE_INOTIFY
234235    monitor = new MediaMonitor(CARD_ROOT);
236#endif
235237
236238    if (!fileExists(confStr["wallpaper"])) {
237239        DEBUG("No wallpaper defined; we will take the default one.\n");
...... 
267269    quit();
268270
269271    delete font;
272#ifdef ENABLE_INOTIFY
270273    delete monitor;
274#endif
271275}
272276
273277void GMenu2X::quit() {
src/gmenu2x.h
7171private:
7272    Touchscreen ts;
7373    std::shared_ptr<Menu> menu;
74#ifdef ENABLE_INOTIFY
7475    MediaMonitor *monitor;
76#endif
7577
7678    LinkApp *appToLaunch;
7779    std::string fileToLaunch;
src/inputmanager.cpp
185185#endif
186186        case SDL_USEREVENT:
187187            switch ((enum EventCode) event.user.code) {
188#ifdef HAVE_LIBOPK
188189                case REMOVE_LINKS:
189190                    menu->removePackageLink((const char *) event.user.data1);
190191                    break;
...... 
196197                                ((string) (const char *) event.user.data1
197198                                 + "/apps").c_str());
198199                    break;
200#endif /* HAVE_LIBOPK */
199201                case REPAINT_MENU:
200202                default:
201203                    break;
src/menu.cpp
107107Menu::~Menu() {
108108    freeLinks();
109109
110    for (vector<Monitor *>::iterator it = monitors.begin();
111                it < monitors.end(); it++)
112        delete *it;
110#ifdef ENABLE_INOTIFY
111    for (auto it : monitors)
112        delete it;
113#endif
113114}
114115
115116void Menu::readSections(std::string parentDir)

Archive Download the corresponding diff file



interactive