GNOME.org
 

[f-spot] remove unused glitz-sharp

commit f8a3e86d8c4071fb793adbdf7b22fb37a5476a92
Author: Stephane Delcroix <stephane delcroix org>
Date:   Thu Aug 20 17:16:41 2009 +0200

    remove unused glitz-sharp

 Makefile.include                     |    2 -
 configure.ac                         |    2 -
 lib/Makefile.am                      |    1 -
 lib/glitz-sharp/.gitignore           |    4 -
 lib/glitz-sharp/COPYING              |   20 --
 lib/glitz-sharp/Makefile.am          |    3 -
 lib/glitz-sharp/src/.gitignore       |    4 -
 lib/glitz-sharp/src/Buffer.cs        |   68 -----
 lib/glitz-sharp/src/Context.cs       |   77 ------
 lib/glitz-sharp/src/Demo.cs          |  211 ---------------
 lib/glitz-sharp/src/Drawable.cs      |  118 --------
 lib/glitz-sharp/src/Glitz.cs         |  496 ----------------------------------
 lib/glitz-sharp/src/GlitzSurface.cs  |   47 ----
 lib/glitz-sharp/src/Makefile.am      |   31 ---
 lib/glitz-sharp/src/Surface.cs       |  156 -----------
 lib/glitz-sharp/src/TextureObject.cs |   70 -----
 src/GdkGlx.cs                        |   20 --
 src/Makefile.am                      |    1 -
 src/Utils/CairoUtils.cs              |   30 --
 src/Widgets/ImageDisplay.cs          |    3 -
 src/f-spot.in                        |    2 +-
 21 files changed, 1 insertions(+), 1365 deletions(-)
---
diff --git a/Makefile.include b/Makefile.include
index ca739b8..f7cd9a4 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -8,7 +8,6 @@ DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
 DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
 DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
 DIR_ICONS = $(top_builddir)/icons
 DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
@@ -22,7 +21,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
 ## Links
 
 LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
 LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
 LINK_MONO_ADDINS =					\
 	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
diff --git a/configure.ac b/configure.ac
index d1a4e85..79cd96d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -298,8 +298,6 @@ lib/GKeyFile/Makefile
 lib/gio-sharp/Makefile
 lib/gio-sharp/gio/Makefile
 lib/gio-sharp/generator/Makefile
-lib/glitz-sharp/Makefile
-lib/glitz-sharp/src/Makefile
 lib/gnome-keyring-sharp/Makefile
 lib/gtk-sharp-beans/Makefile
 lib/libfspot/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d1480d7..abe2bd5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,7 +4,6 @@
 UNCONDITIONAL_SUBDIRS = \
 	GKeyFile 			\
 	gio-sharp			\
-	glitz-sharp			\
 	gnome-keyring-sharp	\
 	gtk-sharp-beans		\
 	libjpegtran			\
diff --git a/src/GdkGlx.cs b/src/GdkGlx.cs
index fa6c482..0f3040d 100644
--- a/src/GdkGlx.cs
+++ b/src/GdkGlx.cs
@@ -88,26 +88,6 @@ namespace GdkGlx {
 			public int bits_per_rgb;
 		}
 
-#if false
-		public Gdk.Colormap GetColormap (Gdk.Screen screen, )
-		{
-			DrawableFormat template = new DrawableFormat ();
-			template.Color = new ColorFormat ();
-			FormatMask mask = FormatMask.None;
-			int num = screen.Number;
-			
-			IntPtr dformat = GlitzAPI.glitz_glx_find_window_format (GdkUtils.GetXDisplay (screen.Display), 
-										num, 
-										mask, 
-										ref template,
-										0);
-			
-			visual_info = GlitzAPI.glitz_glx_get_visual_info_from_format (dpy, scr, dformat);
-			Gdk.Visual visual = new Gdk.Visual (gdkx_visual_get (XVisualIDFromVisual (vinfo)));					
-			new Gdk.Colormap (visual, true);
-			*/
-		}
-#endif
 		public Gdk.Colormap GetColormap ()
 		{
 			return new Gdk.Colormap (visual, false);
diff --git a/src/Makefile.am b/src/Makefile.am
index 1520728..b4f53e3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -339,7 +339,6 @@ UTILS_ASSEMBLIES =				\
 	-pkg:gnome-sharp-2.0			\
 	-r:Mono.Posix				\
 	-r:Mono.Cairo				\
-	$(LINK_GLITZ)				\
 	$(GCONF_PKG)
 
 JOBSCHEDULER_ASSEMBLIES =			\
diff --git a/src/Utils/CairoUtils.cs b/src/Utils/CairoUtils.cs
index 1bf5c39..9de10bd 100644
--- a/src/Utils/CairoUtils.cs
+++ b/src/Utils/CairoUtils.cs
@@ -24,35 +24,5 @@ namespace FSpot.Utils {
 							       width, height);
 			return surface;
 		}
-		
-		public static Surface CreateGlitzSurface (Gdk.Drawable d)
-		{
-
-			Console.WriteLine ("XvisID: " + GdkUtils.GetXVisualId (d.Visual));
-			IntPtr fmt = NDesk.Glitz.GlitzAPI.glitz_glx_find_drawable_format_for_visual (GdkUtils.GetXDisplay (d.Display), 
-												     d.Screen.Number, 
-												     GdkUtils.GetXVisualId (d.Visual));
-			
-			Console.WriteLine ("fmt: " + fmt);
-			
-			uint w = 100, h = 100;
-			IntPtr glitz_drawable = NDesk.Glitz.GlitzAPI.glitz_glx_create_drawable_for_window (GdkUtils.GetXDisplay (d.Display),
-													   d.Screen.Number, 
-													   fmt,      
-													   GdkUtils.GetXid (d), w, h);
-			
-			NDesk.Glitz.Drawable ggd = new NDesk.Glitz.Drawable (glitz_drawable);
-			IntPtr glitz_format = ggd.FindStandardFormat (NDesk.Glitz.FormatName.ARGB32);
-			
-			NDesk.Glitz.Surface ggs = new NDesk.Glitz.Surface (ggd, glitz_format, 100, 100, 0, IntPtr.Zero);
-			Console.WriteLine (ggd.Features);
-			bool doublebuffer = false;
-			ggs.Attach (ggd, doublebuffer ? NDesk.Glitz.DrawableBuffer.BackColor : NDesk.Glitz.DrawableBuffer.FrontColor);
-			
-			//GlitzAPI.glitz_drawable_destroy (glitz_drawable);
-			GlitzSurface gs = new GlitzSurface (ggs.Handle);
-			
-			return gs;
-		}
 	}
 }
diff --git a/src/Widgets/ImageDisplay.cs b/src/Widgets/ImageDisplay.cs
index 5be2044..7429656 100644
--- a/src/Widgets/ImageDisplay.cs
+++ b/src/Widgets/ImageDisplay.cs
@@ -191,8 +191,6 @@ namespace FSpot.Widgets {
 			base.OnExposeEvent (args);
 
 			Context ctx = Gdk.CairoHelper.Create (GdkWindow);
-			//Surface glitz = CairoUtils.CreateGlitzSurface (GdkWindow);
-			//Context ctx = new Context (glitz);
 			if (double_buffer) {
 				ImageSurface cim = new ImageSurface (Format.RGB24, 
 								     Allocation.Width, 
@@ -215,7 +213,6 @@ namespace FSpot.Widgets {
 				OnExpose (ctx, args.Region);
 			}
 
-			//glitz.Flush ();
 			((IDisposable)ctx).Dispose ();
 			return true;
 		}
diff --git a/src/f-spot.in b/src/f-spot.in
index 2a64926..8a26d51 100644
--- a/src/f-spot.in
+++ b/src/f-spot.in
@@ -60,7 +60,7 @@ for arg in "$@"; do
 	x--uninstalled)
 	    echo "*** Running uninstalled f-spot ***"
 	    EXE_TO_RUN="./f-spot.exe"
-	    export MONO_PATH=../lib/gnome-keyring-sharp:../lib/libgphoto2-sharp:../lib/semweb:../lib/glitz-sharp/src/:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../lib/gio-sharp/gio:../lib/gtk-sharp-beans:$MONO_PATH
+	    export MONO_PATH=../lib/gnome-keyring-sharp:../lib/libgphoto2-sharp:../lib/semweb:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../lib/gio-sharp/gio:../lib/gtk-sharp-beans:$MONO_PATH
 	    ;;
     esac
 done
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]