Mercurial > hg > xemacs-beta

comparison src/font-mgr.c @ 4328:dfd878799ef0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Autoconfiscate the recent fontconfig spelling change. ChangeLog addition: 2007-12-12 Aidan Kehoe <kehoea@parhasard.net> * configure.ac : Check for FcConfigGetRescanInterval, FcConfigSetRescanInterval. * configure : Rebuild. src/ChangeLog additon: 2007-12-12 Aidan Kehoe <kehoea@parhasard.net> * config.h.in: Make the results of the checks for FcConfigGetRescanInterval, FcConfigSetRescanInterval available. * font-mgr.h: If FcConfigSetRescanInterval and FcConfigGetRescanInterval are not available as functions, #define them to map to their old misspelled names. * font-mgr.c (Ffc_config_get_rescan_interval): * font-mgr.c (Ffc_config_set_rescan_interval): Use the correct spelling in FcConfigGetRescanInterval, FcConfigSetRescanInterval
author Aidan Kehoe <kehoea@parhasard.net>
date Fri, 14 Dec 2007 14:25:04 +0100
parents f56fa2f5f055
children a23ac8f90a49
comparison
equal deleted inserted replaced
4327:466ad8ad5f13 4328:dfd878799ef0
896 CHECK_FCCONFIG (config); 896 CHECK_FCCONFIG (config);
897 signal_error (Qunimplemented, "no method to convert FcBlanks object", 897 signal_error (Qunimplemented, "no method to convert FcBlanks object",
898 intern ("fc-config-get-blanks")); 898 intern ("fc-config-get-blanks"));
899 } 899 }
900 900
901 /* The misspelling in the fontconfig function name accurately corresponds to
902 the version of fontconfig.h I had on 2007-04-13. -- sjt */
903 DEFUN("fc-config-get-rescan-interval", Ffc_config_get_rescan_interval, 1, 1, 0, /* 901 DEFUN("fc-config-get-rescan-interval", Ffc_config_get_rescan_interval, 1, 1, 0, /*
904 -- Function: int FcConfigGetRescanInverval (FcConfig *config) 902 -- Function: int FcConfigGetRescanInterval (FcConfig *config)
905 Returns the interval between automatic checks of the configuration 903 Returns the interval between automatic checks of the configuration
906 (in seconds) specified in 'config'. The configuration is checked 904 (in seconds) specified in 'config'. The configuration is checked
907 during a call to FcFontList when this interval has passed since 905 during a call to FcFontList when this interval has passed since
908 the last check. */ 906 the last check. */
909 (config)) 907 (config))
910 { 908 {
911 CHECK_FCCONFIG (config); 909 CHECK_FCCONFIG (config);
912 return make_int (FcConfigGetRescanInverval (XFCCONFIG_PTR (config))); 910 return make_int (FcConfigGetRescanInterval (XFCCONFIG_PTR (config)));
913 } 911 }
914 912
915 /* The misspelling in the fontconfig function name accurately corresponds to
916 the version of fontconfig.h I had on 2007-04-13. -- sjt */
917 DEFUN("fc-config-set-rescan-interval", Ffc_config_set_rescan_interval, 2, 2, 0, /* 913 DEFUN("fc-config-set-rescan-interval", Ffc_config_set_rescan_interval, 2, 2, 0, /*
918 -- Function: FcBool FcConfigSetRescanInverval (FcConfig *config, int 914 -- Function: FcBool FcConfigSetRescanInterval (FcConfig *config, int
919 rescanInterval) 915 rescanInterval)
920 Sets the rescan interval; returns FcFalse if an error occurred. 916 Sets the rescan interval; returns FcFalse if an error occurred.
921 XEmacs: signal such error, or return nil on success. */ 917 XEmacs: signal such error, or return nil on success. */
922 (config, rescan_interval)) 918 (config, rescan_interval))
923 { 919 {
924 CHECK_FCCONFIG (config); 920 CHECK_FCCONFIG (config);
925 CHECK_INT (rescan_interval); 921 CHECK_INT (rescan_interval);
926 if (FcConfigSetRescanInverval (XFCCONFIG_PTR (config), 922 if (FcConfigSetRescanInterval (XFCCONFIG_PTR (config),
927 XINT (rescan_interval)) == FcFalse) 923 XINT (rescan_interval)) == FcFalse)
928 signal_error (Qio_error, "FcConfigSetRescanInverval barfed", 924 signal_error (Qio_error, "FcConfigSetRescanInverval barfed",
929 intern ("fc-config-set-rescan-interval")); 925 intern ("fc-config-set-rescan-interval"));
930 return Qnil; 926 return Qnil;
931 } 927 }