mirror of
https://github.com/gryf/wmaker.git
synced 2026-01-14 02:24:18 +01:00
- improved behaviour for the shared appicon thing.
- added a 'Bool recursive' flag to WMMergePLDictionaries() in WINGs
This commit is contained in:
@@ -597,7 +597,7 @@ main(int argc, char **argv)
|
||||
path = globalDefaultsPathForDomain("WindowMaker");
|
||||
val = WMReadPropListFromFile(path);
|
||||
if (val) {
|
||||
WMMergePLDictionaries(val, prop);
|
||||
WMMergePLDictionaries(val, prop, True);
|
||||
WMReleasePropList(prop);
|
||||
prop = val;
|
||||
}
|
||||
|
||||
@@ -138,7 +138,7 @@ main(int argc, char **argv)
|
||||
window_attrs = WMGetFromPLDictionary(all_windows, window_name);
|
||||
if (window_attrs) {
|
||||
if (WMIsPLDictionary(window_attrs)) {
|
||||
WMMergePLDictionaries(window_attrs, icon_value);
|
||||
WMMergePLDictionaries(window_attrs, icon_value, True);
|
||||
}
|
||||
} else {
|
||||
WMPutInPLDictionary(all_windows, window_name, icon_value);
|
||||
|
||||
@@ -549,7 +549,7 @@ main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
WMMergePLDictionaries(prop, style);
|
||||
WMMergePLDictionaries(prop, style, True);
|
||||
|
||||
WMWritePropListToFile(prop, path, True);
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user