head 1.10; access; symbols pkgsrc-2014Q2:1.9.0.34 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.9.0.32 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.30 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.9.0.28 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.26 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.24 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.22 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.20 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.18 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.16 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.14 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.9.0.12 pkgsrc-2011Q3-base:1.9 pkgsrc-2011Q2:1.9.0.10 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.8 pkgsrc-2011Q1-base:1.9 pkgsrc-2010Q4:1.9.0.6 pkgsrc-2010Q4-base:1.9 pkgsrc-2010Q3:1.9.0.4 pkgsrc-2010Q3-base:1.9 pkgsrc-2010Q2:1.9.0.2 pkgsrc-2010Q2-base:1.9 pkgsrc-2009Q4:1.8.0.20 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.18 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.16 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.14 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.12 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.10 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.8 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.6 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.4 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.2 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.7.0.4 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.2 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.6.0.2 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.5.0.4 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.2 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.4.0.2 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.0.14 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.12 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.10 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.8 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.6 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.4 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.2 netbsd-1-6-1-base:1.1; locks; strict; comment @# @; 1.10 date 2014.07.19.06.44.05; author ryoon; state dead; branches; next 1.9; commitid N00AardhsUw2gXIx; 1.9 date 2010.06.10.06.44.00; author adam; state Exp; branches; next 1.8; 1.8 date 2007.01.07.13.46.19; author adam; state dead; branches; next 1.7; 1.7 date 2006.09.24.16.56.16; author adam; state Exp; branches; next 1.6; 1.6 date 2006.05.29.06.41.38; author adam; state Exp; branches; next 1.5; 1.5 date 2005.10.17.09.25.43; author adam; state Exp; branches; next 1.4; 1.4 date 2005.08.16.12.56.57; author adam; state Exp; branches; next 1.3; 1.3 date 2005.07.22.21.35.27; author adam; state Exp; branches; next 1.2; 1.2 date 2005.03.30.13.49.28; author adam; state Exp; branches; next 1.1; 1.1 date 2002.12.25.13.18.25; author jmmv; state Exp; branches; next ; desc @@ 1.10 log @Update to 3.2.13 * Depend on x11/c++-gtk-utils, instead of x11/gtkmm Changelog: Version 3.2.13 (11th April 2014) -------------- Fix API breakage in GTK+-3.12 (the buttons of GtkDialog objects have been made internal instead of non-internal children of the action area box) (dialog.h, dialog.cpp). Put icon in efax and efax-gtk about dialogs (dialogs.cpp). Replace AC_CONFIG_HEADER macro with AC_CONFIG_HEADERS when configuring (Samuli Suominen) (configure.ac). Update build system to automake-1.13.3 (config.guess, config.sub, depcomp, INSTALL). Update desktop file (Samuli Suominen) (efax-gtk.desktop). Version 3.2.12 (1st June 2013) -------------- Force GType initialisation of GtkEntry for GtkSettings (mainwindow.cpp). Correct entry sizing in settings dialog (settings.cpp). Improve tray icon sizing (tray_icon.cpp). Permit the program to build against c++-gtk-utils-2.2 (this requires increasing the c++-gtk-utils-1.2 dependency to 1.2.13, and increasing the c++-gtk-utils-2.0 dependency to 2.0.1) (acinclude.m4, README; mainwindow.h, mainwindow.cpp). Cause bootstrap.sh to build translation files (bootstrap.sh). Update build system to automake-1.13.1 (configure.ac, config.guess, config.sub, depcomp, INSTALL, install-sh, missing; src/Makefile.am; efax/Makefile.am). Version 3.2.11 (1st January 2013) -------------- Workaround for a bug in GtkFileChooserDialog in later versions of gtk+-2.24 (dialogs.cpp). Change efax-gtk.desktop to meet http://specifications.freedesktop.org/menu-spec/menu-spec-latest.html recommendations (efax-gtk.desktop). Add French translation (Charlie Ledocq) (po/fr.po, LINGUAS). Version 3.2.10 (21st October 2012) -------------- Update build system to automake-1.12.1 and autoconf-2.69. Suppress gtk+-3 deprecation warnings (acinclude.m4). Set locale even if NLS not set (main.cpp). Deal better with GtkMessageDialog format string (dialog.cpp). Use automake silent rules (configure.ac). Correct icon entry in efax-gtk.desktop file (efax-gtk.desktop). Simplify file chooser selection code (dialogs.cpp). Call atexit() instead of glib's now deprecated g_atexit() (the use of atexit() in this program is entirely safe) (main.cpp). Remove unnecessary pointer value check in present_prog() (main.cpp). Add Spanish translation (Antonio Trujillo) (po/LINGUAS, po/es.po, po/efax-gtk.pot; mainwindow.cpp). Update copyright notices (COPYING, README; addressbook.h, addressbook.cpp, dialogs.h, dialogs.cpp, efax_controller.h, efax_controller.cpp, fax_list.h, fax_list.cpp, fax_list_manager.h, fax_list_manager.cpp, file_list.h, file_list.cp, gpl.h, helpfile.h, helpfile.cpp, logger.h, logger.cpp, main.cpp, mainwindow.h, mainwindow.cpp, prog_defs.h, redial_queue.h, redial_queue.cpp, settings.h, settings.cpp, settings_help.h, settings_help.cpp, socket_list.h, socket_list.cpp, socket_notify.h, socket_notify.cpp, socket_server.h, socket_server.cpp, tray_icon.h, tray_icon.cpp; utils/cairo_handle.h, utils/icon_info_handle.h, utils/mono_tiff_print_manager.h, utils/mono_tiff_print_manager.cpp, utils/pango_layout_iter_handle.h, utils/selected_rows_handle.h, utils/selected_rows_handle.cpp, utils/sem_sync.h, utils/tiff_handle.h, utils/toolbar_append_widget.h, utils/toolbar_append_widget.cpp, utils/tree_path_handle.h, utils/tree_row_reference_handle.h, utils/utf8_utils.h, utils/utf8_utils.cpp; efax-gtk-faxfilter/efax-gtk-socket-client.cpp. Update documentation (README). Update configuration scripts (acinclude.m4). Version 3.2.9 (21st December 2011) ------------- Have a hard dependency on c++-gtk-utils-1.2 >= 1.2.7 or c++-gtk-utils-2.0 >= 2.0.0-rc1, so that C++0x/11 can be more easily supported, and maintainability is improved (README, acinclude.m4, configure.ac, src/Makefile.am, src/utils/Makefile.am, po/POTFILES.in; delete src/internal directory and its contents.) Make the settings help dialogs of a reasonable size with GTK+3 (settings_help.cpp). Permit IPv6 addresses to be specified with a wildcard and only one, or no, ':' character (socket_server.cpp). Explicitly set shadow type of fax input frame (mainwindow.cpp). Change library linking order (src/Makefile.am and efax/Makefile.am). Remove unnecessary configure checks (acinclude.m4, configure.ac and src/Makefile.am) Upgrade gettext to version 0.18 and include m4 macros (po/Makefile.in.in, po/Rules-quot, m4 directory, Makefile.am). Add proper header checks at configuration time (configure.ac). Version 3.2.8 (30th March 2011) ------------- Permit IPv6 addresses in domain name form as well as in numeric format (socket_server.h and socket_server.cpp). Improve error checking and so suppress gcc-4.6 warning (mainwindow.cpp; utils/mono_tiff_print_manager.cpp). Upgrade internal c++-gtk-utils version. Version 3.2.7.1 (16th March 2011) --------------- Correct style change handling (mainwindow.h, mainwindow.cpp). Update comments in efax-gtkrc on "SOCK_OTHER_ADDRESSES:" for IPv6 (efax-gtkrc). Version 3.2.7 (14th March 2011) ------------- Change default gtk target to gtk+3, and permit --with-gtk-version=gtk2 and --with=gtk-version=gtk3 as well as --with-gtk-version=gtk+2 and --with=gtk-version=gtk+3 (acinclude.m4, README). Provide option for server to accept IPv6 connections (efax-gtkrc; prog_defs.h, main.cpp, mainwindow.cpp, settings.h, settings.cpp, settings_help.h, settings_help.cpp, socket_server.h and socket_server.cpp). Use GtkStyleContext for a GTK+3 compile (acinclude.m4; addressbook.cpp, dialogs.h, dialogs.cpp, fax_list.cpp, fax_list-manager.cpp, helpfile.cpp, logger.cpp, main.cpp, mainwindow.h and mainwindow.cpp). Correct non-sh-ism in configuration files (acinclude.m4). Include efax-gtk.png icon in rpm spec file (efax-gtk.spec.in). Minor adjustments to MonoTiffPrintManager implementation (utils/mono_tiff_print_manager.h and utils/mono_tiff_print_manager.cpp). Provide some explicit casts for std::pair constructor required by C++0x (dialogs.cpp, fax_list.cpp, file_list.cpp, socket_list.cpp). Provide compile option for c++-gtk-utils-2.0 (acinclude.m4, README; efax_controller.cpp, fax_list.cpp, gpl.h, logger.cpp, socket_server.h and socket_server.cpp). Surpress warning about std::auto_ptr being deprecated when compiling under C++0x (acinclude.m4). Upgrade internal c++-gtk-utils version to 1.2.12 (and also adjust the configuration files for that (acinclude.m4, configure.ac; src/internal/c++-gtk-utils/Makefile.am)). Version 3.2.6 (13th November 2010) ------------- Do not require dbus-glib where glib >= 2.26 is installed (acinclude.4, configure.ac, src/Makefile.am, src/internal/c++-gtk-utils/Makefile.am with upgraded c++-gtk-utils). Fixes for gtk+-2.91 (acinclude.m4, addressbook.cpp, dialogs.cpp, fax_list.cpp, fax_list_manager.cpp, helpfile.cpp, logger.cpp, main.cpp, mainwindow.h, mainwindow.cpp, settings.cpp and socket_notify.cpp). Improve widget sizing for widgets displaying text (efax_controller.h, mainwindow.h and mainwindow.cpp). Fix compilation error with gtk+-2.12 (mainwindow.cpp). Remove anachronistic comment (utils/mono_tiff_print_manager.cpp). Upgrade internal c++-gtk-utils version to 1.2.7. Version 3.2.5 (13th October 2010) ------------- Fix segfault when printing faxes with cairo-1.10 (utils/mono_tiff_print_manager.h and utils/mono_tiff_print_manager.cpp). Use cairo rather than the GDK drawing functions to draw the indicator of whether there are print jobs from the socket to be faxed (mainwindow.h, mainwindow.cpp and utils/cairo_handle.h). Use gtk_tree_view_convert_bin_window_to_widget_coords() instead of gtk_widget_get_pointer() in order to obtain the pointer position in widget co-ordinates for tree view motion notify events (fax_list_manager.cpp). Modify argument handling for efax message functions to avoid an invalid double call to vfprintf() on the same va_list value (this bug is triggered on some systems when using the 'fax' script but does not directly affect efax-gtk) (efax/efaxmsg.c, efax/PATCHES). Upgrade internal c++-gtk-utils version to 1.2.6. Version 3.2.4 (2nd August 2010) ------------- Fix uncaught exception where a file to be faxed is not in valid postscript/PDF format (efax_controller.cpp). Include the former gnome stock_send-fax icon as the standard icon for efax-gtk (Makefile.am, efax-gtk.desktop, efax-gtk.png, AUTHORS; main.cpp). Use XkbBell() rather than XBell() where available (acinclude.m4, main.cpp). Include pkg-config test for x11.pc, if available (acinclude.m4 and src/Makefile.am). Further build fixes for Debian Hurd (src/efax_controller.cpp and src/fax_list.cpp; efax/efaxmsg.c). Update Hungarian translation (László Csordás) (hu.po and mainwindow.cpp). Remove redundant anonymous namespace for callbacks with C linkage (addressbook.h, addressbook.cpp, dialogs.h, dialogs.cpp, fax_list.h, fax_list.cpp, fax_list_manager.h, fax_list_manager.cpp, file_list.h, file_list.cpp, helpfile.h, helpfile.cpp, logger.h, logger.cpp, mainwindow.h, mainwindow.cpp, redial_queue.h, redial_queue.cpp, settings.h, settings.cpp, settings_help.h, settings_help.cpp, socket_list.h, socket_list.cpp, socket_notify.h, socket_notify.cpp, tray_icon.h, tray_icon.cpp, utils/mono_tiff_print_manager.h, utils/mono_tiff_print_manager.cpp, utils/selected_rows_handle.h, utils/selected_rows_handle.cpp). Correct linkage specification of present_prog() (main.cpp). Use Cgu::start_timeout_seconds() rather than Cgu::start_timeout() where available (fax_list_manager.cpp, logger.cpp). Remove redundant comments (prog_defs.h, utils/toolbar_append_widget.cpp). Upgrade internal c++-gtk-utils version to 1.2.4. @ text @$NetBSD: patch-ad,v 1.9 2010/06/10 06:44:00 adam Exp $ --- configure.orig 2010-06-03 20:27:33.000000000 +0000 +++ configure @@@@ -4999,7 +4999,7 @@@@ $as_echo_n "checking which version of gt # Check whether --with-gtk-version was given. if test "${with_gtk_version+set}" = set; then : withval=$with_gtk_version; - if test "x$withval" == "xgtk+2"; then + if test "x$withval" = "xgtk+2"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk+2" >&5 $as_echo "gtk+2" >&6; } CGU_GTK_VERSION=2 @@@@ -5098,7 +5098,7 @@@@ $as_echo "no" >&6; } as_fn_error "Library requirements (gtk+-2.0 >= 2.12.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 fi - elif test "x$withval" == "xgtk+3"; then + elif test "x$withval" = "xgtk+3"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk+3" >&5 $as_echo "gtk+3" >&6; } CGU_GTK_VERSION=3 @@@@ -5197,7 +5197,7 @@@@ $as_echo "no" >&6; } as_fn_error "Library requirements (gtk+-3.0 >= 2.90.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 fi - elif test "x$withval" == "xauto"; then + elif test "x$withval" = "xauto"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto" >&5 $as_echo "auto" >&6; } @ 1.9 log @Changes 3.2.3: * Provide compilation option for GTK+3 as well as GTK+2 * Make program configuration check for _POSIX_CLOCK_SELECTION as well as _POSIX_MONOTONIC_CLOCK when checking the availability of monotonic clocks for condition variables (corrects BSD builds) * Ensure PIPE_BUF is defined in mainwindow.cpp (corrects Hurd build). * Upgrade internal c++-gtk-utils version to 1.2.3. Changes 3.2.2: * Update internal copy of c++-gtk-utils to version 1.2.2 and fix compilation error with gcc-4.5.0. * Provide an automatic redial option where the modem is in use or the recipient of a fax is busy. * Get GUI to deal with a corner case where sending a fax from the socket server to an empty number (open connection) is cancelled. * Provide an error dialog if, on program start-up, a connection to the dbus session message bus cannot be established. * Use Cgu::start_timeout_seconds() instead of Cgu::start_timeout() where glib supports it, and so bump c++-gtk-utils requirement to version 1.2.1. @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @Changes 3.0.12: Update Catalan translation (Jordi Sayol) and Hebrew translation Correct failure to clear the list of permitted client addresses for the socket interface after changing settings from the settings dialog. Hostname addresses permitted to connect to the socket server may now be specified in numeric dot notation. Numeric dot notation may also contain a trailing * as a wildcard. Make memory management of the PrintManager class easier/safer for the user. Revise method for passing of arguments to threads. Correct threading explanation for the program. Correct format of efax-gtk man page. Revise the 'mail_fax' script to refer to Heirloom mailx rather than nail. Update the copyright dates in the efax-gtk man file. PkgSrc: do not depend on comms/efax, fixing PR#33788 @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.7 2006/09/24 16:56:16 adam Exp $ d3 14 a16 3 --- src/main.cpp.orig 2006-08-13 15:31:06.000000000 +0200 +++ src/main.cpp @@@@ -522,7 +522,7 @@@@ std::string configure_prog(bool reread) d18 13 a30 4 // we have finished reading the configuration file // now enter parameters common to send and receive of faxes - prog_config.parms.push_back("efax-0.9a"); + prog_config.parms.push_back("efax"); a31 2 prog_config.parms.push_back("-vew"); // stderr -- errors and warnings @ 1.7 log @Changes 3.0.11: * Correct file descriptor leak when viewing a fax. * Implement printing of faxes in fax lists via the GTK+ print system where compiled against GTK+2.10 or higher. * Improve handling of user locales with streams. * Use AC_COMPILE_IFELSE/AC_LANG_PROGRAM autoconf macros instead of the AC_TRY_COMPILE macro when configuring the program. * Correct derivation of fdistream class for wide characters (not relevant to efax-gtk). * Mention the need to call g_thread_init() before Notifier::init() in the Notifier documentation. * Correct help information concerning sending faxes via socket and pop-up dialog. * Explicitly include header where relevant. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Changes 3.0.9: Swedish translation added (Daniel Nylander). Catalan translation added (Jordi Sayol Salomo). Use gtk_widget_queue_draw() to update the drawing area which indicates whether a fax is in the "faxes to send" queue via an expose event rather than doing it directly. Cater for serial port devices in sub-directories of /dev. Have Notifier objects detect whether the signalling thread is the same one as the thread in which the slot will execute and if so by-pass the Notifier pipe, and implement Notifier objects without using a map and object IDs. Correctly handle case of constructor of SharedPtr and SharedHandle objects throwing. Allow the program to compile without X. Document the use of G_IO_HUP with iowatches. Correct comments about the use of PipeFifo::connect_to_stdout() and PipeFifo::connect_to_stderr(). Improve text for translation about modem classes. Include and headers file where relevant. @ text @d3 1 a3 1 --- src/main.cpp.orig 2006-03-10 23:20:31.000000000 +0100 d5 1 a5 1 @@@@ -507,7 +507,7 @@@@ std::string configure_prog(bool reread) @ 1.5 log @Changes 3.0.6: Add simplified Chinese translation Provide internationalisation support for the efax program to which efax-gtk is a front end Make the fax top header line of a sent fax charset independent, and remove some incorrect codeset conversions Deal with two minor timing/race issues Make Notifier::make_id() a static method, since it only uses local or static objects Instead of omitting the call to setlocale() in efax/efix.c, after setting the locales to match their environment, reset LC_NUMERIC to the "C" locale Update Hungarian translation @ text @d3 1 a3 1 --- src/main.cpp.orig 2005-09-16 21:43:04.000000000 +0000 d5 1 a5 1 @@@@ -491,7 +491,7 @@@@ std::string configure_prog(bool reread) @ 1.4 log @Changes 3.0.4: Add a date column to the fax lists, which derives the time of the fax from the fax ID (the directory in which faxes are stored) Provide for the fax ID (the directory in which faxes are stored) for received faxes to be derived from the time that the fax is received rather than the time that efax-gtk is put into receive mode. This enables the fax lists to display the correct time of a received fax. Now that stored fax directories (fax name IDs) are not displayed in the fax lists, provide the part of the ID representing a year in 4 (or more) digit rather than 2 digit format (someone in 2099 might be pleased!). Put a UTF-8 validation function in namespace Utf8. Where relevant, handle PipeFifo and Notifier errors by exceptions - consequential on putting the source for these in the utils sub-directory. Change clean-up arrangements on start-up. Correct false calls to _exit() in FaxListDialog::view_fax_thread() Make the PipeFifo and SemSync classes explicitly non-copiable Provide further explicit casts to void* in sentinels for elipsis arguments for 64-bit systems. @ text @d3 1 a3 1 --- src/main.cpp.orig 2005-08-13 14:20:09.000000000 +0000 d5 1 a5 1 @@@@ -484,7 +484,7 @@@@ std::string configure_prog(bool reread) @ 1.3 log @Changes 3.0.3: Provide a settings option to omit the destination fax number from the fax page top header line Use a mutex to ensure that writes to the Notifier pipe are atomic between threads Some fixes for 64 bit systems: Fixes for (harmless) warnings issued by gcc-4.0 @ text @d3 1 a3 1 --- src/main.cpp.orig 2005-06-14 20:08:17.000000000 +0000 d5 1 a5 1 @@@@ -462,7 +462,7 @@@@ std::string configure_prog(bool reread) @ 1.2 log @Changes 2.2.15: Fix bug where the Trash folder is dragged in the fax lists (fax_list_manager.cpp). Greek translation added (the Hellenic Linux Users Group translation team). Italian translation updated (Luca De Rugeriis). Adjust image sizes for toolbar buttons in GTK+2.4 or higher (fax_list.cpp, file_list.cpp and socket_list.cpp). Provision to ensure synchronisation of memory where necessary in multi-processor systems (efax_controller.h and efax_controller.cpp). @ text @d3 1 a3 1 --- src/main.cpp.orig 2005-03-30 15:44:28.000000000 +0000 d5 1 a5 1 @@@@ -429,7 +429,7 @@@@ Glib::ustring configure_prog(bool reread @ 1.1 log @Make this package install its configuration file under the examples tree and use bsd.pkg.install.mk to copy it to PKG_SYSCONFDIR. Bump PKGREVISION to 2. @ text @d3 11 a13 25 --- helpfile.h.orig Sat Apr 6 13:07:24 2002 +++ helpfile.h @@@@ -135,10 +135,10 @@@@ const char helpfile_msg[] = "--------\n" "\n" "The program settings can be changed by manually editing the efax-gtk\n" -"configuration file comprising $HOME/.efax-gtkrc,\n" -"/usr/local/etc/efax-gtkrc or /etc/efax-gtkrc. The file is searched\n" +"configuration file comprising $HOME/.efax-gtkrc or\n" +RCDIR "/efax-gtkrc. The file is searched\n" "for in that order, so $HOME/.efax-gtkrc takes precedence over the\n" -"other two.\n" +"other one.\n" "\n" "The configuration file can also be set by using the Settings dialog\n" "launched from the `File/Settings' pull down menu item. The settings\n" @@@@ -147,7 +147,7 @@@@ const char helpfile_msg[] = "revert to the global settings, this can be done either by deleting the\n" "$HOME/.efax-gtkrc file, or by pressing the `Reset' button in the\n" "Settings dialog, which will reload the Settings dialog from\n" -"/etc/efax-gtkrc or /usr/local/etc/efax-gtkrc.\n" +RCDIR "/efax-gtkrc.\n" "\n" "Help can be obtained when filling out the Settings dialog by holding\n" "the mouse over the relevant help (?) button, which will bring up a\n" @