[Pkg-mono-svn-commits] rev 2534 - in gtk-sharp2/trunk/debian: . patches

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-05-03 20:44:24 +0000 (Wed, 03 May 2006)
New Revision: 2534

Removed:
   gtk-sharp2/trunk/debian/patches/06_fix-custom-cellrenderes.dpatch
Modified:
   gtk-sharp2/trunk/debian/changelog
   gtk-sharp2/trunk/debian/patches/00list
Log:
* dropped one patch again as it has undesired side-effects


Modified: gtk-sharp2/trunk/debian/changelog
===================================================================
--- gtk-sharp2/trunk/debian/changelog	2006-05-03 18:01:08 UTC (rev 2533)
+++ gtk-sharp2/trunk/debian/changelog	2006-05-03 20:44:24 UTC (rev 2534)
@@ -13,10 +13,6 @@
       - Fix signature of Gdk.Drawable.DrawPoints(). The old version was
         completely wrong and would segfault everything using it.
         http://bugzilla.ximian.com/show_bug.cgi?id=77942
-    + debian/patches/06_fix-custom-cellrenderes.dpatch:
-      - Fix subclasses of Gtk.CellRenderer to not return null but something
-        useful for GetSize(), Render(), and StartEditing().
-        http://bugzilla.ximian.com/show_bug.cgi?id=77949
 
  -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Fri, 14 Apr 2006 12:48:02 +0200
 

Modified: gtk-sharp2/trunk/debian/patches/00list
===================================================================
--- gtk-sharp2/trunk/debian/patches/00list	2006-05-03 18:01:08 UTC (rev 2533)
+++ gtk-sharp2/trunk/debian/patches/00list	2006-05-03 20:44:24 UTC (rev 2534)
@@ -3,4 +3,3 @@
 03_gnomevfs-mimetype-pinvokes.dpatch
 04_list-to-array-marshalling.dpatch
 05_gdk-drawable.dpatch
-06_fix-custom-cellrenderes.dpatch

Deleted: gtk-sharp2/trunk/debian/patches/06_fix-custom-cellrenderes.dpatch
===================================================================
--- gtk-sharp2/trunk/debian/patches/06_fix-custom-cellrenderes.dpatch	2006-05-03 18:01:08 UTC (rev 2533)
+++ gtk-sharp2/trunk/debian/patches/06_fix-custom-cellrenderes.dpatch	2006-05-03 20:44:24 UTC (rev 2534)
@@ -1,43 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- gtk-sharp/gtk/glue/cellrenderer.c	2004/06/25 18:42:19	30401
-+++ gtk-sharp/gtk/glue/cellrenderer.c	2006/04/20 07:55:08	59683
-@@ -26,9 +26,8 @@
- void
- gtksharp_cellrenderer_base_get_size (GtkCellRenderer *cell, GtkWidget *widget, GdkRectangle *cell_area, gint *x_offset, gint *y_offset, gint *width, gint *height)
- {
--	GtkCellRendererClass *parent = g_type_class_peek_parent (G_OBJECT_GET_CLASS (cell));
--	if (parent->get_size)
--		(*parent->get_size) (cell, widget, cell_area, x_offset, y_offset, width, height);
-+	if (GTK_CELL_RENDERER_GET_CLASS (cell)->get_size)
-+		GTK_CELL_RENDERER_GET_CLASS (cell)->get_size (cell, widget, cell_area, x_offset, y_offset, width, height);
- }
- 
- void gtksharp_cellrenderer_override_get_size (GType gtype, gpointer cb);
-@@ -47,9 +46,8 @@
- void
- gtksharp_cellrenderer_base_render (GtkCellRenderer *cell, GdkDrawable *window, GtkWidget *widget, GdkRectangle *background_area, GdkRectangle *cell_area, GdkRectangle *expose_area, GtkCellRendererState flags)
- {
--	GtkCellRendererClass *parent = g_type_class_peek_parent (G_OBJECT_GET_CLASS (cell));
--	if (parent->render)
--		(*parent->render) (cell, window, widget, background_area, cell_area, expose_area, flags);
-+	if (GTK_CELL_RENDERER_GET_CLASS (cell)->render)
-+		GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell, window, widget, background_area, cell_area, expose_area, flags);
- }
- 
- void gtksharp_cellrenderer_override_render (GType gtype, gpointer cb);
-@@ -68,9 +66,8 @@
- GtkCellEditable *
- gtksharp_cellrenderer_base_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path, GdkRectangle *background_area, GdkRectangle *cell_area, GtkCellRendererState flags)
- {
--        GtkCellRendererClass *parent = g_type_class_peek_parent (G_OBJECT_GET_CLASS (cell));
--        if (parent->start_editing)
--		return (*parent->start_editing) (cell, event, widget, path, background_area, cell_area, flags);
-+	if (GTK_CELL_RENDERER_GET_CLASS (cell)->start_editing)
-+		return GTK_CELL_RENDERER_GET_CLASS (cell)->start_editing (cell, event, widget, path, background_area, cell_area, flags);
- 	return NULL;	
- }
- 
-