From d545c161fba9c1b3614327f856084bc64a24d636 Mon Sep 17 00:00:00 2001
From: Eric Sandall
Date: Mon, 26 Apr 2010 11:10:01 -0700
Subject: emerald: Fix compilation with gtk+2 2.20 (Bug #15693)

---
 compiz-fusion/emerald/HISTORY       |  4 ++++
 compiz-fusion/emerald/PRE_BUILD     |  2 ++
 compiz-fusion/emerald/gtk2.20.patch | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 compiz-fusion/emerald/gtk2.20.patch

(limited to 'compiz-fusion')

diff --git a/compiz-fusion/emerald/HISTORY b/compiz-fusion/emerald/HISTORY
index 9ab77a5357..e5529748e0 100644
--- a/compiz-fusion/emerald/HISTORY
+++ b/compiz-fusion/emerald/HISTORY
@@ -1,3 +1,7 @@
+2010-04-26 Eric Sandall <sandalle@sourcemage.org>
+	* PRE_BUILD: Apply gtk2.20.patch
+	* gtk2.20.patch: Fix compilation with gtk+2 2.20 (Bug #15693)
+
 2009-10-23 Bearcat M. Sandor <sourcemage@feline-soul.com>
 	* DETAILS: updated spell to 0.8.4
 
diff --git a/compiz-fusion/emerald/PRE_BUILD b/compiz-fusion/emerald/PRE_BUILD
index bf046d7c05..8e287c1df5 100755
--- a/compiz-fusion/emerald/PRE_BUILD
+++ b/compiz-fusion/emerald/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build        &&
 cd  "$SOURCE_DIRECTORY"  &&
 
+patch -p1 < $SCRIPT_DIRECTORY/gtk2.20.patch &&
+
 if [[ $EMERALD_TRUNK == y ]]
 then
   NOCONFIGURE=Y  ./autogen.sh
diff --git a/compiz-fusion/emerald/gtk2.20.patch b/compiz-fusion/emerald/gtk2.20.patch
new file mode 100644
index 0000000000..5da5e12e0e
--- /dev/null
+++ b/compiz-fusion/emerald/gtk2.20.patch
@@ -0,0 +1,34 @@
+# From http://bugs.gentoo.org/show_bug.cgi?id=308791
+diff -urN emerald-0.8.4/libengine/themer.c emerald-0.8.4.new/libengine/themer.c
+--- emerald-0.8.4/libengine/themer.c	2009-10-13 20:56:23.000000000 -0400
++++ emerald-0.8.4.new/libengine/themer.c	2010-03-10 01:20:03.046827674 -0500
+@@ -461,7 +461,7 @@
+ }
+ gdouble get_float(SettingItem * item)
+ {
+-    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
++    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
+          return gtk_spin_button_get_value((GtkSpinButton *)item->widget);
+     }
+     else {
+@@ -647,7 +647,7 @@
+ }
+ void set_float(SettingItem * item, gdouble f)
+ {
+-    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
++    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
+          gtk_spin_button_set_value((GtkSpinButton *)item->widget, f);
+     } 
+     else {
+--- emerald-0.8.4/src/main.c.old	2010-03-29 19:49:30.420710030 -0700
++++ emerald-0.8.4/src/main.c	2010-03-29 19:52:33.654024944 -0700
+@@ -3757,7 +3757,7 @@
+ 
+ static void hide_tooltip(void)
+ {
+-    if (GTK_WIDGET_VISIBLE(tip_window))
++    if (gtk_widget_get_visible(tip_window))
+ 	g_get_current_time(&tooltip_last_popdown);
+ 
+     gtk_widget_hide(tip_window);
+
-- 
cgit v1.2.3