[banshee] Use methods from cairo and pango bindings instead of the ones from Hyena

[Bertrand Lorentz <blorentz src gnome org>]

commit 93645112adbe7ca8b70ebe4b5212172406f61e25
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Mon Nov 18 21:13:15 2013 +0100

    Use methods from cairo and pango bindings instead of the ones from Hyena
    
    Update Hyena to the latest git master, which removes various custom
    interop methods. Do the necessary adjustments to use the
    corresponding methods provided directly by the cairo and pango bindings.

 .../Banshee.Collection.Gui/ColumnCellAlbum.cs      |    4 ++--
 .../Banshee.Collection.Gui/ColumnCellTrack.cs      |    2 +-
 .../Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs |    4 ++--
 .../Banshee.Gui.Widgets/LargeTrackInfoDisplay.cs   |    6 +++---
 .../Banshee.Gui.Widgets/TrackInfoDisplay.cs        |   20 ++++++++++----------
 .../Banshee.Sources.Gui/SourceRowRenderer.cs       |    2 +-
 .../Banshee.Podcasting.Gui/ColumnCellPodcast.cs    |    4 ++--
 src/Hyena                                          |    2 +-
 8 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs 
b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs
index 507c01c..0624052 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs
@@ -137,7 +137,7 @@ namespace Banshee.Collection.Gui
             if (!String.IsNullOrEmpty (album.ArtistName)) {
                 context.Context.MoveTo (x, y + fl_height);
                 context.Context.SetSourceColor (text_color);
-                PangoCairoHelper.ShowLayout (context.Context, layout);
+                Pango.CairoHelper.ShowLayout (context.Context, layout);
             }
 
             // Render the first line, resetting the state
@@ -151,7 +151,7 @@ namespace Banshee.Collection.Gui
             context.Context.MoveTo (x, y);
             text_color.A = 1;
             context.Context.SetSourceColor (text_color);
-            PangoCairoHelper.ShowLayout (context.Context, layout);
+            Pango.CairoHelper.ShowLayout (context.Context, layout);
         }
 
         public virtual int ComputeRowHeight (Widget widget)
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrack.cs 
b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrack.cs
index 8d8b414..26def98 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrack.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrack.cs
@@ -85,7 +85,7 @@ namespace Banshee.Collection.Gui
             color.A = (!context.Opaque) ? 0.3 : 1.0;
             context.Context.SetSourceColor (color);
 
-            PangoCairoHelper.ShowLayout (context.Context, context.Layout);
+            Pango.CairoHelper.ShowLayout (context.Context, context.Layout);
         }
 
         public Pango.Weight FontWeight {
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs 
b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs
index 1fdb6e8..14e66e1 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs
@@ -213,7 +213,7 @@ namespace Banshee.Gui.Widgets
             if (renderTrack) {
                 cr.MoveTo (x, y);
                 cr.SetSourceColor (TextColor);
-                PangoCairoHelper.ShowLayout (cr, first_line_layout);
+                Pango.CairoHelper.ShowLayout (cr, first_line_layout);
             }
 
             if (!renderArtistAlbum) {
@@ -221,7 +221,7 @@ namespace Banshee.Gui.Widgets
             }
 
             cr.MoveTo (x, y + fl_height);
-            PangoCairoHelper.ShowLayout (cr, second_line_layout);
+            Pango.CairoHelper.ShowLayout (cr, second_line_layout);
         }
 
 #endregion
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/LargeTrackInfoDisplay.cs 
b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/LargeTrackInfoDisplay.cs
index da6a7b1..6aab51e 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/LargeTrackInfoDisplay.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/LargeTrackInfoDisplay.cs
@@ -257,17 +257,17 @@ namespace Banshee.Gui.Widgets
             if (render_track) {
                 cr.MoveTo (track_info_alloc.X, track_info_alloc.Y);
                 cr.SetSourceColor (TextColor);
-                PangoCairoHelper.ShowLayout (cr, first_line_layout);
+                Pango.CairoHelper.ShowLayout (cr, first_line_layout);
 
                 RenderTrackRating (cr, track);
             }
 
             if (render_artist_album) {
                 cr.MoveTo (track_info_alloc.X, track_info_alloc.Y + fl_height);
-                PangoCairoHelper.ShowLayout (cr, second_line_layout);
+                Pango.CairoHelper.ShowLayout (cr, second_line_layout);
 
                 cr.MoveTo (track_info_alloc.X, track_info_alloc.Y + fl_height + sl_height);
-                PangoCairoHelper.ShowLayout (cr, third_line_layout);
+                Pango.CairoHelper.ShowLayout (cr, third_line_layout);
             }
         }
 
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs 
b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
index f95784e..7ba287d 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
@@ -276,24 +276,24 @@ namespace Banshee.Gui.Widgets
 
             if (current_track == null) {
                 // Fade in the whole stage, nothing to fade out
-                CairoExtensions.PushGroup (cr);
+                cr.PushGroup ();
                 RenderStage (cr, incoming_track, incoming_image);
-                CairoExtensions.PopGroupToSource (cr);
+                cr.PopGroupToSource ();
 
                 cr.PaintWithAlpha (stage.Actor.Percent);
                 return;
             }
 
             // Draw the old cover art more and more translucent
-            CairoExtensions.PushGroup (cr);
+            cr.PushGroup ();
             RenderCoverArt (cr, current_image);
-            CairoExtensions.PopGroupToSource (cr);
+            cr.PopGroupToSource ();
             cr.PaintWithAlpha (1.0 - stage.Actor.Percent);
 
             // Draw the new cover art more and more opaque
-            CairoExtensions.PushGroup (cr);
+            cr.PushGroup ();
             RenderCoverArt (cr, incoming_image);
-            CairoExtensions.PopGroupToSource (cr);
+            cr.PopGroupToSource ();
             cr.PaintWithAlpha (stage.Actor.Percent);
 
             bool same_artist_album = incoming_track != null ? incoming_track.ArtistAlbumEqual 
(current_track) : false;
@@ -307,16 +307,16 @@ namespace Banshee.Gui.Widgets
             // the old out, and then the new in
             if (stage.Actor.Percent <= 0.5) {
                 // Fade out old text
-                CairoExtensions.PushGroup (cr);
+                cr.PushGroup ();
                 RenderTrackInfo (cr, current_track, !same_track, !same_artist_album);
-                CairoExtensions.PopGroupToSource (cr);
+                cr.PopGroupToSource ();
 
                 cr.PaintWithAlpha (1.0 - (stage.Actor.Percent * 2.0));
             } else {
                 // Fade in new text
-                CairoExtensions.PushGroup (cr);
+                cr.PushGroup ();
                 RenderTrackInfo (cr, incoming_track, !same_track, !same_artist_album);
-                CairoExtensions.PopGroupToSource (cr);
+                cr.PopGroupToSource ();
 
                 cr.PaintWithAlpha ((stage.Actor.Percent - 0.5) * 2.0);
             }
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs 
b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs
index 6ba962c..43b23fb 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs
@@ -275,7 +275,7 @@ namespace Banshee.Sources.Gui
                     cr.MoveTo (
                         cell_area.X + cell_area.Width - count_layout_width - 2,
                         cell_area.Y + 0.5 + (double)(cell_area.Height - count_layout_height) / 2.0);
-                    PangoCairoHelper.ShowLayout (cr, count_layout);
+                    Pango.CairoHelper.ShowLayout (cr, count_layout);
                 }
 
                 count_layout.Dispose ();
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs 
b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs
index d84618b..2f0bf12 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs
@@ -130,7 +130,7 @@ namespace Banshee.Podcasting.Gui
             if (feed.DbId > 0) {
                 context.Context.MoveTo (x, y + fl_height);
                 context.Context.SetSourceColor (text_color);
-                PangoCairoHelper.ShowLayout (context.Context, layout);
+                Pango.CairoHelper.ShowLayout (context.Context, layout);
             }
 
             // Render the first line, resetting the state
@@ -144,7 +144,7 @@ namespace Banshee.Podcasting.Gui
             context.Context.MoveTo (x, y);
             text_color.A = 1;
             context.Context.SetSourceColor (text_color);
-            PangoCairoHelper.ShowLayout (context.Context, layout);
+            Pango.CairoHelper.ShowLayout (context.Context, layout);
         }
 
         public override int ComputeRowHeight (Widget widget)
diff --git a/src/Hyena b/src/Hyena
index 50392a3..878111f 160000
--- a/src/Hyena
+++ b/src/Hyena
@@ -1 +1 @@
-Subproject commit 50392a3a1eabbd36556dfe2c0a6b2dd6577984c0
+Subproject commit 878111f683697a6c2ea904e67bc2c3e17d1b1525