Merge lp:~bratsche/ubuntu/natty/gtk-sharp2/has-resize-grip into lp:ubuntu/natty/gtk-sharp2

[Cody Russell]

This adds API to allow applications to access/modify the resize grip on GtkWindow by using GtkWindow.HasResizeGrip property. It's needed at least for gnome-do to disable the resize grips on its AppPaintable windows.

[lp:~bratsche/ubuntu/natty/gtk-sharp2/has-resize-grip]

44. By Cody Russell on 2011-01-19

Add comments.

45. By Cody Russell on 2011-01-19

Add changelog entry.

[Chris Halse Rogers (raof)]

Package version should be 2.12.10-1ubuntu1, rather than -1build2.

Since the patch adds API, you must also bump the clilibs version so that packages get correct dependencies. The simplest way to do this would be to append “-1ubuntu1” to the API_VERSION variable in debian/rules.

review: Needs Fixing

[Chris Halse Rogers (raof)]

I've fixed up my above concerns, and pushed to Natty. Thanks Cody!

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-22 11:28:45 +0000
+++ debian/changelog	2011-01-19 21:24:09 +0000
@@ -1,3 +1,10 @@
+gtk-sharp2 (2.12.10-1build2) UNRELEASED; urgency=low
+
+  * debian/patches/03_resize_grips.dpatch: Add GtkWindow.HasResizeGrip
+    property. (LP: 702642)
+
+ -- Cody Russell <[e-mail]>  Wed, 19 Jan 2011 15:19:50 -0600
+
 gtk-sharp2 (2.12.10-1build1) natty; urgency=low
 
   * No-changelog upload to drop sizable upstream changelogs.

=== modified file 'debian/patches/00list'
--- debian/patches/00list	2010-01-06 10:27:01 +0000
+++ debian/patches/00list	2011-01-19 21:24:09 +0000
@@ -1,3 +1,4 @@
 01_dllmaps.dpatch
 02_pcfiles.dpatch
+03_resize_grips.dpatch
 99_ltmain_as-needed

=== added file 'debian/patches/03_resize_grips.dpatch'
--- debian/patches/03_resize_grips.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_resize_grips.dpatch	2011-01-19 21:24:09 +0000
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_resize_grips.dpatch by Cody Russell <[e-mail]>
+## Author: Cody Russell <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds GtkWindow.HasResizeGrip property, needed in order to
+## DP: disable GTK+ resize grips for gnome-do windows.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gtk-sharp2~/gtk/gtk-api.raw gtk-sharp2/gtk/gtk-api.raw
+--- gtk-sharp2~/gtk/gtk-api.raw	2011-01-14 11:28:39.000000000 -0600
++++ gtk-sharp2/gtk/gtk-api.raw	2011-01-14 11:29:33.197652739 -0600
+@@ -19099,6 +19099,7 @@
+       <property name="Screen" cname="screen" type="GdkScreen" readable="true" writeable="true" />
+       <property name="IsActive" cname="is-active" type="gboolean" readable="true" />
+       <property name="HasToplevelFocus" cname="has-toplevel-focus" type="gboolean" readable="true" />
++      <property name="HasResizeGrip" cname="has-resize-grip" type="gboolean" readable="true" writeable="true" />
+       <property name="TypeHint" cname="type-hint" type="GdkWindowTypeHint" readable="true" writeable="true" />
+       <property name="SkipTaskbarHint" cname="skip-taskbar-hint" type="gboolean" readable="true" writeable="true" />
+       <property name="SkipPagerHint" cname="skip-pager-hint" type="gboolean" readable="true" writeable="true" />