From 7a89045498016168afa0de453118677bd32029e4 Mon Sep 17 00:00:00 2001
From: jstebbins <jstebbins.hb@gmail.com>
Date: Tue, 14 Jan 2014 18:30:33 +0000
Subject: LinGui: Fix deprecated GtkHScale Fixing this deprecation makes the
 LinGui incompatible with versions of gtk prior to 2.16. Too bad for you if
 you are using such and ancient gtk.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5970 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 gtk/src/ghb.ui     | 24 ++++++++++++++++--------
 gtk/src/settings.c |  4 ++--
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'gtk')

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 740ab38a6..097aba065 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -1987,7 +1987,8 @@ This setting allows you to synchronize the files.</property>
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
-                                          <object class="GtkHScale" id="VideoQualitySlider">
+                                          <object class="GtkScale" id="VideoQualitySlider">
+                                            <property name="orientation">horizontal</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2190,7 +2191,8 @@ This setting allows you to synchronize the files.</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkHScale" id="x264PresetSlider">
+                                          <object class="GtkScale" id="x264PresetSlider">
+                                            <property name="orientation">horizontal</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -4190,7 +4192,8 @@ This setting allows you to synchronize the files.</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkHScale" id="x264_aq_strength">
+                                                      <object class="GtkScale" id="x264_aq_strength">
+                                                        <property name="orientation">horizontal</property>
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -4221,7 +4224,8 @@ This setting allows you to synchronize the files.</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkHScale" id="x264_psy_rd">
+                                                      <object class="GtkScale" id="x264_psy_rd">
+                                                        <property name="orientation">horizontal</property>
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -4254,7 +4258,8 @@ This setting allows you to synchronize the files.</property>
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkHScale" id="x264_psy_trell">
+                                                      <object class="GtkScale" id="x264_psy_trell">
+                                                        <property name="orientation">horizontal</property>
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -7466,7 +7471,8 @@ Encoders are most effecient when the video dimensions are aligned to some specif
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkHScale" id="PictureDeblock">
+                                  <object class="GtkScale" id="PictureDeblock">
+                                    <property name="orientation">horizontal</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="adjustment">adjustment20</property>
@@ -7813,7 +7819,8 @@ The classic deinterlace filter is applied to all frames. Frames that are not int
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
-                  <object class="GtkHScale" id="preview_frame">
+                  <object class="GtkScale" id="preview_frame">
+                    <property name="orientation">horizontal</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="adjustment">adjustment19</property>
@@ -7853,7 +7860,8 @@ The classic deinterlace filter is applied to all frames. Frames that are not int
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHScale" id="live_preview_progress">
+                      <object class="GtkScale" id="live_preview_progress">
+                        <property name="orientation">horizontal</property>
                         <property name="can_focus">True</property>
                         <property name="adjustment">preview_progress_adj</property>
                         <property name="draw_value">False</property>
diff --git a/gtk/src/settings.c b/gtk/src/settings.c
index 34775f137..9d211797e 100644
--- a/gtk/src/settings.c
+++ b/gtk/src/settings.c
@@ -300,7 +300,7 @@ ghb_widget_value(GtkWidget *widget)
         ival = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
         value = ghb_int64_value_new(ival);
     }
-    else if (type == GTK_TYPE_HSCALE)
+    else if (type == GTK_TYPE_SCALE)
     {
         gdouble dval;
         gint digits;
@@ -591,7 +591,7 @@ update_widget(GtkWidget *widget, const GValue *value)
         g_debug("spin (%s)", str);
         gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), dval);
     }
-    else if (type == GTK_TYPE_HSCALE)
+    else if (type == GTK_TYPE_SCALE)
     {
         g_debug("hscale");
         gtk_range_set_value(GTK_RANGE(widget), dval);
-- 
cgit v1.2.3