From da4b55e4e133333f2f690287ab2a5483373ad481 Mon Sep 17 00:00:00 2001 From: Patrick Gaskin Date: Tue, 11 Aug 2020 19:04:20 -0400 Subject: [PATCH] Made nickel_open:library:library identical to library2 (#79) (#81) (#82) Also removed library2 from docs. --- res/doc | 3 +-- src/action_cc.cc | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/res/doc b/res/doc index d1019c4..37c50e1 100644 --- a/res/doc +++ b/res/doc @@ -84,8 +84,7 @@ # nickel_open - one of: # discover:storefront - Kobo Store # discover:wishlist - Wishlist -# library:library - My Books (with last filter) -# library:library2 - My Books (with last tab and filter) +# library:library - My Books (with last tab and filter) # library:all - Books # library:authors - Authors # library:series - Series (4.20.14601+) diff --git a/src/action_cc.cc b/src/action_cc.cc index a3fa94a..8a03f99 100644 --- a/src/action_cc.cc +++ b/src/action_cc.cc @@ -74,7 +74,9 @@ NM_ACTION_(nickel_open) { sym_c = "_ZN15LibraryNavMixinC1Ev"; //libnickel 4.6 * _ZN15LibraryNavMixinC1Ev sym_d = "_ZN15LibraryNavMixinD1Ev"; //libnickel 4.6 * _ZN15LibraryNavMixinD1Ev - if (!strcmp(arg2, "library")) sym_f = "_ZN15LibraryNavMixin11showLibraryEv"; //libnickel 4.6 * _ZN15LibraryNavMixin11showLibraryEv + // TODO: remove library2 in v0.4.0 (see https://github.com/pgaskin/NickelMenu/issues/81) + + if (!strcmp(arg2, "library")) sym_f = "_ZN15LibraryNavMixin18showLastLibraryTabEv"; //libnickel 4.6 * _ZN15LibraryNavMixin18showLastLibraryTabEv else if (!strcmp(arg2, "library2")) sym_f = "_ZN15LibraryNavMixin18showLastLibraryTabEv"; //libnickel 4.6 * _ZN15LibraryNavMixin18showLastLibraryTabEv else if (!strcmp(arg2, "all")) sym_f = "_ZN15LibraryNavMixin23showAllItemsWithoutSyncEv"; //libnickel 4.6 * _ZN15LibraryNavMixin23showAllItemsWithoutSyncEv else if (!strcmp(arg2, "authors")) sym_f = "_ZN15LibraryNavMixin11showAuthorsEv"; //libnickel 4.6 * _ZN15LibraryNavMixin11showAuthorsEv