diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-02 11:36:17 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-02 11:37:35 -0500 |
| commit | 0dc7eca4cdfff6425e19a0bace0f9ae8834d04e8 (patch) | |
| tree | 0fe4df591efed9b1d50607ac1ec1d45565714403 /openbox/screen.c | |
| parent | 76fcb473fa801728badf916cfebe349822759056 (diff) | |
| parent | 746859c1017e9cdf73eb91470e795f0c4b98b21a (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/event.c
openbox/mouse.c
openbox/openbox.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
parser/parse.c
parser/parse.h
Diffstat (limited to 'openbox/screen.c')
| -rw-r--r-- | openbox/screen.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/openbox/screen.c b/openbox/screen.c index de3203e3..fcd0de8c 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -290,6 +290,7 @@ gboolean screen_annex(void) supported[i++] = OBT_PROP_ATOM(OB_WM_STATE_UNDECORATED); supported[i++] = OBT_PROP_ATOM(OPENBOX_PID); supported[i++] = OBT_PROP_ATOM(OB_THEME); + supported[i++] = OBT_PROP_ATOM(OB_CONFIG_FILE); supported[i++] = OBT_PROP_ATOM(OB_CONTROL); g_assert(i == num_support); |