diff options
Diffstat (limited to 'src/mac.c')
| -rw-r--r-- | src/mac.c | 7 |
1 files changed, 6 insertions, 1 deletions
| @@ -1835,6 +1835,8 @@ xrm_get_preference_database (application) | |||
| 1835 | if (app_id == NULL) | 1835 | if (app_id == NULL) |
| 1836 | goto out; | 1836 | goto out; |
| 1837 | } | 1837 | } |
| 1838 | if (!CFPreferencesAppSynchronize (app_id)) | ||
| 1839 | goto out; | ||
| 1838 | 1840 | ||
| 1839 | key_set = CFSetCreateMutable (NULL, 0, &kCFCopyStringSetCallBacks); | 1841 | key_set = CFSetCreateMutable (NULL, 0, &kCFCopyStringSetCallBacks); |
| 1840 | if (key_set == NULL) | 1842 | if (key_set == NULL) |
| @@ -4650,6 +4652,9 @@ otherwise. */) | |||
| 4650 | if (app_id == NULL) | 4652 | if (app_id == NULL) |
| 4651 | goto out; | 4653 | goto out; |
| 4652 | } | 4654 | } |
| 4655 | if (!CFPreferencesAppSynchronize (app_id)) | ||
| 4656 | goto out; | ||
| 4657 | |||
| 4653 | key_str = cfstring_create_with_string (XCAR (key)); | 4658 | key_str = cfstring_create_with_string (XCAR (key)); |
| 4654 | if (key_str == NULL) | 4659 | if (key_str == NULL) |
| 4655 | goto out; | 4660 | goto out; |
| @@ -4986,7 +4991,7 @@ extern int noninteractive; | |||
| 4986 | 3. [If SELECT_USE_CFSOCKET is set] | 4991 | 3. [If SELECT_USE_CFSOCKET is set] |
| 4987 | Only the window event channel and socket read/write channels are | 4992 | Only the window event channel and socket read/write channels are |
| 4988 | involved, and timeout is not too short (greater than | 4993 | involved, and timeout is not too short (greater than |
| 4989 | SELECT_TIMEOUT_THRESHHOLD_RUNLOOP seconds). | 4994 | SELECT_TIMEOUT_THRESHOLD_RUNLOOP seconds). |
| 4990 | -> Create CFSocket for each socket and add it into the current | 4995 | -> Create CFSocket for each socket and add it into the current |
| 4991 | event RunLoop so that the current event loop gets quit when | 4996 | event RunLoop so that the current event loop gets quit when |
| 4992 | the socket becomes ready. Then ReceiveNextEvent can wait for | 4997 | the socket becomes ready. Then ReceiveNextEvent can wait for |