diff options
| author | Jan Djärv <[email protected]> | 2011-07-01 11:18:46 +0200 |
|---|---|---|
| committer | Jan Djärv <[email protected]> | 2011-07-01 11:18:46 +0200 |
| commit | 0949d2b6ba1027bce991b2f3f7a4ce92b7adf620 (patch) | |
| tree | 8b84e14d700f5d399ae49f69f7b2fe57dcd808de /src/xgselect.c | |
| parent | 36b148cf16f468ffb7731c0f1e0c49ceb8a7deb0 (diff) | |
* process.c: Add defined (HAVE_GSETTINGS) for xgselect.h
(wait_reading_process_output): Add defined (HAVE_GSETTINGS) for
xg_select.
* xgselect.c: Add defined (HAVE_GSETTINGS).
(xgselect_initialize): Ditto.
* xsettings.c (store_monospaced_changed): Take new font as arg and
check for change against current_mono_font.
(EMACS_TYPE_SETTINGS): Remove this and related defines.
(emacs_settings_constructor, emacs_settings_get_property)
(emacs_settings_set_property, emacs_settings_class_init)
(emacs_settings_init, gsettings_obj): Remove.
(something_changedCB): New function for HAVE_GSETTINGS.
(something_changedCB): HAVE_GCONF: Call store_monospaced_changed
with value as argument.
(init_gsettings): Check that GSETTINGS_SCHEMA exists before calling
g_settings_new. Do not create gsettings_obj.
Remove calls to g_settings_bind. Connect something_changedCB to
"changed".
Fixes: debbugs:8967
Diffstat (limited to 'src/xgselect.c')
| -rw-r--r-- | src/xgselect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xgselect.c b/src/xgselect.c index 0d154f6496..9ccdd37489 100644 --- a/src/xgselect.c +++ b/src/xgselect.c @@ -15,14 +15,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ +along with GNU Emacs. If not, see <http§://www.gnu.org/licenses/>. */ #include <config.h> #include <setjmp.h> #include "xgselect.h" -#if defined (USE_GTK) || defined (HAVE_GCONF) +#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS) #include <glib.h> #include <errno.h> @@ -149,13 +149,13 @@ xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, return retval; } -#endif /* defined (USE_GTK) || defined (HAVE_GCONF) */ +#endif /* USE_GTK || HAVE_GCONF || HAVE_GSETTINGS */ void xgselect_initialize (void) { -#if defined (USE_GTK) || defined (HAVE_GCONF) +#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS) gfds_size = 128; gfds = xmalloc (sizeof (*gfds)*gfds_size); -#endif /* defined (USE_GTK) || defined (HAVE_GCONF) */ +#endif } |