[SCM] libquicktime/master: debian/patches/11-gtk+-2.24.patch

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4f25d3dd2e7b1eb61d1ac4a0ecf6c1db8c7cfeb5
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon May 9 10:33:39 2011 +0200

    debian/patches/11-gtk+-2.24.patch
    
    - Conditional compilation to allow building with GTK+ << 2.24.

diff --git a/debian/patches/11-gtk+-2.24.patch b/debian/patches/11-gtk+-2.24.patch
index 89493ea..4d882b9 100644
--- a/debian/patches/11-gtk+-2.24.patch
+++ b/debian/patches/11-gtk+-2.24.patch
@@ -6,21 +6,29 @@ Author: Ingo Krabbe
 Reviewed-by: Stian Jenssen
 Forwarded: Burkhard Plaum <plaum at ipf.uni-stuttgart.de>
 ---
- utils/gtk/lqt_gtk.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ utils/gtk/lqt_gtk.c |    9 +++++++++
+ 1 file changed, 9 insertions(+)
 
 --- libquicktime.orig/utils/gtk/lqt_gtk.c
 +++ libquicktime/utils/gtk/lqt_gtk.c
-@@ -332,10 +332,10 @@ lqtgtk_create_parameter_widget(lqt_param
+@@ -332,11 +332,20 @@ lqtgtk_create_parameter_widget(lqt_param
        ret->label = gtk_label_new(TR_DOM(info->real_name));
        gtk_misc_set_alignment(GTK_MISC(ret->label), 0.0, 0.5);
  
--      ret->widget = gtk_combo_box_new_text();
++#if ((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION >= 24))
 +      ret->widget = gtk_combo_box_text_new();
++#else
+       ret->widget = gtk_combo_box_new_text();
++#endif
        for(i = 0; i < info->num_stringlist_options; i++)
          {
--	gtk_combo_box_append_text (GTK_COMBO_BOX (ret->widget), 
++#if ((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION >= 24))
 +	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (ret->widget),
++				   info->stringlist_options[i]);
++#else
+ 	gtk_combo_box_append_text (GTK_COMBO_BOX (ret->widget), 
  				   info->stringlist_options[i]);
++#endif
          }
        g_signal_connect(GTK_COMBO_BOX (ret->widget),
+ 		       "changed",

-- 
libquicktime packaging