diff -crN ./gnopernicus/braille/libbrl/Makefile.am /users5/cordenjn/sb/gnome_220/src/./gnopernicus/braille/libbrl/Makefile.am *** ./gnopernicus/braille/libbrl/Makefile.am Fri Jun 6 11:25:53 2003 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/braille/libbrl/Makefile.am Wed Sep 17 11:32:08 2003 *************** *** 7,17 **** -I$(top_srcdir)/srconf/libsrconf \ -DBRAILLE_TRANS_TABLES_DIR=\"$(sysconfdir)/gnopernicus-1.0/translation_tables/\" \ -DTTYNAME0=\"$(TTYNAME_0)\" -DTTYNAME1=\"$(TTYNAME_1)\" \ ! $(BRLTTY_ACTIVE) \ ! $(LIBBRL_CFLAGS) \ ! -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBBRL_LIBS) @LT_VERSION_INFO@ LDADD = ../../srconf/libsrconf/libsrconf.la \ ../../srutil/srutil.la \ --- 7,15 ---- -I$(top_srcdir)/srconf/libsrconf \ -DBRAILLE_TRANS_TABLES_DIR=\"$(sysconfdir)/gnopernicus-1.0/translation_tables/\" \ -DTTYNAME0=\"$(TTYNAME_0)\" -DTTYNAME1=\"$(TTYNAME_1)\" \ ! $(LIBBRL_CFLAGS) ! LDFLAGS = $(LIBBRL_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = ../../srconf/libsrconf/libsrconf.la \ ../../srutil/srutil.la \ *************** *** 20,46 **** libbrlincludedir =$(includedir)/gnopernicus-1.0/libbrl libbrldir=$(libdir)/gnopernicus-1.0 - if BUILD_BRLTTY_SUPPORT - libbrl_la_LIBADD = -lbrlapi - endif - libbrlinclude_HEADERS = brlxmlapi.h - if BUILD_BRLTTY_SUPPORT - libbrl_la_SOURCES = baumbrl.h \ - alvabrl.h \ - braille.h \ - brlxmlapi.h \ - brlxml.h \ - sercomm.h \ - sercomm.c \ - baumbrl.c \ - alvabrl.c \ - ttybrl.c \ - braille.c \ - brlxml.c \ - ttybrl.h - else libbrl_la_SOURCES = baumbrl.h \ alvabrl.h \ braille.h \ --- 18,25 ---- *************** *** 52,55 **** alvabrl.c \ braille.c \ brlxml.c ! endif \ No newline at end of file --- 31,34 ---- alvabrl.c \ braille.c \ brlxml.c ! diff -crN ./gnopernicus/gnopi/cmdmapui.c /users5/cordenjn/sb/gnome_220/src/./gnopernicus/gnopi/cmdmapui.c *** ./gnopernicus/gnopi/cmdmapui.c Mon Apr 14 15:38:28 2003 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/gnopi/cmdmapui.c Wed Sep 17 11:32:08 2003 *************** *** 558,564 **** numlock = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ck_numlock)); line = alt || shift || ctrl || numlock; ! (const gchar*) key = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (cb_key_list)->entry)); if (!key || strlen (key) == 0) --- 558,564 ---- numlock = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ck_numlock)); line = alt || shift || ctrl || numlock; ! key = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (cb_key_list)->entry)); if (!key || strlen (key) == 0) diff -crN ./gnopernicus/gnopi/spvoiceui.c /users5/cordenjn/sb/gnome_220/src/./gnopernicus/gnopi/spvoiceui.c *** ./gnopernicus/gnopi/spvoiceui.c Wed May 28 15:40:08 2003 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/gnopi/spvoiceui.c Wed Sep 17 11:32:08 2003 *************** *** 506,512 **** curr_setting = (SpeakerSettings*)sp_curr_speaker_settings->data; ! (const gchar*)cvalue = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (spui_speech_voice_add_modify.cb_engine_voice)->entry)); if (!strcmp (curr_setting->driver_voice, cvalue)) --- 506,512 ---- curr_setting = (SpeakerSettings*)sp_curr_speaker_settings->data; ! cvalue = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (spui_speech_voice_add_modify.cb_engine_voice)->entry)); if (!strcmp (curr_setting->driver_voice, cvalue)) diff -crN ./gnopernicus/kbd_mouse/libke/Makefile.am /users5/cordenjn/sb/gnome_220/src/./gnopernicus/kbd_mouse/libke/Makefile.am *** ./gnopernicus/kbd_mouse/libke/Makefile.am Fri Apr 11 14:11:42 2003 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/kbd_mouse/libke/Makefile.am Wed Sep 17 11:32:08 2003 *************** *** 7,13 **** $(LIBKE_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBKE_LIBS) @LT_VERSION_INFO@ LDADD = ../../srutil/srutil.la ../../srconf/libsrconf/libsrconf.la $(LIBKE_LIBS) $(X_LIBS) --- 7,13 ---- $(LIBKE_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBKE_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = ../../srutil/srutil.la ../../srconf/libsrconf/libsrconf.la $(LIBKE_LIBS) $(X_LIBS) diff -crN ./gnopernicus/magnifier/libmag/Makefile.am /users5/cordenjn/sb/gnome_220/src/./gnopernicus/magnifier/libmag/Makefile.am *** ./gnopernicus/magnifier/libmag/Makefile.am Fri Apr 11 14:11:45 2003 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/magnifier/libmag/Makefile.am Wed Sep 17 11:32:09 2003 *************** *** 6,12 **** $(LIBMAG_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS =$(LIBMAG_LIBS) @LT_VERSION_INFO@ LDADD = ../../srconf/libsrconf/libsrconf.la $(LIBMAG_LIBS) --- 6,12 ---- $(LIBMAG_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS =$(LIBMAG_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = ../../srconf/libsrconf/libsrconf.la $(LIBMAG_LIBS) diff -crN ./gnopernicus/magnifier/libmag/mag.c /users5/cordenjn/sb/gnome_220/src/./gnopernicus/magnifier/libmag/mag.c *** ./gnopernicus/magnifier/libmag/mag.c Wed Mar 12 12:57:26 2003 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/magnifier/libmag/mag.c Wed Sep 17 11:32:09 2003 *************** *** 647,653 **** mag_zoomer_set_ZP_border_color (MagZoomer *mag_zoomer, gchar *border_color) { ! mag_zoomer->zoomer_placement.border.color = (gint32)atoll (border_color); } /* __ MAG ZOOMERS CONTAINER ___________________________________________________*/ --- 647,653 ---- mag_zoomer_set_ZP_border_color (MagZoomer *mag_zoomer, gchar *border_color) { ! mag_zoomer->zoomer_placement.border.color = (gint32)strtoll (border_color, NULL, 10); } /* __ MAG ZOOMERS CONTAINER ___________________________________________________*/ *************** *** 708,714 **** { if (color) { ! crosswire_color = (guint32)atoll(color); if (cursor && crosswire) magnifier_set_crosswire_color (magnifier, --- 708,714 ---- { if (color) { ! crosswire_color = (guint32)strtoll(color, NULL, 10); if (cursor && crosswire) magnifier_set_crosswire_color (magnifier, *************** *** 783,789 **** { if (color) { ! cursor_color = (guint32)atoll(color); if (cursor) { --- 783,789 ---- { if (color) { ! cursor_color = (guint32)strtoll(color, NULL, 10); if (cursor) { diff -crN ./gnopernicus/po/Makefile.in.in /users5/cordenjn/sb/gnome_220/src/./gnopernicus/po/Makefile.in.in *** ./gnopernicus/po/Makefile.in.in Thu Jan 1 01:00:00 1970 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/po/Makefile.in.in Wed Sep 17 11:32:09 2003 *************** *** 0 **** --- 1,255 ---- + # Makefile for program source directory in GNU NLS utilities package. + # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper + # + # This file file be copied and used freely without restrictions. It can + # be used in projects which are not available under the GNU Public License + # but which still want to provide support for the GNU gettext functionality. + # Please note that the actual code is *not* freely available. + # + # - Modified by Owen Taylor to use GETTEXT_PACKAGE + # instead of PACKAGE and to look for po2tbl in ./ not in intl/ + # + # - Modified by jacob berkman to install + # Makefile.in.in and po2tbl.sed.in for use with glib-gettextize + + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ + + SHELL = /bin/sh + @SET_MAKE@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + top_builddir = .. + VPATH = @srcdir@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = @datadir@ + libdir = @libdir@ + localedir = $(libdir)/locale + gnulocaledir = $(datadir)/locale + gettextsrcdir = $(datadir)/glib-2.0/gettext/po + subdir = po + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ + + CC = @CC@ + GENCAT = @GENCAT@ + GMSGFMT = @GMSGFMT@ + MSGFMT = @MSGFMT@ + XGETTEXT = @XGETTEXT@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ + MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist + GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot + + DEFS = @DEFS@ + CFLAGS = @CFLAGS@ + CPPFLAGS = @CPPFLAGS@ + + INCLUDES = -I.. -I$(top_srcdir)/intl + + COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + + SOURCES = + POFILES = @POFILES@ + GMOFILES = @GMOFILES@ + DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ + $(POFILES) $(GMOFILES) $(SOURCES) + + POTFILES = \ + + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + INSTOBJEXT = @INSTOBJEXT@ + + .SUFFIXES: + .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat + + .c.o: + $(COMPILE) $< + + .po.pox: + $(MAKE) $(GETTEXT_PACKAGE).pot + $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox + + .po.mo: + $(MSGFMT) -o $@ $< + + .po.gmo: + file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) -o $$file $< + + .po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ + && rm -f $@ && $(GENCAT) $@ $*.msg + + + all: all-@USE_NLS@ + + all-yes: $(CATALOGS) + all-no: + + $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) + $(GENPOT) + + install: install-exec install-data + install-exec: + install-data: install-data-@USE_NLS@ + install-data-no: all + install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ + *.gmo) destdir=$(gnulocaledir);; \ + *) destdir=$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $$dir; \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ + fi; \ + if test -r $$cat; then \ + $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ + fi; \ + if test -r $$cat.m; then \ + $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ + else \ + if test -r $(srcdir)/$$cat.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$cat.m \ + $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ + else \ + true; \ + fi; \ + fi; \ + done + if test "$(PACKAGE)" = "glib"; then \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ + fi; \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi + + # Define this as empty until I found a useful application. + installcheck: + + uninstall: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + done + rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in + + check: all + + dvi info tags TAGS ID: + + mostlyclean: + rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp + rm -fr *.o + + clean: mostlyclean + + distclean: clean + rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m + + maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f $(GMOFILES) + + distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) + dist distdir: update-po $(DISTFILES) + dists="$(DISTFILES)"; \ + for file in $$dists; do \ + ln $(srcdir)/$$file $(distdir) 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir); \ + done + + update-po: Makefile + $(MAKE) $(GETTEXT_PACKAGE).pot + cd $(srcdir); \ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + cp $$lang.po $$lang.old.po; \ + echo "$$lang:"; \ + if $(MSGMERGE) $$lang; then \ + rm -f $$lang.old.po; \ + else \ + echo "msgmerge for $$cat failed!"; \ + rm -f $$lang.po; \ + mv $$lang.old.po $$lang.po; \ + fi; \ + done + + .po: Makefile + $(MAKE) $(PACKAGE).pot; + PATH=`pwd`/../src:$$PATH; \ + echo; printf "$*: "; \ + if $(MSGMERGE) $*; then \ + rm -f $*.old.po; \ + else \ + echo "msgmerge for * failed!"; \ + mv $*.old.po $*.po; \ + fi; \ + msgfmt --statistics $*.po; echo; + + + # POTFILES is created from POTFILES.in by stripping comments, empty lines + # and Intltool tags (enclosed in square brackets), and appending a full + # relative path to them + POTFILES: POTFILES.in + ( if test 'x$(srcdir)' != 'x.'; then \ + posrcprefix='$(top_srcdir)/'; \ + else \ + posrcprefix="../"; \ + fi; \ + rm -f $@-t $@ \ + && (sed -e '/^#/d' \ + -e "s/^\[.*\] +//" \ + -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ + | sed -e '$$s/\\$$//') > $@-t \ + && chmod a-w $@-t \ + && mv $@-t $@ ) + + Makefile: Makefile.in.in ../config.status POTFILES + cd .. \ + && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ + $(SHELL) ./config.status + + # Tell versions [3.59,3.63) of GNU make not to export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff -crN ./gnopernicus/speech/libsrs/Makefile.am /users5/cordenjn/sb/gnome_220/src/./gnopernicus/speech/libsrs/Makefile.am *** ./gnopernicus/speech/libsrs/Makefile.am Fri Apr 11 14:12:36 2003 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/speech/libsrs/Makefile.am Wed Sep 17 11:32:09 2003 *************** *** 6,12 **** $(LIBSRS_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRS_LIBS) @LT_VERSION_INFO@ LDADD = ../../srconf/libsrconf/libsrconf.la $(LIBSRS_LIBS) --- 6,12 ---- $(LIBSRS_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRS_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = ../../srconf/libsrconf/libsrconf.la $(LIBSRS_LIBS) diff -crN ./gnopernicus/srconf/libsrconf/Makefile.am /users5/cordenjn/sb/gnome_220/src/./gnopernicus/srconf/libsrconf/Makefile.am *** ./gnopernicus/srconf/libsrconf/Makefile.am Fri Apr 11 14:12:38 2003 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/srconf/libsrconf/Makefile.am Wed Sep 17 11:32:09 2003 *************** *** 8,14 **** $(LIBSRCONF_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRCONF_LIBS) @LT_VERSION_INFO@ LDADD = $(LIBSRCONF_LIBS) --- 8,14 ---- $(LIBSRCONF_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRCONF_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = $(LIBSRCONF_LIBS) diff -crN ./gnopernicus/srcore/srspc.h /users5/cordenjn/sb/gnome_220/src/./gnopernicus/srcore/srspc.h *** ./gnopernicus/srcore/srspc.h Fri Jun 6 13:21:12 2003 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/srcore/srspc.h Wed Sep 17 11:32:09 2003 *************** *** 92,98 **** SRC_SPEECH_PRIORITY_WARNING, SRC_SPEECH_PRIORITY_SYSTEM, SRC_SPEECH_PRIORITY_MESSAGE, ! SRC_SPEECH_PRIORITY_IDLE, }SRCSpeechPriority; gboolean src_speech_init (); --- 92,98 ---- SRC_SPEECH_PRIORITY_WARNING, SRC_SPEECH_PRIORITY_SYSTEM, SRC_SPEECH_PRIORITY_MESSAGE, ! SRC_SPEECH_PRIORITY_IDLE }SRCSpeechPriority; gboolean src_speech_init (); diff -crN ./gnopernicus/srlow/libsrlow/Makefile.am /users5/cordenjn/sb/gnome_220/src/./gnopernicus/srlow/libsrlow/Makefile.am *** ./gnopernicus/srlow/libsrlow/Makefile.am Fri Apr 11 14:12:42 2003 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/srlow/libsrlow/Makefile.am Wed Sep 17 11:32:09 2003 *************** *** 6,12 **** $(LIBSRLOW_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRLOW_LIBS) @LT_VERSION_INFO@ LDADD = $(LIBSRLOW_LIBS) --- 6,12 ---- $(LIBSRLOW_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRLOW_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = $(LIBSRLOW_LIBS) diff -crN ./gnopernicus/srutil/Makefile.am /users5/cordenjn/sb/gnome_220/src/./gnopernicus/srutil/Makefile.am *** ./gnopernicus/srutil/Makefile.am Fri Apr 11 14:12:44 2003 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/srutil/Makefile.am Wed Sep 17 11:32:09 2003 *************** *** 6,12 **** $(LIBSRUTIL_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRUTIL_LIBS) @LT_VERSION_INFO@ LDADD = $(LIBSRUTIL_LIBS) --- 6,12 ---- $(LIBSRUTIL_CFLAGS) \ -DG_LOG_DOMAIN=\"gnopernicus\" ! LDFLAGS = $(LIBSRUTIL_LIBS) @LDFLAGS@ @LT_VERSION_INFO@ LDADD = $(LIBSRUTIL_LIBS) diff -crN ./gnopernicus/srutil/SREvent.h /users5/cordenjn/sb/gnome_220/src/./gnopernicus/srutil/SREvent.h *** ./gnopernicus/srutil/SREvent.h Thu Nov 28 13:20:41 2002 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/srutil/SREvent.h Wed Sep 17 11:32:09 2003 *************** *** 57,63 **** SR_EVENT_COMMAND_LAYER, SR_EVENT_HOTKEY, SR_EVENT_KEY, ! SR_EVENT_CONFIG_CHANGED, }SREventType; --- 57,63 ---- SR_EVENT_COMMAND_LAYER, SR_EVENT_HOTKEY, SR_EVENT_KEY, ! SR_EVENT_CONFIG_CHANGED }SREventType; diff -crN ./gnopernicus/srutil/SRMessages.h /users5/cordenjn/sb/gnome_220/src/./gnopernicus/srutil/SRMessages.h *** ./gnopernicus/srutil/SRMessages.h Thu Apr 17 12:37:31 2003 --- /users5/cordenjn/sb/gnome_220/src/./gnopernicus/srutil/SRMessages.h Wed Sep 17 11:32:09 2003 *************** *** 56,61 **** --- 56,62 ---- #define sru_check_log_stack_flag(flag) sru_check_flag (sru_log_stack_flags, flag) #define sru_prgname g_get_prgname() + #ifdef G_HAVE_ISO_VARARGS #define sru_assert(X) \ { \ if(sru_check_log_stack_flag(G_LOG_LEVEL_ERROR) && !(X)) \ *************** *** 92,98 **** if (!(cond)) \ return val; \ } - #ifdef G_HAVE_ISO_VARARGS #define sru_error(...) \ { \ if(sru_check_log_stack_flag(G_LOG_LEVEL_ERROR)) \ --- 93,98 ----