isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow compilation when gconf mode is disabled. Closes #515019.

Browse Source 
2008-02-17  Jim Huang  <jserv.tw@gmail.com>

        * src/core/prefs.c (update_binding): Allow compilation
	when gconf mode is disabled. Closes #515019.


svn path=/trunk/; revision=3573
This commit is contained in:
Jim Huang 2008-02-17 22:43:28 +00:00 committed by Thomas James Alexander Thurman
parent 932fd0dcff
commit c35fd86b3b
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-02-17 Jim Huang <jserv.tw@gmail.com>
* src/core/prefs.c (update_binding): Allow compilation
when gconf mode is disabled. Closes #515019.
2008-02-14 Jim Huang <jserv.tw@gmail.com> 2008-02-14 Jim Huang <jserv.tw@gmail.com>
* src/core/display.c, src/core/util.c: fixups to allow * src/core/display.c, src/core/util.c: fixups to allow

2
src/core/prefs.c
View File

@ -2290,6 +2290,7 @@ update_binding (MetaKeyPref *binding,
combo = binding->bindings->data; combo = binding->bindings->data;
#ifdef HAVE_GCONF
/* Bug 329676: Bindings which can be shifted must not have no modifiers, /* Bug 329676: Bindings which can be shifted must not have no modifiers,
* nor only SHIFT as a modifier. * nor only SHIFT as a modifier.
*/ */
@ -2349,6 +2350,7 @@ update_binding (MetaKeyPref *binding,
*/ */
return TRUE; return TRUE;
} }
#endif
changed = FALSE; changed = FALSE;
if (keysym != combo->keysym || if (keysym != combo->keysym ||