[gbrainy] Bug fix# 654225 - remove libgnome support (deprecated lib)



commit ba354e7ec8481ce0875ce297f8092847b4119155
Author: Jordi Mas <jmas softcatala org>
Date:   Tue Jul 12 17:10:44 2011 +0200

    Bug fix# 654225 - remove libgnome support (deprecated lib)

 configure.ac                      |   14 --------------
 src/Clients/Classical/Makefile.am |    1 -
 src/Clients/Classical/gbrainy.cs  |   26 +-------------------------
 3 files changed, 1 insertions(+), 40 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fe1ef6e..e418381 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,19 +157,6 @@ if test "x$enable_debug" != "xno" ; then
 	CSC_DEFINES="$CSC_DEFINES -debug -d:DEBUG"
 fi
 
-dnl --- Gnome support
-
-AC_ARG_ENABLE(gnome,
-	AC_HELP_STRING([--enable-gnome],
-		[Compile with GNOME support [default=yes]]),
-		enable_gnome=$enableval, enable_gnome=yes)
-
-if test "x$enable_gnome" != "xno" ; then
-	PKG_CHECK_MODULES(GNOME,gnome-sharp-2.0 >= $GTKSHARP_REQUIRED)
-	AC_SUBST(GNOME_LIBS)
-	CSC_DEFINES="$CSC_DEFINES -d:GNOME"
-fi
-
 dnl --- Assembly information
 
 BUILD_TIME=`date +"%F %T %Z"`
@@ -220,7 +207,6 @@ help/Makefile
 tools/Defines.cs
 ])
 
-echo "GNOME enabled:		${enable_gnome}"
 echo "Mono-addins:		${enable_addins_sharp}"
 echo "NUnit:			${enable_tests}"
 echo "Debug enabled:		${enable_debug}"
diff --git a/src/Clients/Classical/Makefile.am b/src/Clients/Classical/Makefile.am
index 7d5caf5..c2a987c 100644
--- a/src/Clients/Classical/Makefile.am
+++ b/src/Clients/Classical/Makefile.am
@@ -26,7 +26,6 @@ GBRAINY_CSDISTFILES =					\
 ASSEMBLIES = \
 	 $(GBRAINY_LIBS)    		\
 	 $(MONO_ADDINS_LIBS)    	\
-	 $(GNOME_LIBS)    		\
 	-r:Mono.Cairo.dll		\
 	-r:../../gbrainy.Core.dll	\
 	-r:Mono.Posix
diff --git a/src/Clients/Classical/gbrainy.cs b/src/Clients/Classical/gbrainy.cs
index 9b2004d..6cb8efa 100644
--- a/src/Clients/Classical/gbrainy.cs
+++ b/src/Clients/Classical/gbrainy.cs
@@ -35,16 +35,9 @@ using Mono.Addins;
 using Mono.Addins.Setup;
 #endif
 
-#if GNOME
-using Gnome;
-#endif
-
 namespace gbrainy.Clients.Classical
 {
 	public class GtkClient
-#if GNOME
-		: Program
-#endif
 	{
 		[GtkBeans.Builder.Object("gbrainy")] Gtk.Window app_window;
 		[GtkBeans.Builder.Object] Gtk.CheckMenuItem showtoolbar_menuitem;
@@ -82,9 +75,6 @@ namespace gbrainy.Clients.Classical
 		public readonly int MIN_TRANSLATION = 80;
 
 		public GtkClient ()
-#if GNOME
-		: base ("gbrainy", Defines.VERSION, Modules.UI, new string [0])
-#endif
 		{
 			if (Preferences.Get <bool> (Preferences.EnglishKey) == false)
 			{
@@ -448,21 +438,12 @@ namespace gbrainy.Clients.Classical
 
 		void OnQuit (object sender, EventArgs args)
 		{
-#if GNOME
-			Quit ();
-#else
 			Gtk.Application.Quit ();
-#endif
-
 		}
 
 		void OnDeleteWindow (object sender, DeleteEventArgs args)
 		{
-#if GNOME
-			Quit ();
-#else
 			Gtk.Application.Quit ();
-#endif
 		}
 
 		void OnNextButtonClicked (object sender, EventArgs args)
@@ -762,9 +743,8 @@ namespace gbrainy.Clients.Classical
 
 			if (line.Continue == false)
 				return;
-#if !GNOME
+
 			Gtk.Application.Init ();
-#endif
 
 			app.Initialize ();
 			// Set RandomOrder before setting the custom list then it has effect of custom games
@@ -778,11 +758,7 @@ namespace gbrainy.Clients.Classical
 
 			TimeSpan span = DateTime.Now - start_time;
 			Console.WriteLine (Catalog.GetString ("Startup time {0}"), span);
-#if GNOME
-			app.Run ();
-#else
 			Gtk.Application.Run ();
-#endif
 		}
 	}
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]