[geany/geany-osx] 38c2b3: Minor launcher improvements - Commits

22 Oct 2019


      Branch:      refs/heads/master
Author:      Jiří Techet techet@gmail.com
Committer:   Jiří Techet techet@gmail.com
Date:        Tue, 22 Oct 2019 15:48:17 UTC
Commit:      38c2b3f4b0eeed7a14e5331608f5bf136e333884
             https://github.com/geany/geany-osx/commit/38c2b3f4b0eeed7a14e5331608f5bf136e...
Log Message:
-----------
Minor launcher improvements
Modified Paths:
--------------
    LauncherGtk3/geany/geany/main.m
Modified: LauncherGtk3/geany/geany/main.m
10 lines changed, 5 insertions(+), 5 deletions(-)
===================================================================
@@ -4,9 +4,9 @@
  */
#import <Foundation/Foundation.h>
-#include <dlfcn.h>
-#define MAX_ARR_SIZE 100
+#include <dlfcn.h>
+#include <limits.h>
static NSString *get_locale(NSString *bundle_data) {
     NSString *fallback = @"en_US.UTF-8";
@@ -55,7 +55,7 @@ static int fill_argv_array(const char *arr[], NSArray<NSString *> *array) {
     for (NSString *value in array) {
         arr[i] = [value UTF8String];
         i++;
-        if (i == MAX_ARR_SIZE - 1) {
+        if (i == ARG_MAX - 1) {
             break;
         }
     }
@@ -95,7 +95,7 @@ static int run_geany() {
         @"LC_ALL": lang,
//Geany variables
-        @"GEANY_PLUGINS_SHARE_PATH": [bundle_res stringByAppendingPathComponent: @"share/geany-plugins"],
+        @"GEANY_PLUGINS_SHARE_PATH": [bundle_data stringByAppendingPathComponent: @"geany-plugins"],
         @"ENCHANT_MODULE_PATH": [bundle_lib stringByAppendingPathComponent: @"enchant"],
         @"GIO_MODULE_DIR": [bundle_lib stringByAppendingPathComponent: @"gio/modules"],
     };
@@ -119,7 +119,7 @@ static int run_geany() {
export_env_array(env);
-    const char *argv[MAX_ARR_SIZE];
+    const char *argv[ARG_MAX];
     int argc = fill_argv_array(argv, args);
/*
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    