[gtpd-cvs] [gtkpod/gtk-3.0] Couple more deprecations causing compile errors

[phantomjinx <pha...@us...>]

commit 730a1f4fd896ff1b216f0c52696a8dc984ce192d
Author: phantomjinx <p.g...@ph...>
Date:   Sun Oct 16 19:06:35 2011 +0100

    Couple more deprecations causing compile errors
    
    * Functions deprecated in gtk 3.2 causing compile errors in plugins
      * clarity
      * cover_display

 plugins/clarity/clarity_widget.c         |    6 +++---
 plugins/cover_display/cover_display.xml  |    2 +-
 plugins/cover_display/display_coverart.c |    2 +-
 plugins/cover_display/display_coverart.h |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/plugins/clarity/clarity_widget.c b/plugins/clarity/clarity_widget.c
index df3fa29..1c51f71 100644
--- a/plugins/clarity/clarity_widget.c
+++ b/plugins/clarity/clarity_widget.c
@@ -267,7 +267,7 @@ static void clarity_widget_init (ClarityWidget *self) {
     g_signal_connect (G_OBJECT(priv->leftbutton), "clicked",
                 G_CALLBACK(_on_clarity_button_clicked), priv);
 
-    priv->cdslider = gtk_hscale_new_with_range(0, 1, 1);
+    priv->cdslider = gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL, 0, 1, 1);
     gtk_scale_set_digits(GTK_SCALE(priv->cdslider), 0);
     gtk_scale_set_draw_value(GTK_SCALE(priv->cdslider), FALSE);
     gtk_widget_set_can_focus(priv->cdslider, TRUE);
@@ -300,12 +300,12 @@ static void clarity_widget_init (ClarityWidget *self) {
 
     _init_slider_range(priv);
 
-    priv->controlbox = gtk_hbox_new(FALSE, 2);
+    priv->controlbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
     gtk_box_pack_start(GTK_BOX(priv->controlbox), priv->leftbutton, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(priv->controlbox), priv->cdslider, TRUE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(priv->controlbox), priv->rightbutton, FALSE, FALSE, 0);
 
-    priv->contentpanel = gtk_vbox_new(FALSE, 0);
+    priv->contentpanel = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_box_pack_start(GTK_BOX(priv->contentpanel), priv->draw_area, TRUE, TRUE, 0);
     gtk_box_pack_end(GTK_BOX(priv->contentpanel), priv->controlbox, FALSE, TRUE, 0);
 
diff --git a/plugins/cover_display/cover_display.xml b/plugins/cover_display/cover_display.xml
index 85af7b5..8b13230 100644
--- a/plugins/cover_display/cover_display.xml
+++ b/plugins/cover_display/cover_display.xml
@@ -43,7 +43,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHScale" id="cover_display_scaler">
+              <object class="GtkScale" id="cover_display_scaler">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="digits">0</property>
diff --git a/plugins/cover_display/display_coverart.c b/plugins/cover_display/display_coverart.c
index ad62e06..6e08fb9 100644
--- a/plugins/cover_display/display_coverart.c
+++ b/plugins/cover_display/display_coverart.c
@@ -174,7 +174,7 @@ void coverart_init_display(GtkWidget *parent, gchar *gladepath) {
     cdwidget->controlbox = gtkpod_builder_xml_get_widget(xml, "cover_display_controlbox");
     cdwidget->leftbutton = GTK_BUTTON (gtkpod_builder_xml_get_widget (xml, "cover_display_leftbutton"));
     cdwidget->rightbutton = GTK_BUTTON (gtkpod_builder_xml_get_widget (xml, "cover_display_rightbutton"));
-    cdwidget->cdslider = GTK_HSCALE (gtkpod_builder_xml_get_widget (xml, "cover_display_scaler"));
+    cdwidget->cdslider = GTK_SCALE (gtkpod_builder_xml_get_widget (xml, "cover_display_scaler"));
     /* create a new drawing area */
     cdwidget->draw_area = gtk_drawing_area_new();
     cdwidget->cdcovers = g_ptr_array_sized_new(IMG_TOTAL);
diff --git a/plugins/cover_display/display_coverart.h b/plugins/cover_display/display_coverart.h
index 8a3afe8..a7b0732 100644
--- a/plugins/cover_display/display_coverart.h
+++ b/plugins/cover_display/display_coverart.h
@@ -68,7 +68,7 @@ typedef struct {
 	GtkWidget *canvasbox;
 	GtkWidget *controlbox;
 	GtkButton *leftbutton;
-	GtkHScale *cdslider;
+	GtkScale *cdslider;
 	GtkButton *rightbutton;
 
 	/* Utility data */