summaryrefslogtreecommitdiff
path: root/src/app.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/app.c')
-rw-r--r--src/app.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/app.c b/src/app.c
index 73771609..a9ec6a26 100644
--- a/src/app.c
+++ b/src/app.c
@@ -23,7 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
23#include "app.h" 23#include "app.h"
24#include "bookmarks.h" 24#include "bookmarks.h"
25#include "defs.h" 25#include "defs.h"
26#include "embedded.h" 26#include "resources.h"
27#include "feeds.h" 27#include "feeds.h"
28#include "mimehooks.h" 28#include "mimehooks.h"
29#include "gmcerts.h" 29#include "gmcerts.h"
@@ -711,19 +711,17 @@ static void init_App_(iApp *d, int argc, char **argv) {
711 } 711 }
712 SDL_free(exec); 712 SDL_free(exec);
713 } 713 }
714#if defined (iHaveLoadEmbed)
715 /* Load the resources from a file. Check the executable directory first, then a 714 /* Load the resources from a file. Check the executable directory first, then a
716 system-wide location, and as a final fallback, the current working directory. */ { 715 system-wide location, and as a final fallback, the current working directory. */ {
717 if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN2))) { 716 if (!init_Resources(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN2))) {
718 if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) { 717 if (!init_Resources(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) {
719 if (!load_Embed("resources.lgr")) { 718 if (!init_Resources("resources.lgr")) {
720 fprintf(stderr, "failed to load resources: %s\n", strerror(errno)); 719 fprintf(stderr, "failed to load resources: %s\n", strerror(errno));
721 exit(-1); 720 exit(-1);
722 } 721 }
723 } 722 }
724 } 723 }
725 } 724 }
726#endif
727 init_Lang(); 725 init_Lang();
728 /* Configure the valid command line options. */ { 726 /* Configure the valid command line options. */ {
729 defineValues_CommandLine(&d->args, "close-tab", 0); 727 defineValues_CommandLine(&d->args, "close-tab", 0);
@@ -742,7 +740,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
742 iStringList *openCmds = new_StringList(); 740 iStringList *openCmds = new_StringList();
743 /* Handle command line options. */ { 741 /* Handle command line options. */ {
744 if (contains_CommandLine(&d->args, "help")) { 742 if (contains_CommandLine(&d->args, "help")) {
745 puts(cstr_Block(&blobArghelp_Embedded)); 743 puts(cstr_Block(&blobArghelp_Resources));
746 terminate_App_(0); 744 terminate_App_(0);
747 } 745 }
748 if (contains_CommandLine(&d->args, "version;V")) { 746 if (contains_CommandLine(&d->args, "version;V")) {