diff options
| author | Adrian Robert | 2009-09-27 15:49:26 +0000 |
|---|---|---|
| committer | Adrian Robert | 2009-09-27 15:49:26 +0000 |
| commit | 56d513e611d280845c311292ea9b2ca3c239aa0c (patch) | |
| tree | 1ebf8d24752471fa587f079a11cf99174d982e62 | |
| parent | 3988c7d603276b0f49d905c39e8afa9624db3163 (diff) | |
| download | emacs-56d513e611d280845c311292ea9b2ca3c239aa0c.tar.gz emacs-56d513e611d280845c311292ea9b2ca3c239aa0c.zip | |
(ns_set_name_iconic, ns_set_name, ns_set_name_as_filename, x-create-frame, ns-get-resource, ns-set-resource): Use ns_app_name instead of NSProcessInfo call.
| -rw-r--r-- | src/nsfns.m | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index d6e1672b587..4df3f9c9686 100644 --- a/src/nsfns.m +++ b/src/nsfns.m | |||
| @@ -501,8 +501,7 @@ ns_set_name_iconic (struct frame *f, Lisp_Object name, int explicit) | |||
| 501 | name = f->icon_name; | 501 | name = f->icon_name; |
| 502 | 502 | ||
| 503 | if (NILP (name)) | 503 | if (NILP (name)) |
| 504 | name = build_string | 504 | name = build_string([ns_app_name UTF8String]); |
| 505 | ([[[NSProcessInfo processInfo] processName] UTF8String]); | ||
| 506 | else | 505 | else |
| 507 | CHECK_STRING (name); | 506 | CHECK_STRING (name); |
| 508 | 507 | ||
| @@ -542,8 +541,7 @@ ns_set_name (struct frame *f, Lisp_Object name, int explicit) | |||
| 542 | return; | 541 | return; |
| 543 | 542 | ||
| 544 | if (NILP (name)) | 543 | if (NILP (name)) |
| 545 | name = build_string | 544 | name = build_string([ns_app_name UTF8String]); |
| 546 | ([[[NSProcessInfo processInfo] processName] UTF8String]); | ||
| 547 | 545 | ||
| 548 | f->name = name; | 546 | f->name = name; |
| 549 | 547 | ||
| @@ -635,8 +633,7 @@ ns_set_name_as_filename (struct frame *f) | |||
| 635 | name = f->icon_name; | 633 | name = f->icon_name; |
| 636 | 634 | ||
| 637 | if (NILP (name)) | 635 | if (NILP (name)) |
| 638 | name = build_string | 636 | name = build_string([ns_app_name UTF8String]); |
| 639 | ([[[NSProcessInfo processInfo] processName] UTF8String]); | ||
| 640 | else | 637 | else |
| 641 | CHECK_STRING (name); | 638 | CHECK_STRING (name); |
| 642 | 639 | ||
| @@ -1130,8 +1127,7 @@ be shared by the new frame. */) | |||
| 1130 | be set. */ | 1127 | be set. */ |
| 1131 | if (EQ (name, Qunbound) || NILP (name) || (XTYPE (name) != Lisp_String)) | 1128 | if (EQ (name, Qunbound) || NILP (name) || (XTYPE (name) != Lisp_String)) |
| 1132 | { | 1129 | { |
| 1133 | f->name | 1130 | f->name = build_string ([ns_app_name UTF8String]); |
| 1134 | = build_string ([[[NSProcessInfo processInfo] processName] UTF8String]); | ||
| 1135 | f->explicit_name =0; | 1131 | f->explicit_name =0; |
| 1136 | } | 1132 | } |
| 1137 | else | 1133 | else |
| @@ -1499,9 +1495,7 @@ If OWNER is nil, Emacs is assumed. */) | |||
| 1499 | 1495 | ||
| 1500 | check_ns (); | 1496 | check_ns (); |
| 1501 | if (NILP (owner)) | 1497 | if (NILP (owner)) |
| 1502 | owner = build_string | 1498 | owner = build_string([ns_app_name UTF8String]); |
| 1503 | ([[[NSProcessInfo processInfo] processName] UTF8String]); | ||
| 1504 | /* CHECK_STRING (owner); this should be just "Emacs" */ | ||
| 1505 | CHECK_STRING (name); | 1499 | CHECK_STRING (name); |
| 1506 | /*fprintf (stderr, "ns-get-resource checking resource '%s'\n", SDATA (name)); */ | 1500 | /*fprintf (stderr, "ns-get-resource checking resource '%s'\n", SDATA (name)); */ |
| 1507 | 1501 | ||
| @@ -1524,9 +1518,7 @@ If VALUE is nil, the default is removed. */) | |||
| 1524 | { | 1518 | { |
| 1525 | check_ns (); | 1519 | check_ns (); |
| 1526 | if (NILP (owner)) | 1520 | if (NILP (owner)) |
| 1527 | owner | 1521 | owner = build_string ([ns_app_name UTF8String]); |
| 1528 | = build_string ([[[NSProcessInfo processInfo] processName] UTF8String]); | ||
| 1529 | CHECK_STRING (owner); | ||
| 1530 | CHECK_STRING (name); | 1522 | CHECK_STRING (name); |
| 1531 | if (NILP (value)) | 1523 | if (NILP (value)) |
| 1532 | { | 1524 | { |