[banshee/gtk3] Update to latest gtk-sharp API that adds I* prefix for interfaces
- From: Andrés Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/gtk3] Update to latest gtk-sharp API that adds I* prefix for interfaces
- Date: Mon, 29 Jul 2013 19:43:12 +0000 (UTC)
commit 76ea97fedb27b0761d31944ef95705fb0893046a
Author: Andrés G. Aragoneses <knocte gmail com>
Date: Mon Jul 29 21:42:13 2013 +0200
Update to latest gtk-sharp API that adds I* prefix for interfaces
We already depend on the yet not released Gtk# 2.99.1, so we should
adapt ourselves to the latest version in the master branch (syncing
hyena submodule too to a version which tracks these API changes too).
.../Banshee.Gio/Banshee.IO.Gio/DemuxVfs.cs | 2 +-
.../Banshee.Gio/Banshee.IO.Gio/Directory.cs | 10 +++++-----
src/Clients/Nereid/Nereid/ViewContainer.cs | 2 +-
.../Banshee.Addins.Gui/AddinView.cs | 2 +-
.../ColumnCellStatusIndicator.cs | 2 +-
.../EditorEditableUndoAdapter.cs | 2 +-
.../Banshee.Gui.TrackEditor/StatisticsPage.cs | 4 ++--
.../Banshee.Gui/GtkBaseClient.cs | 2 +-
.../Banshee.Sources.Gui/CellEditEntry.cs | 2 +-
.../Banshee.Sources.Gui/SourceRowRenderer.cs | 4 ++--
.../Banshee.Sources.Gui/SourceView.cs | 2 +-
.../Banshee.Sources.Gui/SourceView_DragAndDrop.cs | 4 ++--
.../Banshee.Widgets/CustomActionProxy.cs | 2 +-
.../Banshee.InternetArchive/HeaderFilters.cs | 2 +-
src/Hyena | 2 +-
15 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/src/Backends/Banshee.Gio/Banshee.IO.Gio/DemuxVfs.cs
b/src/Backends/Banshee.Gio/Banshee.IO.Gio/DemuxVfs.cs
index 4a347b1..64ffdb5 100644
--- a/src/Backends/Banshee.Gio/Banshee.IO.Gio/DemuxVfs.cs
+++ b/src/Backends/Banshee.Gio/Banshee.IO.Gio/DemuxVfs.cs
@@ -35,7 +35,7 @@ namespace Banshee.IO.Gio
{
public class DemuxVfs : IDemuxVfs
{
- private GLib.File file;
+ private GLib.IFile file;
public DemuxVfs (string path)
{
diff --git a/src/Backends/Banshee.Gio/Banshee.IO.Gio/Directory.cs
b/src/Backends/Banshee.Gio/Banshee.IO.Gio/Directory.cs
index 9169e19..ed5a443 100644
--- a/src/Backends/Banshee.Gio/Banshee.IO.Gio/Directory.cs
+++ b/src/Backends/Banshee.Gio/Banshee.IO.Gio/Directory.cs
@@ -59,7 +59,7 @@ namespace Banshee.IO.Gio
internal static bool DisableNativeOptimizations = false;
- private void Delete (string directory, GLib.File dir, bool recursive)
+ private void Delete (string directory, GLib.IFile dir, bool recursive)
{
if (!dir.Exists) {
return;
@@ -88,12 +88,12 @@ namespace Banshee.IO.Gio
dir.Delete ();
}
- private static GLib.File GetDir (string directory)
+ private static GLib.IFile GetDir (string directory)
{
return GetDir (directory, directory.Contains ("://"));
}
- private static GLib.File GetDir (string directory, bool directoryIsUri)
+ private static GLib.IFile GetDir (string directory, bool directoryIsUri)
{
return directoryIsUri ? FileFactory.NewForUri (directory) : FileFactory.NewForPath (directory);
}
@@ -113,7 +113,7 @@ namespace Banshee.IO.Gio
return GetFiles (GetDir (directory), true);
}
- private IEnumerable<SafeUri> GetFiles (GLib.File dir, bool followSymlinks)
+ private IEnumerable<SafeUri> GetFiles (GLib.IFile dir, bool followSymlinks)
{
var enumerator = dir.EnumerateChildren ("standard::type,standard::name", followSymlinks ?
FileQueryInfoFlags.None : FileQueryInfoFlags.NofollowSymlinks, null);
foreach (FileInfo file in enumerator) {
@@ -136,7 +136,7 @@ namespace Banshee.IO.Gio
return GetDirectories (GetDir (directory), true);
}
- private IEnumerable<SafeUri> GetDirectories (GLib.File dir, bool followSymlinks)
+ private IEnumerable<SafeUri> GetDirectories (GLib.IFile dir, bool followSymlinks)
{
var enumerator = dir.EnumerateChildren ("standard::type,standard::name", followSymlinks ?
FileQueryInfoFlags.None : FileQueryInfoFlags.NofollowSymlinks, null);
foreach (FileInfo file in enumerator) {
diff --git a/src/Clients/Nereid/Nereid/ViewContainer.cs b/src/Clients/Nereid/Nereid/ViewContainer.cs
index 98a31ae..d2affa5 100644
--- a/src/Clients/Nereid/Nereid/ViewContainer.cs
+++ b/src/Clients/Nereid/Nereid/ViewContainer.cs
@@ -170,7 +170,7 @@ namespace Nereid
search_entry.Query = String.IsNullOrEmpty (query) ? String.Empty : query + ":";
- Editable editable = search_entry as Editable;
+ var editable = search_entry as IEditable;
if (editable != null) {
editable.Position = search_entry.Query.Length;
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs
b/src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs
index 813936b..16cc4bf 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs
@@ -129,7 +129,7 @@ namespace Banshee.Addins.Gui
bool enabled = (bool) model.GetValue (iter, 1);
addin.Enabled = !enabled;
model.SetValue (iter, 1, addin.Enabled);
- model.Foreach (delegate (TreeModel current_model, TreePath path, TreeIter current_iter) {
+ model.Foreach (delegate (ITreeModel current_model, TreePath path, TreeIter current_iter)
{
var an = current_model.GetValue (current_iter, 3) as Addin;
if (an != null) {
current_model.SetValue (current_iter, 1, an.Enabled);
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs
b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs
index 5d37690..65f7965 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs
@@ -42,7 +42,7 @@ using Banshee.ServiceStack;
namespace Banshee.Collection.Gui
{
- class ColumnCellStatusIndicatorAccessible : ColumnCellAccessible, Atk.ImageImplementor
+ class ColumnCellStatusIndicatorAccessible : ColumnCellAccessible, Atk.IImageImplementor
{
private string image_description;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorEditableUndoAdapter.cs
b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorEditableUndoAdapter.cs
index 60934d8..d84c97a 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorEditableUndoAdapter.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorEditableUndoAdapter.cs
@@ -34,7 +34,7 @@ using Hyena.Gui;
namespace Banshee.Gui.TrackEditor
{
- public class EditorEditableUndoAdapter<T> where T : Widget, Editable
+ public class EditorEditableUndoAdapter<T> where T : Widget, IEditable
{
private Dictionary<EditorTrackInfo, EditableUndoAdapter<T>> undo_adapters
= new Dictionary<EditorTrackInfo, EditableUndoAdapter<T>> ();
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs
b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs
index 4fc4577..f8e90b4 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs
@@ -104,7 +104,7 @@ namespace Banshee.Gui.TrackEditor
if (view.IsRealized) {
var width = GetValueWidth ();
- model.Foreach ((TreeModel m, TreePath path, TreeIter iter) => {
+ model.Foreach ((ITreeModel m, TreePath path, TreeIter iter) => {
if ((Pango.EllipsizeMode) model.GetValue (iter, 3) != Pango.EllipsizeMode.End) {
model.SetValue (iter, 5, width);
}
@@ -116,7 +116,7 @@ namespace Banshee.Gui.TrackEditor
public CellRendererText NameRenderer { get { return name_renderer; } }
public CellRendererText ValueRenderer { get { return value_renderer; } }
- private bool RowSeparatorFunc (TreeModel model, TreeIter iter)
+ private bool RowSeparatorFunc (ITreeModel model, TreeIter iter)
{
return (bool)model.GetValue (iter, 2);
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
index b32b6cd..60817e7 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
@@ -110,7 +110,7 @@ namespace Banshee.Gui
if (File.Exists (user_css) && !ApplicationContext.CommandLine.Contains ("no-gtkcss")) {
custom_provider = new Gtk.CssProvider ();
custom_provider.LoadFromPath (user_css);
- Gtk.StyleContext.AddProviderForScreen (Gdk.Screen.Default,
(Gtk.StyleProvider)custom_provider,
+ Gtk.StyleContext.AddProviderForScreen (Gdk.Screen.Default,
(Gtk.IStyleProvider)custom_provider,
600 /* GTK_STYLE_PROVIDER_PRIORITY_APPLICATION*/ );
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs
b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs
index f669f3b..1c9c9e5 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs
@@ -31,7 +31,7 @@ using Gtk;
namespace Banshee.Sources.Gui
{
- internal class CellEditEntry : Entry, CellEditable
+ internal class CellEditEntry : Entry, ICellEditable
{
public string path;
private bool fired_edit_done = false;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs
b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs
index 3ace89e..96e10e8 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs
@@ -46,7 +46,7 @@ namespace Banshee.Sources.Gui
{
}
- public static void CellDataHandler (CellLayout layout, CellRenderer cell, TreeModel model, TreeIter
iter)
+ public static void CellDataHandler (ICellLayout layout, CellRenderer cell, ITreeModel model,
TreeIter iter)
{
SourceRowRenderer renderer = cell as SourceRowRenderer;
if (renderer == null) {
@@ -327,7 +327,7 @@ namespace Banshee.Sources.Gui
return area.Y + (int)Math.Round ((double)(area.Height - height) / 2.0,
MidpointRounding.AwayFromZero);
}
- protected override CellEditable OnStartEditing (Gdk.Event evnt, Widget widget, string path,
+ protected override ICellEditable OnStartEditing (Gdk.Event evnt, Widget widget, string path,
Gdk.Rectangle background_area, Gdk.Rectangle cell_area, CellRendererState flags)
{
CellEditEntry text = new CellEditEntry ();
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
index b170f64..f4e6bb9 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
@@ -408,7 +408,7 @@ namespace Banshee.Sources.Gui
private bool OnCursorChangedTimeout ()
{
TreeIter iter;
- TreeModel model;
+ ITreeModel model;
current_timeout = -1;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs
b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs
index b6cd995..d2de148 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs
@@ -91,9 +91,9 @@ namespace Banshee.Sources.Gui
// Scroll if within 20 pixels of the top or bottom
if (y < 20)
- ((Scrollable)this).Vadjustment.Value -= 30;
+ ((IScrollable)this).Vadjustment.Value -= 30;
else if ((Allocation.Height - y) < 20)
- ((Scrollable)this).Vadjustment.Value += 30;
+ ((IScrollable)this).Vadjustment.Value += 30;
ShowNewPlaylistUnder (parent_source, active_source);
diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/CustomActionProxy.cs
b/src/Core/Banshee.Widgets/Banshee.Widgets/CustomActionProxy.cs
index 349f67d..cbf1af4 100644
--- a/src/Core/Banshee.Widgets/Banshee.Widgets/CustomActionProxy.cs
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/CustomActionProxy.cs
@@ -117,7 +117,7 @@ namespace Banshee.Widgets
}
}
- var activatable = item as Activatable;
+ var activatable = item as IActivatable;
if (activatable != null) {
activatable.RelatedAction = action;
}
diff --git a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs
b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs
index 70e182d..057f19e 100644
--- a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs
+++ b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs
@@ -144,7 +144,7 @@ namespace Banshee.InternetArchive
string prev_query = entry.Query.EndsWith (":") ? null : entry.Query;
entry.Query = String.Format ("{0}:{1}", filter_fields[entry.ActiveFilterID].Id, prev_query);
- var editable = entry as Editable;
+ var editable = entry as IEditable;
if (editable != null) {
editable.Position = entry.Query.Length;
}
diff --git a/src/Hyena b/src/Hyena
index 96ba757..e4412af 160000
--- a/src/Hyena
+++ b/src/Hyena
@@ -1 +1 @@
-Subproject commit 96ba7573ada7a656e3cd878e3a291dd5768dd620
+Subproject commit e4412af083b0e11d993bb4660650a9e7485769c6
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
