Commit e968ebac authored by Callum McKenzie's avatar Callum McKenzie

The big merge of the preview-2-13 branch. This includes the new scores code,...

The big merge of the preview-2-13 branch. This includes the new scores code, theme updates and a lots of other stuff.
parent de3cb94c
2005-08-22 Callum McKenzie <callum@spooky-possum.org>
2005-09-08 Callum McKenzie <callum@spooky-possum.org>
* NEWS:
* configure.in: 2.11.5
* configure.in: Bump the version number to 2.13.0 to avoid
confusion.
2005-09-07 Callum McKenzie <callum@spooky-possum.org>
* configure.in: Move HOWL stuff out of CFLAGS so that nothing bad
happens when CFLAGS is over-ridden. Also change the guile check to
look for libguile.h: it is the only reliable test for the
development packages since guile-config and its output do not
depend on the development packages.
2005-08-22 Callum McKenzie <callum@spooky-possum.org>
* configure.in: Don't use gmodule-export, use plain gmodule since
not everyone has it.
2005-08-16 Callum McKenzie <callum@physics.otago.ac.nz>
* README:
* configure.in: Patch from Hans Petter Jansson to allow Bonjour to
be used for zeroconf networking instead of Howl. Documentation and
alteration to not stop on a conflict by yours truly.
2005-08-11 Callum McKenzie <callum@physics.otago.ac.nz>
* configure.in (GLADE_LIBS): Make sure we get --export-dynamic so
......@@ -16,6 +33,17 @@
* configure.in:
* NEWS: 2.11.4.
2005-08-06 Callum McKenzie <callum@physics.otago.ac.nz>
* README: Remove mention of the FreeBSD Licensed Nibbles artwork
since we have replaced it.
2005-07-31 Callum McKenzie <callum@physics.otago.ac.nz>
* configure.in: Add a special case for OSF/1 and add
-D_POSIX_PII_SOCKET to the flags so the correct definition of
socklen_t is dragged in.
2005-07-31 Callum McKenzie <callum@physics.otago.ac.nz>
* configure.in: Add a special case for OSF/1 and add
......
......@@ -149,12 +149,6 @@ http://www.gnu.org/copyleft/gpl.html
or write to the Free Software Foundation, Inc., 59 Temple Place, Suite
330, Boston, MA 02111-1307 USA
Note that some artwork is distributed under the FreeBSD
license. Specifically some of the files in the directory gnibbles/pix
are under this license. If you conform to the GPL you will satisfy
this license, but the FreeBSD license gives you other options for using
this work.
Mailing List
------------
......@@ -265,6 +259,28 @@ For a discussion of the details behind these options and why you might
want to change them see the "Security" section. In general you will
not need to change any of them.
If you want Zeroconf support you have two options. On most Unix and
Linux systems Howl is the library of choice and is automatically
detected. You may also use Apple's Bonjour library, but you have to
enable it explicitly.
The configure options for zeroconf support are:
--disable-howl Disable Howl support
--enable-bonjour Enable Bonjour support
--with-bonjour-includes=PREFIX Specify where to find the Bonjour
header files
--with-bonjour-libs=PREFIX Specify where to find the Bonjour
libraries
Setting the library and include file directories explicitly should not
normally be necessary. Note that if you select Bonjour support on a
system with Howl installed and do not explicitly disable Howl then
Howl support will be disabled and a warning printed.
Use './configure --help' for a complete list of currently supported
options and environment variables.
If you are compiling gnome-games from CVS you should look at:
http://www.gnome.org/projects/gnome-games/contributing.html
......
......@@ -32,6 +32,26 @@
* rules/freecell.scm: Patch from Dagfinn I. Mannsåker to make
dragging to the freecells work again.
2005-08-10 Callum McKenzie <callum@physics.otago.ac.nz>
* rules/*.scm: Be consistent about capitalising words like tableau
and foundation in the hints (all lower case).
2005-08-09 Callum McKenzie <callum@physics.otago.ac.nz>
* dialog.c (show_select_game_dialog): Remove an unused (but
translated) string.
2005-07-31 Callum McKenzie <callum@physics.otago.ac.nz>
* rules/klondike.scm (new-game): Add a little extra space at the
bottom of the screen. This stops the fixed drawing code
compressing the last column.
* draw.c: Better card layout code. If the card spacing is more
than half a card bring them together and place the excess on the
outside edges. Also fix a bug with the in-slot spacing.
2005-07-28 Callum McKenzie <callum@physics.otago.ac.nz>
* sol.c: Fix the race condition reported in bug #121762 by making
......
......@@ -191,7 +191,7 @@ void show_select_game_dialog (void)
g_object_unref (G_OBJECT (list));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Rules"),
column = gtk_tree_view_column_new_with_attributes(NULL,
renderer,
"text", 0,
NULL);
......
......@@ -50,6 +50,9 @@ int card_height;
/* The offset of the cards within the slot. */
int xoffset, yoffset;
/* The offset within the window. */
int xbaseofs;
static void calculate_card_location (hslot_type hslot)
{
int xofs, yofs;
......@@ -63,7 +66,7 @@ static void calculate_card_location (hslot_type hslot)
if (hslot->dy > 0.0)
yofs = xofs;
hslot->pixelx = xslotstep*hslot->x + xofs;
hslot->pixelx = xslotstep*hslot->x + xofs + xbaseofs;
hslot->pixely = yslotstep*hslot->y + yofs;
hslot->pixeldx = hslot->dx*card_width;
hslot->pixeldy = hslot->compressed_dy*card_height;
......@@ -99,8 +102,17 @@ void set_geometry (double new_width, double new_height) {
card_width = CARD_HW_RATIO*theight;
card_height = theight;
}
xoffset = (xslotstep - twidth)/2;
yoffset = (yslotstep - theight)/2;
xbaseofs = 0;
/* If the cards are too far apart, bunch them in the middle. */
if (xslotstep > (card_width*3)/2) {
xslotstep = (card_width*3)/2;
xbaseofs = (window_width - xslotstep*width)/2;
}
xoffset = (xslotstep - card_width)/2;
yoffset = (yslotstep - card_height)/2;
set_card_size (card_width, card_height);
......
......@@ -25,8 +25,8 @@
typedef struct {
gint xoffset;
gint yoffset;
gint height;
gint width;
gint height;
GdkPixmap *moving_pixmap;
GdkBitmap *moving_mask;
GList* cards;
......
......@@ -159,7 +159,7 @@
(eq? f-slots '()))
(check-to-foundations? (cdr slots) foundation))
((= (get-value (get-top-card (car slots))) ace)
(list 2 (get-name (get-top-card (car slots))) (_"an empty Foundation")))
(list 2 (get-name (get-top-card (car slots))) (_"an empty foundation")))
((and (not (empty-slot? (car f-slots)))
(= (get-suit (get-top-card (car slots)))
(get-suit (get-top-card (car f-slots))))
......@@ -213,7 +213,7 @@
(check-for-king (get-cards (car slots)) free-reserves (car slots)))
(list 2
(check-for-king (get-cards (car slots)) free-reserves (car slots))
(_"an empty Tableau")))
(_"an empty tableau")))
((and (not (empty-slot? (car t-slots)))
(= (get-suit (get-top-card (car slots)))
(get-suit (get-top-card (car t-slots))))
......
......@@ -186,7 +186,7 @@
(= (get-value (get-top-card slot-id)) ace))
(list 2
(get-name (get-top-card slot-id))
(_"an empty Foundation pile")))
(_"an empty foundation pile")))
((and (not (empty-slot? foundation-id))
(= (+ 1 (get-value (get-top-card foundation-id)))
(get-value (get-top-card slot-id))))
......
......@@ -208,7 +208,7 @@
BASE-VAL))
(list 2
(get-name (get-top-card slot))
(_"an empty Foundation")))
(_"an empty foundation")))
((and (not (empty-slot? f-slot))
(= (get-suit (get-top-card f-slot))
(get-suit (get-top-card slot)))
......
......@@ -185,7 +185,7 @@
(= (get-value (get-top-card slot)) ace))
(list 2
(get-name (get-top-card slot))
(_"an empty Foundation")))
(_"an empty foundation")))
((and (not (empty-slot? f-slot))
(= (get-suit (get-top-card f-slot))
(get-suit (get-top-card slot)))
......@@ -221,7 +221,7 @@
#f)
((and (empty-slot? slot)
(kings-avail 5))
(list 0 (_"Move a King on to the empty Tableau slot")))
(list 0 (_"Move a King on to the empty tableau slot")))
(#t (fill-empties (+ 1 slot)))))
(define (dealable?)
......
......@@ -167,7 +167,7 @@
(= f-slot 4))
(check-to-foundations? (+ 1 slot) 0))
((= (get-value (get-top-card slot)) ace)
(list 2 (get-name (get-top-card slot)) (_"an empty Foundation")))
(list 2 (get-name (get-top-card slot)) (_"an empty foundation")))
((and (not (empty-slot? f-slot))
(= (get-suit (get-top-card slot))
(get-suit (get-top-card f-slot)))
......@@ -220,7 +220,7 @@
(check-for-king (get-cards slot) free-reserves slot))
(list 2
(check-for-king (get-cards slot) free-reserves slot)
(_"an empty Tableau")))
(_"an empty tableau")))
((and (not (= slot t-slot))
(not (empty-slot? t-slot))
(= (get-suit (get-top-card slot))
......
......@@ -182,7 +182,7 @@
(or (removable?)
(move-leftable? 1 2)
(dealable?)
(list 0 (_"Return cards to Stock"))))
(list 0 (_"Return cards to stock"))))
(define (get-options)
#f)
......
......@@ -163,7 +163,7 @@
ace))
(list 2
(get-name (get-top-card slot))
(_"an empty Foundation")))
(_"an empty foundation")))
((and (not (empty-slot? f-slot))
(= (get-suit (get-top-card f-slot))
(get-suit (get-top-card slot)))
......
......@@ -328,33 +328,32 @@
; freecells
(add-normal-slot '()) ; 0
(set! HORIZPOS (- HORIZPOS (/ 1 24)))
(add-normal-slot '()) ; 1
(set! HORIZPOS (- HORIZPOS (/ 1 24)))
(add-normal-slot '()) ; 2
(set! HORIZPOS (- HORIZPOS (/ 1 24)))
(add-normal-slot '()) ; 3
(set! HORIZPOS (+ HORIZPOS 0.25))
; homecells
(add-normal-slot '()) ; 4
(set! HORIZPOS (- HORIZPOS (/ 1 24)))
(add-normal-slot '()) ; 5
(set! HORIZPOS (- HORIZPOS (/ 1 24)))
(add-normal-slot '()) ; 6
(set! HORIZPOS (- HORIZPOS (/ 1 24)))
(add-normal-slot '()) ; 7
(add-carriage-return-slot)
; fields
(add-extended-slot '() down) ; 8
(set! HORIZPOS (+ HORIZPOS (/ 1 28)))
(add-extended-slot '() down) ; 9
(set! HORIZPOS (+ HORIZPOS (/ 1 28)))
(add-extended-slot '() down) ; 10
(set! HORIZPOS (+ HORIZPOS (/ 1 28)))
(add-extended-slot '() down) ; 11
(set! HORIZPOS (+ HORIZPOS (/ 1 28)))
(add-extended-slot '() down) ; 12
(set! HORIZPOS (+ HORIZPOS (/ 1 28)))
(add-extended-slot '() down) ; 13
(set! HORIZPOS (+ HORIZPOS (/ 1 28)))
(add-extended-slot '() down) ; 14
(set! HORIZPOS (+ HORIZPOS (/ 1 28)))
(add-extended-slot '() down) ; 15
(add-blank-slot)
......@@ -366,7 +365,7 @@
(set! board-hash (make-hash-table hash-size))
(list 8.25 3)
(list 8 3.5)
)
(define (button-pressed slot card-list)
......
......@@ -232,7 +232,7 @@
((empty-slot? slot-id)
(check-to-foundations? (+ 1 slot-id)))
((= (get-value (get-top-card slot-id)) ace)
(list 2 (get-name (get-top-card slot-id)) (_"an empty Foundation")))
(list 2 (get-name (get-top-card slot-id)) (_"an empty foundation")))
((check-a-foundation (get-top-card slot-id) 1)
(list 1
(get-name (get-top-card slot-id))
......
......@@ -125,7 +125,7 @@
#f)
((check-to-foundation 1 2)
(check-to-foundation 1 2))
(#t (list 0 (_"Move card from Waste")))))
(#t (list 0 (_"Move card from waste")))))
(define (dealable?)
(and (not (empty-slot? 0))
......
......@@ -234,7 +234,7 @@
((empty-slot? slot-id)
(check-to-foundations (+ 1 slot-id)))
((= (get-value (get-top-card slot-id)) BASE-VAL)
(list 2 (get-name (get-top-card slot-id)) (_"an empty Foundation")))
(list 2 (get-name (get-top-card slot-id)) (_"an empty foundation")))
((check-a-foundation (get-top-card slot-id) 2)
(list 1
(get-name (get-top-card slot-id))
......@@ -320,7 +320,7 @@
(or (empty-slot? 7)
(empty-slot? 8)
(empty-slot? 9))
(list 2 (get-name (get-top-card 1)) (_"an empty Tableau slot"))))
(list 2 (get-name (get-top-card 1)) (_"an empty tableau slot"))))
(define (get-hint)
(or (check-to-foundations 1)
......
......@@ -58,7 +58,7 @@
(give-status-message)
(list 7 3)
(list 7 3.1)
)
(define (give-status-message)
......
......@@ -250,7 +250,7 @@
(or (and (= (get-value (get-top-card slot-id)) BASE-VAL)
(list 2
(get-name (get-top-card slot-id))
(_"an empty Foundation pile")))
(_"an empty foundation pile")))
(list 1
(get-name (get-top-card slot-id))
(get-name
......@@ -394,7 +394,7 @@
(= BASE-VAL ace))))
(list 2
(get-name (get-top-visible-card (get-cards slot)))
(_"an empty Tableau slot")))
(_"an empty tableau slot")))
((and (not (empty-slot? slot))
(or (> slot 12)
(< slot 2))
......@@ -406,7 +406,7 @@
(= BASE-VAL ace))))
(list 2
(get-name (get-top-card slot))
(_"an empty Tableau slot")))
(_"an empty tableau slot")))
(#t (find-high-value (+ 1 slot)))))
(define (empty-tableau?)
......
......@@ -215,7 +215,7 @@
((= BASE-VAL (get-value (get-top-card slot-id)))
(list 2
(get-name (get-top-card slot-id))
(_"an empty Foundation pile")))
(_"an empty foundation pile")))
((check-a-foundation (get-top-card slot-id) 2)
(list 1
(get-name (get-top-card slot-id))
......@@ -230,7 +230,7 @@
(= slot-id 8))
(waste-to-tableau? (+ 1 slot-id)))
((empty-slot? slot-id)
(list 2 (get-name (get-top-card 1)) (_"an empty Tableau pile")))
(list 2 (get-name (get-top-card 1)) (_"an empty tableau pile")))
((or (and (= (get-value (get-top-card 1)) king)
(= (get-value (get-top-card slot-id)) ace))
(= (+ 1 (get-value (get-top-card 1)))
......
......@@ -227,7 +227,7 @@
(= f-slot 8))
(check-to-foundations? (+ 1 slot) 0))
((= (get-value (get-top-card slot)) ace)
(list 2 (get-name (get-top-card slot)) (_"an empty Foundation")))
(list 2 (get-name (get-top-card slot)) (_"an empty foundation")))
((and (not (empty-slot? f-slot))
(= (get-suit (get-top-card slot))
(get-suit (get-top-card f-slot)))
......@@ -282,7 +282,7 @@
(check-for-king (get-cards slot) free-reserves slot))
(list 2
(check-for-king (get-cards slot) free-reserves slot)
(_"an empty Tableau")))
(_"an empty tableau")))
((and (not (= slot t-slot))
(not (empty-slot? t-slot))
(= (get-suit (get-top-card slot))
......
......@@ -191,7 +191,7 @@
(empty-slot? 9)
(empty-slot? 10)
(empty-slot? 11))
(list 0 (_"Place something on to the empty Tableau slot"))))
(list 0 (_"Place something on to the empty tableau slot"))))
(define (dealable?)
(and (not (empty-slot? 0))
......
......@@ -247,7 +247,7 @@
(> slot-id 10))
#f)
((empty-slot? slot-id)
(list 2 (get-name (get-top-card 1)) (_"an empty Tableau slot")))
(list 2 (get-name (get-top-card 1)) (_"an empty tableau slot")))
(#t (empty-tableau? (+ 1 slot-id)))))
(define (get-hint)
......
......@@ -155,7 +155,7 @@
#f)
((empty-slot? slot2)
(and (= (get-value (get-top-card slot1)) ace)
(list 2 (get-name (get-top-card slot1)) (_"an empty Foundation"))))
(list 2 (get-name (get-top-card slot1)) (_"an empty foundation"))))
((and (= (get-suit (get-top-card slot1))
(get-suit (get-top-card slot2)))
(= (get-value (get-top-card slot1))
......
......@@ -162,7 +162,7 @@
(define (check-waste-to-empty)
(and (not (empty-slot? 1))
(list 2 (get-name (get-top-card 1)) (_"an empty Tableau pile"))))
(list 2 (get-name (get-top-card 1)) (_"an empty tableau pile"))))
(define (stripped card-list)
(if (not (is-visible? (cadr card-list)))
......@@ -174,7 +174,7 @@
#f)
((and (not (empty-slot? slot-id))
(not (is-visible? (car (reverse (get-cards slot-id))))))
(list 2 (get-name (stripped (get-cards slot-id))) (_"an empty Tableau pile")))
(list 2 (get-name (stripped (get-cards slot-id))) (_"an empty tableau pile")))
(#t (check-tableau-to-empty (+ 1 slot-id)))))
......@@ -194,7 +194,7 @@
#t
(list 2
(get-name (get-top-card slot-id))
(_"an empty Foundation pile"))))
(_"an empty foundation pile"))))
((and (not (empty-slot? f-slot))
(eq? (get-suit (get-top-card f-slot))
(get-suit card))
......
......@@ -235,7 +235,7 @@
(= slot-id 16)
(not (check-a-foundation (list (get-top-card slot-id)) 6)))
(check-to-foundations (+ 1 slot-id))
(list 2 (get-name (get-top-card slot-id)) (_"appropriate Foundation pile")))))
(list 2 (get-name (get-top-card slot-id)) (_"appropriate foundation pile")))))
(define (check-imbedded card-list foundation-id)
(if (> (length card-list) 0)
......
......@@ -197,7 +197,7 @@
((empty-slot? slot-id)
(to-foundations? (+ 1 slot-id)))
((= (get-value (get-top-card slot-id)) ace)
(list 2 (get-name (get-top-card slot-id)) (_"an empty Foundation")))
(list 2 (get-name (get-top-card slot-id)) (_"an empty foundation")))
((and (not (empty-slot? 2))
(eq? (get-suit (get-top-card 2))
(get-suit (get-top-card slot-id)))
......@@ -301,11 +301,11 @@
(cond ((check-invisible 6)
(list 2
(get-name (check-invisible 6))
(_"an empty Tableau pile")))
(_"an empty tableau pile")))
((not (empty-slot? 1))
(list 2
(get-name (get-top-card 1))
(_"an empty Tableau pile")))
(_"an empty tableau pile")))
(#t #f))))
(define (get-hint)
......
......@@ -148,7 +148,7 @@
((and (not (empty-slot? slot))
(check-to-foundation (get-top-card slot) 2))
(if (= (get-value (get-top-card slot)) ace)
(list 2 (get-name (get-top-card slot)) (_"an empty Foundation"))
(list 2 (get-name (get-top-card slot)) (_"an empty foundation"))
(list 1
(get-name (get-top-card slot))
(get-name (get-top-card (check-to-foundation (get-top-card slot) 2))))))
......
......@@ -189,7 +189,7 @@
(empty-slot? 9)
(empty-slot? 10)
(empty-slot? 11))
(list 0 (_"Place something on to the empty Tableau slot"))))
(list 0 (_"Place something on to the empty tableau slot"))))
(define (dealable?)
(and (not (empty-slot? 0))
......
......@@ -242,7 +242,7 @@
((empty-slot? slot-id)
(check-to-foundations? (+ 1 slot-id)))
((= (get-value (get-top-card slot-id)) ace)
(list 2 (get-name (get-top-card slot-id)) (_"an empty Foundation")))
(list 2 (get-name (get-top-card slot-id)) (_"an empty foundation")))
((check-a-foundation (get-top-card slot-id) 0)
(list 1
(get-name (get-top-card slot-id))
......
......@@ -3,7 +3,7 @@
AC_PREREQ([2.53])
AC_INIT([gnome-games], [2.11.5],
AC_INIT([gnome-games], [2.13.0],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-games])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([gnomine/gnomine.c])
......@@ -26,9 +26,11 @@ AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
AC_CHECK_PROG(CXX_PRESENT, $CXX, yes, no)
AM_CONDITIONAL([HAVE_CXX], [test "x$CXX_PRESENT" = xyes])
dnl We could use the guile.m4 macros, but this is in fact simpler
dnl for what we want.
AC_CHECK_PROG(GUILE_PRESENT, guile-config, yes, no)
dnl Checking for the header file is basically the only way to find
dnl out if the _development_ files are present. guile-config returns
dnl a value regardless of what is actually installed. The problem
dnl with this is if the header ever gets moved to a non-default location.
AC_CHECK_HEADER([libguile.h], [GUILE_PRESENT=yes], [GUILE_PRESENT=no])
if test "$GUILE_PRESENT" = "yes" ; then
GUILE_CFLAGS=`guile-config compile`
GUILE_LDFLAGS=`guile-config link`
......@@ -84,6 +86,11 @@ PKG_CHECK_MODULES(GNOME_GAMES, libgnome-2.0 >= $LIBGNOME_REQUIRED gconf-2.0 >= $
AC_SUBST(GNOME_GAMES_CFLAGS)
AC_SUBST(GNOME_GAMES_LIBS)
## Flags for Cairo
PKG_CHECK_MODULES(CAIRO, cairo)
AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(CAIRO_LIBS)
## Flags for glade
## We need gmodule to ensure --export-dynamic is used and
## glade_xml_signal_autoconnect works.
......@@ -92,11 +99,58 @@ AC_SUBST(GLADE_CFLAGS)
AC_SUBST(GLADE_LIBS)
## Flags for Howl. Use of this library is optional.
PKG_CHECK_MODULES(HOWL, howl >= 0.9.6, [ HOWL_PRESENT="yes" ],
[ CFLAGS="$CFLAGS -DNO_HOWL"
HOWL_PRESENT="no" ])
AC_SUBST(HOWL_CFLAGS)
AC_SUBST(HOWL_LIBS)
AC_ARG_ENABLE(howl, [ --disable-howl build without howl support])
if test "x$enable_howl" != "xno"; then
PKG_CHECK_MODULES(HOWL, howl >= 0.9.6, [ HOWL_EXTRA_CFLAGS="-DHAVE_ZEROCONF -DHAVE_HOWL" msg_zeroconf="howl" ],
[ msg_zeroconf="none" ])
HOWL_CFLAGS="$(HOWL_CFLAGS) $(HOWL_EXTRA_CFLAGS)"
AC_SUBST(HOWL_CFLAGS)
AC_SUBST(HOWL_LIBS)
else
msg_zeroconf="none"
fi
## Flags for Bonjour. Use of this library is optional and mutually exclusive with Howl.
AC_ARG_ENABLE(bonjour, [ --enable-bonjour build with bonjour support])
if test "x$enable_bonjour" = "xyes"; then
if test "x${HOWL_LIBS}" != "x"; then
echo "WARNING: Bonjour and Howl are mutually exclusive. Using Bonjour."
HOWL_CFLAGS=""
HOWL_LIBS=""
fi
CPPFLAGS_save="$CPPFLAGS"
LDFLAGS_save="$LDFLAGS"
AC_ARG_WITH(bonjour-includes, [ --with-bonjour-includes=PREFIX Location of Bonjour includes.], with_bonjour_includes="$withval", with_bonjour_includes="/usr/include")
CPPFLAGS="$CPPFLAGS -I$with_bonjour_includes"
AC_CHECK_HEADER(dns_sd.h, , AC_MSG_ERROR([Unable to find Bonjour includes]))
CPPFLAGS="$CPPFLAGS_save"
if test x$with_bonjour_includes != x/usr/include; then
BONJOUR_CFLAGS="-I$with_bonjour_includes -DHAVE_ZEROCONF -DHAVE_BONJOUR"
else
BONJOUR_CFLAGS="-DHAVE_ZEROCONF -DHAVE_BONJOUR"
fi
AC_ARG_WITH(bonjour-libs, [ --with-bonjour-libs=PREFIX Location of Bonjour libs.],
with_bonjour_libs="$withval", with_bonjour_libs="/usr/lib")
LDFLAGS="$LDFLAGS -L$with_bonjour_libs -ldns_sd"
AC_TRY_LINK_FUNC(DNSServiceResolve, , AC_MSG_ERROR([Unable to find Bonjour libs]))
LDFLAGS="$LDFLAGS_save"
if test x$with_bonjour_libs != x/usr/lib; then
BONJOUR_LIBS="-L$with_bonjour_libs -ldns_sd"
else
BONJOUR_LIBS="-ldns_sd"
fi
msg_zeroconf="bonjour"
AC_DEFINE(HAVE_BONJOUR, 1, [Define to 1 if Bonjour is available and desired])
AC_SUBST(BONJOUR_CFLAGS)
AC_SUBST(BONJOUR_LIBS)
fi
GNOME_GAMES_CXXFLAGS="$GNOME_GAMES_CFLAGS -I\$(top_srcdir)/libgames-support $WARN_CXXFLAGS"
GNOME_GAMES_CFLAGS="$GNOME_GAMES_CFLAGS -I\$(top_srcdir)/libgames-support $WARN_CFLAGS"
......@@ -261,7 +315,7 @@ Configuration:
Scores user ${scores_user}
Scores & setgid group ${scores_group}
Zeroconf support (libhowl): ${HOWL_PRESENT}
Zeroconf support: ${msg_zeroconf}
"
if grep -q "$scores_group:" /etc/group ; then
......
2005-08-08 Callum McKenzie <callum@physics.otago.ac.nz>
2005-09-08 Callum McKenzie <callum@spooky-possum.org>
* Makefile.am: Remove references to teleport.h and rteleport.h,
they were never shipped.
* games-network.c:
* games-network-dialog.c:
* games-network.h: Change game_server -> games_network_server_name
to try and get around naming conflicts. See bug #315473.
* games-scores-dialog.gob: Hide the catbar when there is only one
category (this is fixing a regression in the new code). Also mark
as private public functions that are now unnecessary.
* games-scores.c (games_scores_get_current): Pass the backend the
rather than the name to generate the filename.
2005-09-07 Callum McKenzie <callum@spooky-possum.org>
* games-scores-backend.c (games_scores_backend_get_scores): Fix
the ordering of the created scores list.
* games-scores.c: Cut the overflow off correctly.
2005-09-02 Callum McKenzie <callum@spooky-possum.org>
* games-scores.c:
* games-scores-backend.c: Finally! The scores file gets written
out. Still lots of issues, but the system is at least functional.
2005-09-01 Callum McKenzie <callum@spooky-possum.org>
* games-scores.c:
* games-scores.h:
* games-scores-backend.c:
* games-scores-backend.h:
* games-scores-dialog.gob: More work on the scoring system. The
insert-score logic is good, although it still doesn't write to
file. The generic logic was also moved from games-scores-backend
to games-scores.
2005-08-30 Callum McKenzie <callum@lspooky-possum.org>
* games-score.c:
* games-score.h: Reintroduce the scalar score as
GamesScoreValue. Also fill out the name and time fields of a
GamesScore in the _new function.
2005-08-29 Callum McKenzie <callum@spooky-possum.org>
* games-scores-dialog.gob:
* games-scores.c:
* games-scores.h: Further movement towards a working
implementation. Added _get_style and _get_category to games-scores
to support games-scores-dialog. Categories are now set correctly
(although still not ordered correctly, we may need to move away
from a hash table). The formatting for adding a score is also
correct, but no actual file I/O occurs.
2005-08-24 Callum McKenzie <callum@spooky-possum.org>
* games-scores.h:
* games-scores.c: Remove the _show method and make this a
pure glib object. In other words, don't try and encapsulate
dialog . Let the dialog be a view of this data instead.
Add a _get method to export the list of high scores and clean
up the _add_score method.
2005-08-16 Callum McKenzie <callum@physics.otago.ac.nz>
* games-scores.c: