r16274 - in /packages/unstable/gweled/debian: changelog patches/music-preference.patch patches/xdg_pref.diff

svena-guest at users.alioth.debian.org svena-guest at users.alioth.debian.org
Sun Jun 15 20:24:08 UTC 2008


Author: svena-guest
Date: Sun Jun 15 20:24:08 2008
New Revision: 16274

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16274
Log:
* New patch, music_preference, makes it possible to disable music
  playback. From Ubuntu, thanks Lionel Dricot. (Closes: #398250)
* New patch, xdg_pref, uses the XDG basedir for the configuration
  file. Needed to workaround an issue which the previous patch. From 
  Ubuntu, thanks Lionel Dricot.
* Drop mikmod-disable-disk-writers as these changes are included in the
  music_preference patch.

Added:
    packages/unstable/gweled/debian/patches/music-preference.patch
    packages/unstable/gweled/debian/patches/xdg_pref.diff
Modified:
    packages/unstable/gweled/debian/changelog

Modified: packages/unstable/gweled/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gweled/debian/changelog?rev=16274&op=diff
==============================================================================
--- packages/unstable/gweled/debian/changelog (original)
+++ packages/unstable/gweled/debian/changelog Sun Jun 15 20:24:08 2008
@@ -6,6 +6,13 @@
   * New patch, gweled-desktop-file, to make the desktop file
     validate. From Ubuntu, thanks Adrien Cunin and Siegfried-Angel.
     (Closes: #402169)
+  * New patch, music_preference, makes it possible to disable music
+    playback. From Ubuntu, thanks Lionel Dricot. (Closes: #398250)
+  * New patch, xdg_pref, uses the XDG basedir for the configuration
+    file. Needed to workaround an issue which the previous patch. From 
+    Ubuntu, thanks Lionel Dricot.
+  * Drop mikmod-disable-disk-writers as these changes are included in the
+    music_preference patch.
 
  -- Sven Arvidsson <sa at whiz.se>  Mon, 07 Apr 2008 22:17:01 +0200
 

Added: packages/unstable/gweled/debian/patches/music-preference.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gweled/debian/patches/music-preference.patch?rev=16274&op=file
==============================================================================
--- packages/unstable/gweled/debian/patches/music-preference.patch (added)
+++ packages/unstable/gweled/debian/patches/music-preference.patch Sun Jun 15 20:24:08 2008
@@ -1,0 +1,2791 @@
+diff -Nur -x '*.orig' -x '*~' gweled-0.7/src/board_engine.h gweled-0.7.new/src/board_engine.h
+--- gweled-0.7/src/board_engine.h	2005-05-25 23:03:04.000000000 +0200
++++ gweled-0.7.new/src/board_engine.h	2008-06-15 21:54:54.000000000 +0200
+@@ -4,6 +4,7 @@
+ typedef struct s_gweled_prefs
+ {
+ 	gboolean timer_mode;
++	gboolean music_on;
+ 	gint tile_width;
+ 	gint tile_height;
+ }GweledPrefs;
+diff -Nur -x '*.orig' -x '*~' gweled-0.7/src/callbacks.c gweled-0.7.new/src/callbacks.c
+--- gweled-0.7/src/callbacks.c	2005-05-25 23:14:58.000000000 +0200
++++ gweled-0.7.new/src/callbacks.c	2008-06-15 21:54:54.000000000 +0200
+@@ -7,6 +7,7 @@
+ #include <mikmod.h>
+ 
+ #include "callbacks.h"
++#include "music.h"
+ 
+ #include "sge_core.h"
+ #include "board_engine.h"
+@@ -340,3 +341,14 @@
+ 				      BOARD_HEIGHT * prefs.tile_height);
+ 	}
+ }
++
++void
++on_music_checkbutton_toggled (GtkToggleButton * togglebutton, gpointer user_data)
++{
++	if (gtk_toggle_button_get_active (togglebutton)) {
++		music_play();
++	}
++	else {
++		music_stop();
++	}
++}
+diff -Nur -x '*.orig' -x '*~' gweled-0.7/src/callbacks.h gweled-0.7.new/src/callbacks.h
+--- gweled-0.7/src/callbacks.h	2003-11-05 00:00:00.000000000 +0100
++++ gweled-0.7.new/src/callbacks.h	2008-06-15 21:54:54.000000000 +0200
+@@ -133,3 +133,7 @@
+ void
+ on_largeRadiobutton_toggled            (GtkToggleButton *togglebutton,
+                                         gpointer         user_data);
++                                        
++void
++on_music_checkbutton_toggled		    (GtkToggleButton *togglebutton,
++                                         gpointer  		 user_data);                       
+diff -Nur -x '*.orig' -x '*~' gweled-0.7/src/gweled.glade gweled-0.7.new/src/gweled.glade
+--- gweled-0.7/src/gweled.glade	2004-09-14 20:36:00.000000000 +0200
++++ gweled-0.7.new/src/gweled.glade	2008-06-15 21:54:54.000000000 +0200
+@@ -1,1513 +1,956 @@
+-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+-
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
++<!--*- mode: xml -*-->
+ <glade-interface>
+-<requires lib="gnome"/>
+-<requires lib="bonobo"/>
+-
+-<widget class="GnomeApp" id="gweledApp">
+-  <property name="title" translatable="yes">Gweled</property>
+-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+-  <property name="window_position">GTK_WIN_POS_NONE</property>
+-  <property name="modal">False</property>
+-  <property name="resizable">False</property>
+-  <property name="destroy_with_parent">False</property>
+-  <property name="icon">gweled_icon.png</property>
+-  <property name="decorated">True</property>
+-  <property name="skip_taskbar_hint">False</property>
+-  <property name="skip_pager_hint">False</property>
+-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="enable_layout_config">True</property>
+-  <signal name="delete_event" handler="on_app1_delete_event" last_modification_time="Mon, 03 Nov 2003 20:11:56 GMT"/>
+-
+-  <child internal-child="dock">
+-    <widget class="BonoboDock" id="bonobodock1">
+-      <property name="visible">True</property>
+-      <property name="allow_floating">True</property>
+-
+-      <child>
+-	<widget class="BonoboDockItem" id="bonobodockitem1">
+-	  <property name="visible">True</property>
+-	  <property name="shadow_type">GTK_SHADOW_NONE</property>
+-
+-	  <child>
+-	    <widget class="GtkMenuBar" id="menubar1">
+-	      <property name="visible">True</property>
+-
+-	      <child>
+-		<widget class="GtkMenuItem" id="file1">
+-		  <property name="visible">True</property>
+-		  <property name="stock_item">GNOMEUIINFO_MENU_FILE_TREE</property>
+-
+-		  <child>
+-		    <widget class="GtkMenu" id="file1_menu">
+-
+-		      <child>
+-			<widget class="GtkMenuItem" id="new1">
+-			  <property name="visible">True</property>
+-			  <property name="stock_item">GNOMEUIINFO_MENU_NEW_GAME_ITEM</property>
+-			  <signal name="activate" handler="on_new1_activate" last_modification_time="Wed, 17 Jul 2002 18:52:20 GMT"/>
+-			</widget>
+-		      </child>
+-
+-		      <child>
+-			<widget class="GtkImageMenuItem" id="scores1">
+-			  <property name="visible">True</property>
+-			  <property name="stock_item">GNOMEUIINFO_MENU_SCORES_ITEM</property>
+-			  <signal name="activate" handler="on_scores1_activate" last_modification_time="Wed, 17 Jul 2002 18:52:20 GMT"/>
+-			</widget>
+-		      </child>
+-
+-		      <child>
+-			<widget class="GtkMenuItem" id="separator1">
+-			  <property name="visible">True</property>
+-			</widget>
+-		      </child>
+-
+-		      <child>
+-			<widget class="GtkImageMenuItem" id="quit1">
+-			  <property name="visible">True</property>
+-			  <property name="stock_item">GNOMEUIINFO_MENU_EXIT_ITEM</property>
+-			  <signal name="activate" handler="on_quit1_activate" last_modification_time="Fri, 29 Aug 2003 14:16:38 GMT"/>
+-			</widget>
+-		      </child>
+-		    </widget>
+-		  </child>
+-		</widget>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkMenuItem" id="edit1">
+-		  <property name="visible">True</property>
+-		  <property name="stock_item">GNOMEUIINFO_MENU_EDIT_TREE</property>
+-
+-		  <child>
+-		    <widget class="GtkMenu" id="edit1_menu">
+-
+-		      <child>
+-			<widget class="GtkImageMenuItem" id="preferences1">
+-			  <property name="visible">True</property>
+-			  <property name="stock_item">GNOMEUIINFO_MENU_PREFERENCES_ITEM</property>
+-			  <signal name="activate" handler="on_preferences1_activate" last_modification_time="Wed, 17 Jul 2002 18:52:20 GMT"/>
+-			</widget>
+-		      </child>
+-		    </widget>
+-		  </child>
+-		</widget>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkMenuItem" id="help1">
+-		  <property name="visible">True</property>
+-		  <property name="stock_item">GNOMEUIINFO_MENU_HELP_TREE</property>
+-
+-		  <child>
+-		    <widget class="GtkMenu" id="help1_menu">
+-
+-		      <child>
+-			<widget class="GtkImageMenuItem" id="about1">
+-			  <property name="visible">True</property>
+-			  <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
+-			  <signal name="activate" handler="on_about1_activate" last_modification_time="Wed, 17 Jul 2002 18:52:20 GMT"/>
+-			</widget>
+-		      </child>
+-		    </widget>
+-		  </child>
+-		</widget>
+-	      </child>
+-	    </widget>
+-	  </child>
+-	</widget>
+-	<packing>
+-	  <property name="placement">BONOBO_DOCK_TOP</property>
+-	  <property name="band">0</property>
+-	  <property name="position">0</property>
+-	  <property name="offset">0</property>
+-	  <property name="behavior">BONOBO_DOCK_ITEM_BEH_EXCLUSIVE|BONOBO_DOCK_ITEM_BEH_NEVER_VERTICAL|BONOBO_DOCK_ITEM_BEH_LOCKED</property>
+-	</packing>
+-      </child>
+-
+-      <child>
+-	<widget class="GtkVBox" id="vbox7">
+-	  <property name="visible">True</property>
+-	  <property name="homogeneous">False</property>
+-	  <property name="spacing">0</property>
+-
+-	  <child>
+-	    <widget class="GtkLabel" id="scoreLabel">
+-	      <property name="visible">True</property>
+-	      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt; 000000&lt;/span&gt;</property>
+-	      <property name="use_underline">False</property>
+-	      <property name="use_markup">True</property>
+-	      <property name="justify">GTK_JUSTIFY_RIGHT</property>
+-	      <property name="wrap">False</property>
+-	      <property name="selectable">False</property>
+-	      <property name="xalign">1</property>
+-	      <property name="yalign">0.5</property>
+-	      <property name="xpad">0</property>
+-	      <property name="ypad">0</property>
+-	    </widget>
+-	    <packing>
+-	      <property name="padding">0</property>
+-	      <property name="expand">False</property>
+-	      <property name="fill">False</property>
+-	    </packing>
+-	  </child>
+-
+-	  <child>
+-	    <widget class="GtkDrawingArea" id="boardDrawingarea">
+-	      <property name="visible">True</property>
+-	      <property name="has_focus">True</property>
+-	      <property name="events">GDK_EXPOSURE_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-	      <property name="extension_events">GDK_EXTENSION_EVENTS_CURSOR</property>
+-	      <signal name="expose_event" handler="drawing_area_expose_event_cb" last_modification_time="Fri, 29 Aug 2003 13:14:45 GMT"/>
+-	      <signal name="button_press_event" handler="drawing_area_button_event_cb" last_modification_time="Wed, 21 Jan 2004 06:22:00 GMT"/>
+-	      <signal name="button_release_event" handler="drawing_area_button_event_cb" last_modification_time="Wed, 21 Jan 2004 06:21:45 GMT"/>
+-	      <signal name="motion_notify_event" handler="drawing_area_motion_event_cb" last_modification_time="Tue, 14 Sep 2004 20:34:41 GMT"/>
+-	    </widget>
+-	    <packing>
+-	      <property name="padding">0</property>
+-	      <property name="expand">True</property>
+-	      <property name="fill">True</property>
+-	    </packing>
+-	  </child>
+-
+-	  <child>
+-	    <widget class="GtkHBox" id="hbox9">
+-	      <property name="visible">True</property>
+-	      <property name="homogeneous">False</property>
+-	      <property name="spacing">0</property>
+-
+-	      <child>
+-		<widget class="GtkProgressBar" id="bonusProgressbar">
+-		  <property name="visible">True</property>
+-		  <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
+-		  <property name="fraction">0</property>
+-		  <property name="pulse_step">0.1</property>
+-		  <property name="text" translatable="yes"></property>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">True</property>
+-		  <property name="fill">True</property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="bonusLabel">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt; x1&lt;/span&gt;</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">True</property>
+-		  <property name="justify">GTK_JUSTIFY_RIGHT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">1</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="padding">6</property>
+-		  <property name="expand">False</property>
+-		  <property name="fill">False</property>
+-		</packing>
+-	      </child>
+-	    </widget>
+-	    <packing>
+-	      <property name="padding">0</property>
+-	      <property name="expand">True</property>
+-	      <property name="fill">True</property>
+-	    </packing>
+-	  </child>
+-	</widget>
+-      </child>
+-    </widget>
+-    <packing>
+-      <property name="padding">0</property>
+-      <property name="expand">True</property>
+-      <property name="fill">True</property>
+-    </packing>
+-  </child>
+-</widget>
+-
+-<widget class="GtkDialog" id="preferencesDialog">
+-  <property name="border_width">12</property>
+-  <property name="title" translatable="yes">Preferences</property>
+-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+-  <property name="window_position">GTK_WIN_POS_NONE</property>
+-  <property name="modal">False</property>
+-  <property name="resizable">False</property>
+-  <property name="destroy_with_parent">False</property>
+-  <property name="icon">gweled_icon.png</property>
+-  <property name="decorated">True</property>
+-  <property name="skip_taskbar_hint">False</property>
+-  <property name="skip_pager_hint">False</property>
+-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="has_separator">False</property>
+-  <signal name="delete_event" handler="on_preferencesDialog_delete_event" last_modification_time="Thu, 11 Dec 2003 22:02:18 GMT"/>
+-
+-  <child internal-child="vbox">
+-    <widget class="GtkVBox" id="dialog-vbox1">
+-      <property name="visible">True</property>
+-      <property name="homogeneous">False</property>
+-      <property name="spacing">12</property>
+-
+-      <child internal-child="action_area">
+-	<widget class="GtkHButtonBox" id="dialog-action_area1">
+-	  <property name="visible">True</property>
+-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+-
+-	  <child>
+-	    <widget class="GtkButton" id="closebutton1">
+-	      <property name="visible">True</property>
+-	      <property name="can_default">True</property>
+-	      <property name="can_focus">True</property>
+-	      <property name="label">gtk-close</property>
+-	      <property name="use_stock">True</property>
+-	      <property name="relief">GTK_RELIEF_NORMAL</property>
+-	      <property name="focus_on_click">True</property>
+-	      <property name="response_id">-7</property>
+-	      <signal name="clicked" handler="on_closebutton1_clicked" last_modification_time="Tue, 04 Nov 2003 11:40:36 GMT"/>
+-	    </widget>
+-	  </child>
+-	</widget>
+-	<packing>
+-	  <property name="padding">0</property>
+-	  <property name="expand">False</property>
+-	  <property name="fill">True</property>
+-	  <property name="pack_type">GTK_PACK_END</property>
+-	</packing>
+-      </child>
+-
+-      <child>
+-	<widget class="GtkVBox" id="vbox2">
+-	  <property name="visible">True</property>
+-	  <property name="homogeneous">False</property>
+-	  <property name="spacing">18</property>
+-
+-	  <child>
+-	    <widget class="GtkVBox" id="vbox3">
+-	      <property name="visible">True</property>
+-	      <property name="homogeneous">False</property>
+-	      <property name="spacing">6</property>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label18">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Difficulty level&lt;/span&gt;</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">True</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">False</property>
+-		  <property name="fill">False</property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkHBox" id="hbox8">
+-		  <property name="visible">True</property>
+-		  <property name="homogeneous">False</property>
+-		  <property name="spacing">6</property>
+-
+-		  <child>
+-		    <widget class="GtkVBox" id="vbox5">
+-		      <property name="visible">True</property>
+-		      <property name="homogeneous">False</property>
+-		      <property name="spacing">6</property>
+-
+-		      <child>
+-			<widget class="GtkHBox" id="hbox3">
+-			  <property name="visible">True</property>
+-			  <property name="homogeneous">False</property>
+-			  <property name="spacing">6</property>
+-
+-			  <child>
+-			    <widget class="GtkLabel" id="label20">
+-			      <property name="visible">True</property>
+-			      <property name="label" translatable="yes"></property>
+-			      <property name="use_underline">False</property>
+-			      <property name="use_markup">False</property>
+-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-			      <property name="wrap">False</property>
+-			      <property name="selectable">False</property>
+-			      <property name="xalign">0.5</property>
+-			      <property name="yalign">0.5</property>
+-			      <property name="xpad">0</property>
+-			      <property name="ypad">0</property>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
+-
+-			  <child>
+-			    <widget class="GtkRadioButton" id="easyRadiobutton">
+-			      <property name="visible">True</property>
+-			      <property name="can_focus">True</property>
+-			      <property name="label" translatable="yes">Normal</property>
+-			      <property name="use_underline">True</property>
+-			      <property name="relief">GTK_RELIEF_NORMAL</property>
+-			      <property name="focus_on_click">True</property>
+-			      <property name="active">False</property>
+-			      <property name="inconsistent">False</property>
+-			      <property name="draw_indicator">True</property>
+-			      <signal name="toggled" handler="on_easyRadiobutton_toggled" last_modification_time="Wed, 05 Nov 2003 20:53:58 GMT"/>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
+-			</widget>
+-			<packing>
+-			  <property name="padding">0</property>
+-			  <property name="expand">True</property>
+-			  <property name="fill">True</property>
+-			</packing>
+-		      </child>
+-
+-		      <child>
+-			<widget class="GtkHBox" id="hbox4">
+-			  <property name="visible">True</property>
+-			  <property name="homogeneous">False</property>
+-			  <property name="spacing">6</property>
+-
+-			  <child>
+-			    <widget class="GtkLabel" id="label21">
+-			      <property name="visible">True</property>
+-			      <property name="label" translatable="yes"></property>
+-			      <property name="use_underline">False</property>
+-			      <property name="use_markup">False</property>
+-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-			      <property name="wrap">False</property>
+-			      <property name="selectable">False</property>
+-			      <property name="xalign">0.5</property>
+-			      <property name="yalign">0.5</property>
+-			      <property name="xpad">0</property>
+-			      <property name="ypad">0</property>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
+-
+-			  <child>
+-			    <widget class="GtkRadioButton" id="hardRadiobutton">
+-			      <property name="visible">True</property>
+-			      <property name="can_focus">True</property>
+-			      <property name="label" translatable="yes">Timed</property>
+-			      <property name="use_underline">True</property>
+-			      <property name="relief">GTK_RELIEF_NORMAL</property>
+-			      <property name="focus_on_click">True</property>
+-			      <property name="active">False</property>
+-			      <property name="inconsistent">False</property>
+-			      <property name="draw_indicator">True</property>
+-			      <property name="group">easyRadiobutton</property>
+-			      <signal name="toggled" handler="on_hardRadiobutton_toggled" last_modification_time="Wed, 05 Nov 2003 20:54:05 GMT"/>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
+-			</widget>
+-			<packing>
+-			  <property name="padding">0</property>
+-			  <property name="expand">False</property>
+-			  <property name="fill">False</property>
+-			</packing>
+-		      </child>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">True</property>
+-		      <property name="fill">True</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="label25">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes">                       </property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">21</property>
+-		      <property name="ypad">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">False</property>
+-		  <property name="fill">False</property>
+-		</packing>
+-	      </child>
+-	    </widget>
+-	    <packing>
+-	      <property name="padding">0</property>
+-	      <property name="expand">True</property>
+-	      <property name="fill">True</property>
+-	    </packing>
+-	  </child>
+-
+-	  <child>
+-	    <widget class="GtkVBox" id="vbox4">
+-	      <property name="visible">True</property>
+-	      <property name="homogeneous">False</property>
+-	      <property name="spacing">6</property>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label19">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Board size&lt;/span&gt;</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">True</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">False</property>
+-		  <property name="fill">False</property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkHBox" id="hbox5">
+-		  <property name="visible">True</property>
+-		  <property name="homogeneous">False</property>
+-		  <property name="spacing">6</property>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="label22">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes"></property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkRadioButton" id="smallRadiobutton">
+-		      <property name="visible">True</property>
+-		      <property name="can_focus">True</property>
+-		      <property name="label" translatable="yes">Small</property>
+-		      <property name="use_underline">True</property>
+-		      <property name="relief">GTK_RELIEF_NORMAL</property>
+-		      <property name="focus_on_click">True</property>
+-		      <property name="active">False</property>
+-		      <property name="inconsistent">False</property>
+-		      <property name="draw_indicator">True</property>
+-		      <signal name="toggled" handler="on_smallRadiobutton_toggled" last_modification_time="Wed, 05 Nov 2003 20:54:11 GMT"/>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">False</property>
+-		  <property name="fill">False</property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkHBox" id="hbox6">
+-		  <property name="visible">True</property>
+-		  <property name="homogeneous">False</property>
+-		  <property name="spacing">6</property>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="label23">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes"></property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkRadioButton" id="mediumRadiobutton">
+-		      <property name="visible">True</property>
+-		      <property name="can_focus">True</property>
+-		      <property name="label" translatable="yes">Medium</property>
+-		      <property name="use_underline">True</property>
+-		      <property name="relief">GTK_RELIEF_NORMAL</property>
+-		      <property name="focus_on_click">True</property>
+-		      <property name="active">False</property>
+-		      <property name="inconsistent">False</property>
+-		      <property name="draw_indicator">True</property>
+-		      <property name="group">smallRadiobutton</property>
+-		      <signal name="toggled" handler="on_mediumRadiobutton_toggled" last_modification_time="Wed, 05 Nov 2003 20:54:17 GMT"/>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">False</property>
+-		  <property name="fill">False</property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkHBox" id="hbox7">
+-		  <property name="visible">True</property>
+-		  <property name="homogeneous">False</property>
+-		  <property name="spacing">6</property>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="label24">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes"></property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkRadioButton" id="largeRadiobutton">
+-		      <property name="visible">True</property>
+-		      <property name="can_focus">True</property>
+-		      <property name="label" translatable="yes">Large</property>
+-		      <property name="use_underline">True</property>
+-		      <property name="relief">GTK_RELIEF_NORMAL</property>
+-		      <property name="focus_on_click">True</property>
+-		      <property name="active">False</property>
+-		      <property name="inconsistent">False</property>
+-		      <property name="draw_indicator">True</property>
+-		      <property name="group">smallRadiobutton</property>
+-		      <signal name="toggled" handler="on_largeRadiobutton_toggled" last_modification_time="Wed, 05 Nov 2003 21:01:05 GMT"/>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">False</property>
+-		  <property name="fill">False</property>
+-		</packing>
+-	      </child>
+-	    </widget>
+-	    <packing>
+-	      <property name="padding">0</property>
+-	      <property name="expand">True</property>
+-	      <property name="fill">True</property>
+-	    </packing>
+-	  </child>
+-	</widget>
+-	<packing>
+-	  <property name="padding">0</property>
+-	  <property name="expand">True</property>
+-	  <property name="fill">True</property>
+-	</packing>
+-      </child>
+-    </widget>
+-  </child>
+-</widget>
+-
+-<widget class="GtkDialog" id="highscoresDialog">
+-  <property name="border_width">12</property>
+-  <property name="title" translatable="yes">Highscores</property>
+-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+-  <property name="window_position">GTK_WIN_POS_NONE</property>
+-  <property name="modal">False</property>
+-  <property name="resizable">False</property>
+-  <property name="destroy_with_parent">False</property>
+-  <property name="icon">gweled_icon.png</property>
+-  <property name="decorated">True</property>
+-  <property name="skip_taskbar_hint">False</property>
+-  <property name="skip_pager_hint">False</property>
+-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="has_separator">False</property>
+-  <signal name="delete_event" handler="on_highscoresDialog_delete_event" last_modification_time="Thu, 11 Dec 2003 22:02:41 GMT"/>
+-
+-  <child internal-child="vbox">
+-    <widget class="GtkVBox" id="dialog-vbox2">
+-      <property name="visible">True</property>
+-      <property name="homogeneous">False</property>
+-      <property name="spacing">6</property>
+-
+-      <child internal-child="action_area">
+-	<widget class="GtkHButtonBox" id="dialog-action_area2">
+-	  <property name="visible">True</property>
+-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+-
+-	  <child>
+-	    <widget class="GtkButton" id="closebutton2">
+-	      <property name="visible">True</property>
+-	      <property name="can_default">True</property>
+-	      <property name="can_focus">True</property>
+-	      <property name="label">gtk-close</property>
+-	      <property name="use_stock">True</property>
+-	      <property name="relief">GTK_RELIEF_NORMAL</property>
+-	      <property name="focus_on_click">True</property>
+-	      <property name="response_id">-7</property>
+-	      <signal name="clicked" handler="on_closebutton2_clicked" last_modification_time="Tue, 04 Nov 2003 11:40:42 GMT"/>
+-	    </widget>
+-	  </child>
+-	</widget>
+-	<packing>
+-	  <property name="padding">0</property>
+-	  <property name="expand">False</property>
+-	  <property name="fill">True</property>
+-	  <property name="pack_type">GTK_PACK_END</property>
+-	</packing>
+-      </child>
+-
+-      <child>
+-	<widget class="GtkVBox" id="vbox6">
+-	  <property name="visible">True</property>
+-	  <property name="homogeneous">False</property>
+-	  <property name="spacing">18</property>
+-
+-	  <child>
+-	    <widget class="GtkLabel" id="label27">
+-	      <property name="visible">True</property>
+-	      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Highscores&lt;/span&gt;</property>
+-	      <property name="use_underline">False</property>
+-	      <property name="use_markup">True</property>
+-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-	      <property name="wrap">False</property>
+-	      <property name="selectable">False</property>
+-	      <property name="xalign">0.5</property>
+-	      <property name="yalign">0.5</property>
+-	      <property name="xpad">0</property>
+-	      <property name="ypad">0</property>
+-	    </widget>
+-	    <packing>
+-	      <property name="padding">0</property>
+-	      <property name="expand">False</property>
+-	      <property name="fill">False</property>
+-	    </packing>
+-	  </child>
+-
+-	  <child>
+-	    <widget class="GtkTable" id="table7">
+-	      <property name="border_width">6</property>
+-	      <property name="visible">True</property>
+-	      <property name="n_rows">10</property>
+-	      <property name="n_columns">3</property>
+-	      <property name="homogeneous">False</property>
+-	      <property name="row_spacing">6</property>
+-	      <property name="column_spacing">12</property>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label28">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">1.</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">0</property>
+-		  <property name="right_attach">1</property>
+-		  <property name="top_attach">0</property>
+-		  <property name="bottom_attach">1</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label29">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">2.</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">0</property>
+-		  <property name="right_attach">1</property>
+-		  <property name="top_attach">1</property>
+-		  <property name="bottom_attach">2</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label30">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">3.</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">0</property>
+-		  <property name="right_attach">1</property>
+-		  <property name="top_attach">2</property>
+-		  <property name="bottom_attach">3</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label31">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">4.</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">0</property>
+-		  <property name="right_attach">1</property>
+-		  <property name="top_attach">3</property>
+-		  <property name="bottom_attach">4</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label32">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">5.</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">0</property>
+-		  <property name="right_attach">1</property>
+-		  <property name="top_attach">4</property>
+-		  <property name="bottom_attach">5</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label33">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">6.</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">0</property>
+-		  <property name="right_attach">1</property>
+-		  <property name="top_attach">5</property>
+-		  <property name="bottom_attach">6</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label34">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">7.</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">0</property>
+-		  <property name="right_attach">1</property>
+-		  <property name="top_attach">6</property>
+-		  <property name="bottom_attach">7</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label35">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">8.</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">0</property>
+-		  <property name="right_attach">1</property>
+-		  <property name="top_attach">7</property>
+-		  <property name="bottom_attach">8</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label36">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">9.</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">0</property>
+-		  <property name="right_attach">1</property>
+-		  <property name="top_attach">8</property>
+-		  <property name="bottom_attach">9</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label37">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">10.</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">0</property>
+-		  <property name="right_attach">1</property>
+-		  <property name="top_attach">9</property>
+-		  <property name="bottom_attach">10</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="nameLabel01">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">Sebastien Delestaing</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">1</property>
+-		  <property name="right_attach">2</property>
+-		  <property name="top_attach">0</property>
+-		  <property name="bottom_attach">1</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="nameLabel02">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">1</property>
+-		  <property name="right_attach">2</property>
+-		  <property name="top_attach">1</property>
+-		  <property name="bottom_attach">2</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="nameLabel03">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">1</property>
+-		  <property name="right_attach">2</property>
+-		  <property name="top_attach">2</property>
+-		  <property name="bottom_attach">3</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="nameLabel04">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">1</property>
+-		  <property name="right_attach">2</property>
+-		  <property name="top_attach">3</property>
+-		  <property name="bottom_attach">4</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="nameLabel06">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">1</property>
+-		  <property name="right_attach">2</property>
+-		  <property name="top_attach">5</property>
+-		  <property name="bottom_attach">6</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="nameLabel07">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">1</property>
+-		  <property name="right_attach">2</property>
+-		  <property name="top_attach">6</property>
+-		  <property name="bottom_attach">7</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="nameLabel08">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">1</property>
+-		  <property name="right_attach">2</property>
+-		  <property name="top_attach">7</property>
+-		  <property name="bottom_attach">8</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="nameLabel09">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">1</property>
+-		  <property name="right_attach">2</property>
+-		  <property name="top_attach">8</property>
+-		  <property name="bottom_attach">9</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="nameLabel10">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">1</property>
+-		  <property name="right_attach">2</property>
+-		  <property name="top_attach">9</property>
+-		  <property name="bottom_attach">10</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="scoreLabel01">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">10000</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">1</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">2</property>
+-		  <property name="right_attach">3</property>
+-		  <property name="top_attach">0</property>
+-		  <property name="bottom_attach">1</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="scoreLabel02">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">100</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">1</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">2</property>
+-		  <property name="right_attach">3</property>
+-		  <property name="top_attach">1</property>
+-		  <property name="bottom_attach">2</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="scoreLabel03">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">1</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">2</property>
+-		  <property name="right_attach">3</property>
+-		  <property name="top_attach">2</property>
+-		  <property name="bottom_attach">3</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="scoreLabel04">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">1</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">2</property>
+-		  <property name="right_attach">3</property>
+-		  <property name="top_attach">3</property>
+-		  <property name="bottom_attach">4</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="scoreLabel05">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">1</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">2</property>
+-		  <property name="right_attach">3</property>
+-		  <property name="top_attach">4</property>
+-		  <property name="bottom_attach">5</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="scoreLabel06">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">1</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">2</property>
+-		  <property name="right_attach">3</property>
+-		  <property name="top_attach">5</property>
+-		  <property name="bottom_attach">6</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="scoreLabel07">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">1</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">2</property>
+-		  <property name="right_attach">3</property>
+-		  <property name="top_attach">6</property>
+-		  <property name="bottom_attach">7</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="scoreLabel08">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">1</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">2</property>
+-		  <property name="right_attach">3</property>
+-		  <property name="top_attach">7</property>
+-		  <property name="bottom_attach">8</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="scoreLabel09">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">1</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">2</property>
+-		  <property name="right_attach">3</property>
+-		  <property name="top_attach">8</property>
+-		  <property name="bottom_attach">9</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="scoreLabel10">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">1</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">2</property>
+-		  <property name="right_attach">3</property>
+-		  <property name="top_attach">9</property>
+-		  <property name="bottom_attach">10</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="nameLabel05">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes"></property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">False</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="left_attach">1</property>
+-		  <property name="right_attach">2</property>
+-		  <property name="top_attach">4</property>
+-		  <property name="bottom_attach">5</property>
+-		  <property name="x_options">fill</property>
+-		  <property name="y_options"></property>
+-		</packing>
+-	      </child>
+-	    </widget>
+-	    <packing>
+-	      <property name="padding">0</property>
+-	      <property name="expand">True</property>
+-	      <property name="fill">True</property>
+-	    </packing>
+-	  </child>
+-	</widget>
+-	<packing>
+-	  <property name="padding">0</property>
+-	  <property name="expand">True</property>
+-	  <property name="fill">True</property>
+-	</packing>
+-      </child>
+-    </widget>
+-  </child>
+-</widget>
+-
++  <requires lib="bonobo"/>
++  <requires lib="gnome"/>
++  <widget class="GnomeApp" id="gweledApp">
++    <property name="title" translatable="yes">Gweled</property>
++    <property name="resizable">False</property>
++    <property name="icon">gweled_icon.png</property>
++    <property name="enable_layout_config">True</property>
++    <signal name="delete_event" handler="on_app1_delete_event"/>
++    <child internal-child="dock">
++      <widget class="BonoboDock" id="bonobodock1">
++        <property name="visible">True</property>
++        <property name="allow_floating">True</property>
++        <child>
++          <widget class="BonoboDockItem" id="bonobodockitem1">
++            <property name="visible">True</property>
++            <child>
++              <widget class="GtkMenuBar" id="menubar1">
++                <property name="visible">True</property>
++                <child>
++                  <widget class="GtkMenuItem" id="file1">
++                    <property name="visible">True</property>
++                    <property name="label" translatable="yes">_File</property>
++                    <property name="use_underline">True</property>
++                    <child>
++                      <widget class="GtkMenu" id="file1_menu">
++                        <child>
++                          <widget class="GtkMenuItem" id="new1">
++                            <property name="visible">True</property>
++                            <property name="label" translatable="yes">_New Game</property>
++                            <property name="use_underline">True</property>
++                            <signal name="activate" handler="on_new1_activate"/>
++                          </widget>
++                        </child>
++                        <child>
++                          <widget class="GtkImageMenuItem" id="scores1">
++                            <property name="visible">True</property>
++                            <property name="label" translatable="yes">_Scores...</property>
++                            <property name="use_underline">True</property>
++                            <signal name="activate" handler="on_scores1_activate"/>
++                          </widget>
++                        </child>
++                        <child>
++                          <widget class="GtkMenuItem" id="separator1">
++                            <property name="visible">True</property>
++                          </widget>
++                        </child>
++                        <child>
++                          <widget class="GtkImageMenuItem" id="quit1">
++                            <property name="visible">True</property>
++                            <property name="label" translatable="yes">gtk-quit</property>
++                            <property name="use_underline">True</property>
++                            <property name="use_stock">True</property>
++                            <signal name="activate" handler="on_quit1_activate"/>
++                          </widget>
++                        </child>
++                      </widget>
++                    </child>
++                  </widget>
++                </child>
++                <child>
++                  <widget class="GtkMenuItem" id="edit1">
++                    <property name="visible">True</property>
++                    <property name="label" translatable="yes">_Edit</property>
++                    <property name="use_underline">True</property>
++                    <child>
++                      <widget class="GtkMenu" id="edit1_menu">
++                        <child>
++                          <widget class="GtkImageMenuItem" id="preferences1">
++                            <property name="visible">True</property>
++                            <property name="label" translatable="yes">gtk-preferences</property>
++                            <property name="use_underline">True</property>
++                            <property name="use_stock">True</property>
++                            <signal name="activate" handler="on_preferences1_activate"/>
++                          </widget>
++                        </child>
++                      </widget>
++                    </child>
++                  </widget>
++                </child>
++                <child>
++                  <widget class="GtkMenuItem" id="help1">
++                    <property name="visible">True</property>
++                    <property name="label" translatable="yes">_Help</property>
++                    <property name="use_underline">True</property>
++                    <child>
++                      <widget class="GtkMenu" id="help1_menu">
++                        <child>
++                          <widget class="GtkImageMenuItem" id="about1">
++                            <property name="visible">True</property>
++                            <property name="label" translatable="yes">gtk-about</property>
++                            <property name="use_underline">True</property>
++                            <property name="use_stock">True</property>
++                            <signal name="activate" handler="on_about1_activate"/>
++                          </widget>
++                        </child>
++                      </widget>
++                    </child>
++                  </widget>
++                </child>
++              </widget>
++            </child>
++          </widget>
++          <packing>
++            <property name="behavior">BONOBO_DOCK_ITEM_BEH_EXCLUSIVE | BONOBO_DOCK_ITEM_BEH_NEVER_VERTICAL | BONOBO_DOCK_ITEM_BEH_LOCKED</property>
++          </packing>
++        </child>
++        <child>
++          <widget class="GtkVBox" id="vbox7">
++            <property name="visible">True</property>
++            <child>
++              <widget class="GtkLabel" id="scoreLabel">
++                <property name="visible">True</property>
++                <property name="xalign">1</property>
++                <property name="label" translatable="yes">&lt;span weight="bold"&gt; 000000&lt;/span&gt;</property>
++                <property name="use_markup">True</property>
++                <property name="justify">GTK_JUSTIFY_RIGHT</property>
++              </widget>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++              </packing>
++            </child>
++            <child>
++              <widget class="GtkDrawingArea" id="boardDrawingarea">
++                <property name="visible">True</property>
++                <property name="has_focus">True</property>
++                <property name="events">GDK_EXPOSURE_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++                <property name="extension_events">GDK_EXTENSION_EVENTS_CURSOR</property>
++                <signal name="expose_event" handler="drawing_area_expose_event_cb"/>
++                <signal name="button_press_event" handler="drawing_area_button_event_cb"/>
++                <signal name="motion_notify_event" handler="drawing_area_motion_event_cb"/>
++                <signal name="button_release_event" handler="drawing_area_button_event_cb"/>
++              </widget>
++              <packing>
++                <property name="position">1</property>
++              </packing>
++            </child>
++            <child>
++              <widget class="GtkHBox" id="hbox9">
++                <property name="visible">True</property>
++                <child>
++                  <widget class="GtkProgressBar" id="bonusProgressbar">
++                    <property name="visible">True</property>
++                    <property name="text" translatable="yes"></property>
++                  </widget>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="bonusLabel">
++                    <property name="visible">True</property>
++                    <property name="xalign">1</property>
++                    <property name="label" translatable="yes">&lt;span weight="bold"&gt; x1&lt;/span&gt;</property>
++                    <property name="use_markup">True</property>
++                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
++                  </widget>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="padding">6</property>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++              </widget>
++              <packing>
++                <property name="position">2</property>
++              </packing>
++            </child>
++          </widget>
++        </child>
++      </widget>
++      <packing>
++        <property name="expand">True</property>
++        <property name="fill">True</property>
++      </packing>
++    </child>
++  </widget>
++  <widget class="GtkDialog" id="preferencesDialog">
++    <property name="border_width">12</property>
++    <property name="title" translatable="yes">Preferences</property>
++    <property name="resizable">False</property>
++    <property name="icon">gweled_icon.png</property>
++    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
++    <property name="has_separator">False</property>
++    <signal name="delete_event" handler="on_preferencesDialog_delete_event"/>
++    <child internal-child="vbox">
++      <widget class="GtkVBox" id="dialog-vbox1">
++        <property name="visible">True</property>
++        <property name="spacing">12</property>
++        <child>
++          <widget class="GtkVBox" id="vbox2">
++            <property name="visible">True</property>
++            <property name="spacing">18</property>
++            <child>
++              <widget class="GtkVBox" id="vbox3">
++                <property name="visible">True</property>
++                <property name="spacing">6</property>
++                <child>
++                  <widget class="GtkLabel" id="label18">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">&lt;span weight="bold"&gt;Difficulty level&lt;/span&gt;</property>
++                    <property name="use_markup">True</property>
++                  </widget>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkHBox" id="hbox8">
++                    <property name="visible">True</property>
++                    <property name="spacing">6</property>
++                    <child>
++                      <widget class="GtkVBox" id="vbox5">
++                        <property name="visible">True</property>
++                        <property name="spacing">6</property>
++                        <child>
++                          <widget class="GtkHBox" id="hbox3">
++                            <property name="visible">True</property>
++                            <property name="spacing">6</property>
++                            <child>
++                              <widget class="GtkLabel" id="label20">
++                                <property name="visible">True</property>
++                              </widget>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <widget class="GtkRadioButton" id="easyRadiobutton">
++                                <property name="visible">True</property>
++                                <property name="can_focus">True</property>
++                                <property name="label" translatable="yes">Normal</property>
++                                <property name="use_underline">True</property>
++                                <property name="draw_indicator">True</property>
++                                <signal name="toggled" handler="on_easyRadiobutton_toggled"/>
++                              </widget>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                          </widget>
++                        </child>
++                        <child>
++                          <widget class="GtkHBox" id="hbox4">
++                            <property name="visible">True</property>
++                            <property name="spacing">6</property>
++                            <child>
++                              <widget class="GtkLabel" id="label21">
++                                <property name="visible">True</property>
++                              </widget>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <widget class="GtkRadioButton" id="hardRadiobutton">
++                                <property name="visible">True</property>
++                                <property name="can_focus">True</property>
++                                <property name="label" translatable="yes">Timed</property>
++                                <property name="use_underline">True</property>
++                                <property name="draw_indicator">True</property>
++                                <property name="group">easyRadiobutton</property>
++                                <signal name="toggled" handler="on_hardRadiobutton_toggled"/>
++                              </widget>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                          </widget>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                      </widget>
++                    </child>
++                    <child>
++                      <widget class="GtkLabel" id="label25">
++                        <property name="visible">True</property>
++                        <property name="xpad">21</property>
++                        <property name="label" translatable="yes">                       </property>
++                        <property name="justify">GTK_JUSTIFY_CENTER</property>
++                      </widget>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                  </widget>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++              </widget>
++            </child>
++            <child>
++              <widget class="GtkVBox" id="vbox4">
++                <property name="visible">True</property>
++                <property name="spacing">6</property>
++                <child>
++                  <widget class="GtkLabel" id="label19">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">&lt;span weight="bold"&gt;Board size&lt;/span&gt;</property>
++                    <property name="use_markup">True</property>
++                  </widget>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkHBox" id="hbox5">
++                    <property name="visible">True</property>
++                    <property name="spacing">6</property>
++                    <child>
++                      <widget class="GtkLabel" id="label22">
++                        <property name="visible">True</property>
++                      </widget>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <widget class="GtkRadioButton" id="smallRadiobutton">
++                        <property name="visible">True</property>
++                        <property name="can_focus">True</property>
++                        <property name="label" translatable="yes">Small</property>
++                        <property name="use_underline">True</property>
++                        <property name="draw_indicator">True</property>
++                        <signal name="toggled" handler="on_smallRadiobutton_toggled"/>
++                      </widget>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                  </widget>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkHBox" id="hbox6">
++                    <property name="visible">True</property>
++                    <property name="spacing">6</property>
++                    <child>
++                      <widget class="GtkLabel" id="label23">
++                        <property name="visible">True</property>
++                      </widget>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <widget class="GtkRadioButton" id="mediumRadiobutton">
++                        <property name="visible">True</property>
++                        <property name="can_focus">True</property>
++                        <property name="label" translatable="yes">Medium</property>
++                        <property name="use_underline">True</property>
++                        <property name="draw_indicator">True</property>
++                        <property name="group">smallRadiobutton</property>
++                        <signal name="toggled" handler="on_mediumRadiobutton_toggled"/>
++                      </widget>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                  </widget>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">2</property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkHBox" id="hbox7">
++                    <property name="visible">True</property>
++                    <property name="spacing">6</property>
++                    <child>
++                      <widget class="GtkLabel" id="label24">
++                        <property name="visible">True</property>
++                      </widget>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <widget class="GtkRadioButton" id="largeRadiobutton">
++                        <property name="visible">True</property>
++                        <property name="can_focus">True</property>
++                        <property name="label" translatable="yes">Large</property>
++                        <property name="use_underline">True</property>
++                        <property name="draw_indicator">True</property>
++                        <property name="group">smallRadiobutton</property>
++                        <signal name="toggled" handler="on_largeRadiobutton_toggled"/>
++                      </widget>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                  </widget>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">3</property>
++                  </packing>
++                </child>
++              </widget>
++              <packing>
++                <property name="position">1</property>
++              </packing>
++            </child>
++            <child>
++              <widget class="GtkCheckButton" id="music_checkbutton">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++                <property name="label" translatable="yes">Play background music</property>
++                <property name="draw_indicator">True</property>
++                <signal name="toggled" handler="on_music_checkbutton_toggled"/>
++              </widget>
++              <packing>
++                <property name="position">2</property>
++              </packing>
++            </child>
++          </widget>
++          <packing>
++            <property name="position">1</property>
++          </packing>
++        </child>
++        <child internal-child="action_area">
++          <widget class="GtkHButtonBox" id="dialog-action_area1">
++            <property name="visible">True</property>
++            <property name="layout_style">GTK_BUTTONBOX_END</property>
++            <child>
++              <widget class="GtkButton" id="closebutton1">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="can_default">True</property>
++                <property name="label">gtk-close</property>
++                <property name="use_stock">True</property>
++                <property name="response_id">-7</property>
++                <signal name="clicked" handler="on_closebutton1_clicked"/>
++              </widget>
++            </child>
++          </widget>
++          <packing>
++            <property name="expand">False</property>
++            <property name="pack_type">GTK_PACK_END</property>
++          </packing>
++        </child>
++      </widget>
++    </child>
++  </widget>
++  <widget class="GtkDialog" id="highscoresDialog">
++    <property name="border_width">12</property>
++    <property name="title" translatable="yes">Highscores</property>
++    <property name="resizable">False</property>
++    <property name="icon">gweled_icon.png</property>
++    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
++    <property name="has_separator">False</property>
++    <signal name="delete_event" handler="on_highscoresDialog_delete_event"/>
++    <child internal-child="vbox">
++      <widget class="GtkVBox" id="dialog-vbox2">
++        <property name="visible">True</property>
++        <property name="spacing">6</property>
++        <child>
++          <widget class="GtkVBox" id="vbox6">
++            <property name="visible">True</property>
++            <property name="spacing">18</property>
++            <child>
++              <widget class="GtkLabel" id="label27">
++                <property name="visible">True</property>
++                <property name="label" translatable="yes">&lt;span weight="bold"&gt;Highscores&lt;/span&gt;</property>
++                <property name="use_markup">True</property>
++              </widget>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++              </packing>
++            </child>
++            <child>
++              <widget class="GtkTable" id="table7">
++                <property name="visible">True</property>
++                <property name="border_width">6</property>
++                <property name="n_rows">10</property>
++                <property name="n_columns">3</property>
++                <property name="column_spacing">12</property>
++                <property name="row_spacing">6</property>
++                <child>
++                  <widget class="GtkLabel" id="nameLabel05">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">1</property>
++                    <property name="right_attach">2</property>
++                    <property name="top_attach">4</property>
++                    <property name="bottom_attach">5</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="scoreLabel10">
++                    <property name="visible">True</property>
++                    <property name="xalign">1</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">2</property>
++                    <property name="right_attach">3</property>
++                    <property name="top_attach">9</property>
++                    <property name="bottom_attach">10</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="scoreLabel09">
++                    <property name="visible">True</property>
++                    <property name="xalign">1</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">2</property>
++                    <property name="right_attach">3</property>
++                    <property name="top_attach">8</property>
++                    <property name="bottom_attach">9</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="scoreLabel08">
++                    <property name="visible">True</property>
++                    <property name="xalign">1</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">2</property>
++                    <property name="right_attach">3</property>
++                    <property name="top_attach">7</property>
++                    <property name="bottom_attach">8</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="scoreLabel07">
++                    <property name="visible">True</property>
++                    <property name="xalign">1</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">2</property>
++                    <property name="right_attach">3</property>
++                    <property name="top_attach">6</property>
++                    <property name="bottom_attach">7</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="scoreLabel06">
++                    <property name="visible">True</property>
++                    <property name="xalign">1</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">2</property>
++                    <property name="right_attach">3</property>
++                    <property name="top_attach">5</property>
++                    <property name="bottom_attach">6</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="scoreLabel05">
++                    <property name="visible">True</property>
++                    <property name="xalign">1</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">2</property>
++                    <property name="right_attach">3</property>
++                    <property name="top_attach">4</property>
++                    <property name="bottom_attach">5</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="scoreLabel04">
++                    <property name="visible">True</property>
++                    <property name="xalign">1</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">2</property>
++                    <property name="right_attach">3</property>
++                    <property name="top_attach">3</property>
++                    <property name="bottom_attach">4</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="scoreLabel03">
++                    <property name="visible">True</property>
++                    <property name="xalign">1</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">2</property>
++                    <property name="right_attach">3</property>
++                    <property name="top_attach">2</property>
++                    <property name="bottom_attach">3</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="scoreLabel02">
++                    <property name="visible">True</property>
++                    <property name="xalign">1</property>
++                    <property name="label" translatable="yes">100</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">2</property>
++                    <property name="right_attach">3</property>
++                    <property name="top_attach">1</property>
++                    <property name="bottom_attach">2</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="scoreLabel01">
++                    <property name="visible">True</property>
++                    <property name="xalign">1</property>
++                    <property name="label" translatable="yes">10000</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">2</property>
++                    <property name="right_attach">3</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="nameLabel10">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">1</property>
++                    <property name="right_attach">2</property>
++                    <property name="top_attach">9</property>
++                    <property name="bottom_attach">10</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="nameLabel09">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">1</property>
++                    <property name="right_attach">2</property>
++                    <property name="top_attach">8</property>
++                    <property name="bottom_attach">9</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="nameLabel08">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">1</property>
++                    <property name="right_attach">2</property>
++                    <property name="top_attach">7</property>
++                    <property name="bottom_attach">8</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="nameLabel07">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">1</property>
++                    <property name="right_attach">2</property>
++                    <property name="top_attach">6</property>
++                    <property name="bottom_attach">7</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="nameLabel06">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">1</property>
++                    <property name="right_attach">2</property>
++                    <property name="top_attach">5</property>
++                    <property name="bottom_attach">6</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="nameLabel04">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">1</property>
++                    <property name="right_attach">2</property>
++                    <property name="top_attach">3</property>
++                    <property name="bottom_attach">4</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="nameLabel03">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">1</property>
++                    <property name="right_attach">2</property>
++                    <property name="top_attach">2</property>
++                    <property name="bottom_attach">3</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="nameLabel02">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">1</property>
++                    <property name="right_attach">2</property>
++                    <property name="top_attach">1</property>
++                    <property name="bottom_attach">2</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="nameLabel01">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">Sebastien Delestaing</property>
++                  </widget>
++                  <packing>
++                    <property name="left_attach">1</property>
++                    <property name="right_attach">2</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="label37">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">10.</property>
++                  </widget>
++                  <packing>
++                    <property name="top_attach">9</property>
++                    <property name="bottom_attach">10</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="label36">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">9.</property>
++                  </widget>
++                  <packing>
++                    <property name="top_attach">8</property>
++                    <property name="bottom_attach">9</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="label35">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">8.</property>
++                  </widget>
++                  <packing>
++                    <property name="top_attach">7</property>
++                    <property name="bottom_attach">8</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="label34">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">7.</property>
++                  </widget>
++                  <packing>
++                    <property name="top_attach">6</property>
++                    <property name="bottom_attach">7</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="label33">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">6.</property>
++                  </widget>
++                  <packing>
++                    <property name="top_attach">5</property>
++                    <property name="bottom_attach">6</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="label32">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">5.</property>
++                  </widget>
++                  <packing>
++                    <property name="top_attach">4</property>
++                    <property name="bottom_attach">5</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="label31">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">4.</property>
++                  </widget>
++                  <packing>
++                    <property name="top_attach">3</property>
++                    <property name="bottom_attach">4</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="label30">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">3.</property>
++                  </widget>
++                  <packing>
++                    <property name="top_attach">2</property>
++                    <property name="bottom_attach">3</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="label29">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">2.</property>
++                  </widget>
++                  <packing>
++                    <property name="top_attach">1</property>
++                    <property name="bottom_attach">2</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="label28">
++                    <property name="visible">True</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">1.</property>
++                  </widget>
++                  <packing>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"></property>
++                  </packing>
++                </child>
++              </widget>
++              <packing>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </widget>
++          <packing>
++            <property name="position">1</property>
++          </packing>
++        </child>
++        <child internal-child="action_area">
++          <widget class="GtkHButtonBox" id="dialog-action_area2">
++            <property name="visible">True</property>
++            <property name="layout_style">GTK_BUTTONBOX_END</property>
++            <child>
++              <widget class="GtkButton" id="closebutton2">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="can_default">True</property>
++                <property name="label">gtk-close</property>
++                <property name="use_stock">True</property>
++                <property name="response_id">-7</property>
++                <signal name="clicked" handler="on_closebutton2_clicked"/>
++              </widget>
++            </child>
++          </widget>
++          <packing>
++            <property name="expand">False</property>
++            <property name="pack_type">GTK_PACK_END</property>
++          </packing>
++        </child>
++      </widget>
++    </child>
++  </widget>
+ </glade-interface>
+diff -Nur -x '*.orig' -x '*~' gweled-0.7/src/main.c gweled-0.7.new/src/main.c
+--- gweled-0.7/src/main.c	2008-06-15 21:54:34.000000000 +0200
++++ gweled-0.7.new/src/main.c	2008-06-15 21:57:33.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include "sge_core.h"
+ #include "board_engine.h"
+ #include "graphic_engine.h"
++#include "music.h"
+ 
+ // GLOBALS
+ GnomeProgram *g_program;
+@@ -51,11 +52,12 @@
+ GRand *g_random_generator;
+ 
+ GweledPrefs prefs;
++pthread_t thread;
+ 
+-MODULE *module;
++/*MODULE *module;*/
+ SAMPLE *swap_sfx, *click_sfx;
+ 
+-static pthread_t thread;
++/*static pthread_t thread;*/
+ 
+ void save_preferences(void)
+ {
+@@ -91,6 +93,7 @@
+ 		prefs.tile_width = 48;
+ 		prefs.tile_height = 48;
+ 		prefs.timer_mode = FALSE;
++		prefs.music_on = TRUE;
+ 
+ 		save_preferences();	
+ 	}
+@@ -122,6 +125,13 @@
+ 	}
+ 	if (radio_button)
+ 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(radio_button), TRUE);
++		
++	//Is the music playing at start ?
++	radio_button = glade_xml_get_widget(gweled_xml, "music_checkbutton");
++	if (prefs.music_on)
++		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(radio_button), TRUE);
++	else
++		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(radio_button), FALSE);
+ }
+ 
+ void show_hiscores (int newscore_rank)
+@@ -232,15 +242,6 @@
+  		gtk_widget_destroy (box);
+  	}
+ }
+- 
+-
+-void mikmod_thread(void *ptr)
+-{
+-	while (1) {
+-	    usleep(10000);
+-		MikMod_Update();
+-    }
+-}
+ 	
+ int main (int argc, char **argv)
+ {
+@@ -253,19 +254,7 @@
+ 				argv, GNOME_PARAM_APP_DATADIR,
+ 				PACKAGE_DATA_DIR, NULL);
+ 
+-    /* register all the drivers */
+-    MikMod_RegisterAllDrivers();
+-
+-    /* register all the module loaders */
+-    MikMod_RegisterAllLoaders();
+-
+-    /* initialize the library */
+-    if (MikMod_Init(""))
+-	{
+-        fprintf(stderr, "Could not initialize sound, reason: %s\n", MikMod_strerror(MikMod_errno));
+-        //return; don't fail on sound problems
+-    }
+-
++	music_init ();
+ 	sge_init ();
+ 
+ 	g_random_generator = g_rand_new_with_seed (time (NULL));
+@@ -305,9 +294,6 @@
+ 
+ 	gi_game_running = 0;
+ 
+-    // load module
+-    module = Player_Load(PACKAGE_DATA_DIR "/sounds/gweled/autonom.s3m", 64, 0);
+-
+ 	// load sound fx
+     swap_sfx = Sample_Load(PACKAGE_DATA_DIR "/sounds/gweled/swap.wav");
+     if (!swap_sfx) {
+@@ -330,13 +316,8 @@
+ 
+     MikMod_EnableOutput();
+ 
+-    if (module) {
+-        Player_Start(module);
+-		Player_SetVolume(64);
+-		pthread_create(&thread, NULL, (void *)&mikmod_thread, NULL);
+-
+-    } else
+-        fprintf(stderr, "Could not load module, reason: %s\n", MikMod_strerror(MikMod_errno));
++	if (prefs.music_on)  
++		music_play();
+ 
+ 	board_engine_id = gtk_timeout_add (100, board_engine_loop, NULL);
+ 	sge_set_drawing_area (g_drawing_area, g_buffer_pixmap,
+@@ -353,15 +334,10 @@
+ 	sge_destroy ();
+ 	gtk_timeout_remove (board_engine_id);
+ 	g_rand_free (g_random_generator);
+-	g_object_unref(G_OBJECT(gweled_xml));	
++	g_object_unref(G_OBJECT(gweled_xml));
++	
++	music_stop();	
+ 
+-    if (module)
+-	{
+-		pthread_cancel(thread);
+-		pthread_join(thread, NULL);
+-	    Player_Stop();
+-	    Player_Free(module);
+-	}
+ 	if(swap_sfx)
+ 		Sample_Free(swap_sfx);
+ 	if(click_sfx)
+diff -Nur -x '*.orig' -x '*~' gweled-0.7/src/Makefile.am gweled-0.7.new/src/Makefile.am
+--- gweled-0.7/src/Makefile.am	2003-12-11 00:00:00.000000000 +0100
++++ gweled-0.7.new/src/Makefile.am	2008-06-15 21:54:54.000000000 +0200
+@@ -13,7 +13,8 @@
+ 	graphic_engine.c graphic_engine.h \
+ 	sge_core.c sge_core.h \
+ 	sge_utils.c sge_utils.h \
+-	callbacks.c callbacks.h
++	music.c music.h \
++	callbacks.c callbacks.h 
+ 
+ EXTRA_DIST =			\
+ 	$(Data_DATA)
+diff -Nur -x '*.orig' -x '*~' gweled-0.7/src/Makefile.in gweled-0.7.new/src/Makefile.in
+--- gweled-0.7/src/Makefile.in	2005-05-25 21:41:41.000000000 +0200
++++ gweled-0.7.new/src/Makefile.in	2008-06-15 21:54:54.000000000 +0200
+@@ -51,7 +51,7 @@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_gweled_OBJECTS = main.$(OBJEXT) board_engine.$(OBJEXT) \
+-	graphic_engine.$(OBJEXT) sge_core.$(OBJEXT) \
++	graphic_engine.$(OBJEXT) sge_core.$(OBJEXT) music.$(OBJEXT) \
+ 	sge_utils.$(OBJEXT) callbacks.$(OBJEXT)
+ gweled_OBJECTS = $(am_gweled_OBJECTS)
+ gweled_DEPENDENCIES =
+@@ -165,6 +165,7 @@
+ 	main.c \
+ 	board_engine.c board_engine.h \
+ 	graphic_engine.c graphic_engine.h \
++	music.c music.h \
+ 	sge_core.c sge_core.h \
+ 	sge_utils.c sge_utils.h \
+ 	callbacks.c callbacks.h
+@@ -248,6 +249,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/board_engine.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/callbacks.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/graphic_engine.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/music.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sge_core.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sge_utils.Po at am__quote@
+diff -Nur -x '*.orig' -x '*~' gweled-0.7/src/music.c gweled-0.7.new/src/music.c
+--- gweled-0.7/src/music.c	1970-01-01 01:00:00.000000000 +0100
++++ gweled-0.7.new/src/music.c	2008-06-15 21:54:54.000000000 +0200
+@@ -0,0 +1,84 @@
++
++
++#include <mikmod.h>
++#include <pthread.h>
++#include <glib.h>
++
++#include "music.h"
++#include "board_engine.h"
++
++extern GweledPrefs prefs;
++extern pthread_t thread;
++
++static MODULE *module;
++static gboolean is_playing;
++
++void music_init()
++{
++    /* register all the drivers */
++    MikMod_RegisterDriver(&drv_AF);
++    MikMod_RegisterDriver(&drv_esd);
++    MikMod_RegisterDriver(&drv_alsa);
++    MikMod_RegisterDriver(&drv_oss);
++    MikMod_RegisterDriver(&drv_nos);
++
++    /* register all the module loaders */
++    MikMod_RegisterAllLoaders();
++
++    /* initialize the library */
++    if (MikMod_Init(""))
++	{
++        fprintf(stderr, "Could not initialize sound, reason: %s\n", MikMod_strerror(MikMod_errno));
++        //return; don't fail on sound problems
++    }
++    is_playing = FALSE;
++
++}
++
++void music_thread(void *ptr)
++{
++	while (1) {
++	    usleep(10000);
++		MikMod_Update();
++    }
++}
++
++void music_play()
++{
++	if (!music_isplaying())
++	{
++	    // load module
++	    module = Player_Load(PACKAGE_DATA_DIR "/sounds/gweled/autonom.s3m", 64, 0);
++    	if (module) {
++    	    Player_Start(module);
++			Player_SetVolume(64);
++			pthread_create(&thread, NULL, (void *)&music_thread, NULL);
++			prefs.music_on = TRUE;
++			is_playing = TRUE;
++
++    	} else
++    	    fprintf(stderr, "Could not load module, reason: %s\n", MikMod_strerror(MikMod_errno));
++	}
++}
++
++void music_stop()
++{
++	if (music_isplaying()){
++    	if (module)
++		{
++	    	Player_Stop();
++	    	Player_Free(module);
++			pthread_cancel(thread);
++			pthread_join(thread, NULL);
++	    	prefs.music_on = FALSE;
++	    	is_playing = FALSE;
++		}
++	}
++
++}
++
++gboolean music_isplaying()
++{
++	return is_playing;
++}
++
+diff -Nur -x '*.orig' -x '*~' gweled-0.7/src/music.h gweled-0.7.new/src/music.h
+--- gweled-0.7/src/music.h	1970-01-01 01:00:00.000000000 +0100
++++ gweled-0.7.new/src/music.h	2008-06-15 21:54:54.000000000 +0200
+@@ -0,0 +1,9 @@
++#include <mikmod.h>
++
++void music_init();
++void music_thread(void *ptr);
++void music_play();
++void music_stop();
++int music_isplaying();
++
++

Added: packages/unstable/gweled/debian/patches/xdg_pref.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gweled/debian/patches/xdg_pref.diff?rev=16274&op=file
==============================================================================
--- packages/unstable/gweled/debian/patches/xdg_pref.diff (added)
+++ packages/unstable/gweled/debian/patches/xdg_pref.diff Sun Jun 15 20:24:08 2008
@@ -1,0 +1,21 @@
+diff -Nur -x '*.orig' -x '*~' gweled-0.7/src/main.c gweled-0.7.new/src/main.c
+--- gweled-0.7/src/main.c	2008-04-07 20:22:22.000000000 +0200
++++ gweled-0.7.new/src/main.c	2008-04-07 20:22:42.000000000 +0200
+@@ -62,7 +62,7 @@
+ 	gchar *filename;
+ 	FILE *stream;
+ 
+-	filename = g_strconcat(g_get_home_dir(), "/.gweled", NULL);
++	filename = g_strconcat(g_get_user_config_dir(), "/gweled", NULL);
+ 	stream = fopen(filename, "w");
+ 	if(stream)
+ 	{
+@@ -78,7 +78,7 @@
+ 	char *filename;
+ 	FILE *stream;
+ 
+-	filename = g_strconcat(g_get_home_dir(), "/.gweled", NULL);
++	filename = g_strconcat(g_get_user_config_dir(), "/gweled", NULL);
+ 
+ 	stream = fopen(filename, "r");
+ 	if(stream)




More information about the pkg-gnome-commits mailing list