[Pkg-sugar-commit] [sugar-artwork] 05/08: Add patch 1001 to avoid deprecated GTK API.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.84.1-7
in repository sugar-artwork.

commit cb1d827f55cb98ef5bdfdc04dd68ae813e97a5c5
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Jun 25 17:59:55 2010 +0200

    Add patch 1001 to avoid deprecated GTK API.
---
 debian/patches/1001_avoid_deprecated_GTK_API.patch | 67 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 68 insertions(+)

diff --git a/debian/patches/1001_avoid_deprecated_GTK_API.patch b/debian/patches/1001_avoid_deprecated_GTK_API.patch
new file mode 100644
index 0000000..fd8ea00
--- /dev/null
+++ b/debian/patches/1001_avoid_deprecated_GTK_API.patch
@@ -0,0 +1,67 @@
+Description: Do not use deprecated API
+Author: Aleksey Lim <alsroot at member.fsf.org>
+Origin: http://git.sugarlabs.org/projects/sugar-artwork/repos/mainline/commits/5d88c8943e14a0ca31af1dea86e743f869383567
+Bug: http://bugs.sugarlabs.org/ticket/1899
+Last-Update: 2010-06-25
+--- a/gtk/engine/sugar-info.c
++++ b/gtk/engine/sugar-info.c
+@@ -71,7 +71,7 @@
+     gdouble line_width = info->rc_style->line_width;
+ 
+     if (info->widget) {
+-        range_info->focused = GTK_WIDGET_HAS_FOCUS (info->widget);
++        range_info->focused = gtk_widget_has_focus (info->widget);
+     } else {
+         /* Fall back to unfocused and orientation from the width/height. */
+         range_info->focused = FALSE;
+--- a/gtk/engine/sugar-style.c
++++ b/gtk/engine/sugar-style.c
+@@ -394,7 +394,7 @@
+         sugar_draw_button (cr, &info);
+ 
+         /* Spinbutton focus hack. */
+-        if (widget && GTK_WIDGET_HAS_FOCUS (widget)) {
++        if (widget && gtk_widget_has_focus (widget)) {
+             /* Draw a focus for the spinbutton */
+             sugar_style_draw_focus (style, window, GTK_STATE_NORMAL, area, widget, detail, x, y, width, height);
+         }
+@@ -423,7 +423,7 @@
+ 
+             sugar_fill_generic_info (&info, style, state_type, shadow_type, widget, detail, x, y, width, height);
+             
+-            if (widget && !GTK_WIDGET_IS_SENSITIVE (widget))
++            if (widget && !gtk_widget_is_sensitive (widget))
+                 info.state = GTK_STATE_INSENSITIVE;
+ 
+             /* Needed because the trough and bar are cached in a buffer inside GtkProgress. */
+@@ -436,7 +436,7 @@
+ 
+             sugar_fill_generic_info (&info, style, state_type, shadow_type, widget, detail, x, y, width, height);
+             
+-            if (widget && !GTK_WIDGET_IS_SENSITIVE (widget))
++            if (widget && !gtk_widget_is_sensitive (widget))
+                 info.state = GTK_STATE_INSENSITIVE;
+             
+             if (widget && GTK_IS_PROGRESS_BAR (widget)) {
+@@ -563,7 +563,7 @@
+ {
+     /* Hack to change the entries background when it has the focus. */
+     if (DETAIL ("entry_bg")) {
+-        if (widget && GTK_WIDGET_HAS_FOCUS (widget)) {
++        if (widget && gtk_widget_has_focus (widget)) {
+             state_type = GTK_STATE_ACTIVE;
+         }
+     } else if (DETAIL ("radiobutton") || DETAIL ("checkbutton")) {
+@@ -616,10 +616,10 @@
+         /* XXX: This fakes an ACTIVE state for the focused entry.
+          *      Getting this changed in GTK+ with a style property would be cleaner
+          *      as that also works for the font colors. (see also draw_flat_box) */
+-        if (widget && GTK_WIDGET_HAS_FOCUS (widget)) {
++        if (widget && gtk_widget_has_focus (widget)) {
+             info.state = GTK_STATE_ACTIVE;
+         }
+-        if (widget && !GTK_WIDGET_IS_SENSITIVE (widget)) {
++        if (widget && !gtk_widget_is_sensitive (widget)) {
+             info.state = GTK_STATE_INSENSITIVE;
+         }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5f1e6f0..1895de7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+1001_avoid_deprecated_GTK_API.patch
 2001_empy_from_system.patch
 2991_empy_from_system_automade.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-artwork.git