[Pkg-cli-apps-commits] [banshee] 06/07: Patch to fix DateTime ambiguity

Chow Loong Jin hyperair at debian.org
Sat Dec 7 05:14:44 UTC 2013


This is an automated email from the git hooks/post-receive script.

hyperair pushed a commit to branch experimental
in repository banshee.

commit cd2fd9f019b3879325b63508d00643e412cba0d0
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sat Dec 7 12:35:07 2013 +0800

    Patch to fix DateTime ambiguity
---
 .../patches/Fix-ambiguity-in-DateTime-class.patch  | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 42 insertions(+)

diff --git a/debian/patches/Fix-ambiguity-in-DateTime-class.patch b/debian/patches/Fix-ambiguity-in-DateTime-class.patch
new file mode 100644
index 0000000..6a081aa
--- /dev/null
+++ b/debian/patches/Fix-ambiguity-in-DateTime-class.patch
@@ -0,0 +1,41 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Sat, 7 Dec 2013 12:32:54 +0800
+Subject: Fix ambiguity in DateTime class
+
+In DateButton.cs, unqualified usage of the DateTime class results in an
+ambiguity between System.DateTime and GLib.DateTime.
+---
+ src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs
+index 519a54a..095d2d9 100644
+--- a/src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs
++++ b/src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs
+@@ -36,7 +36,7 @@ namespace Banshee.Widgets
+     public class DateButton : ToggleButton
+     {
+         private Window popup;
+-        private DateTime date;
++        private System.DateTime date;
+         private Calendar cal;
+         private string displayFormat;
+ 
+@@ -47,7 +47,7 @@ namespace Banshee.Widgets
+         {
+             Toggled += OnToggled;
+             popup = null;
+-            date = DateTime.Now;
++            date = System.DateTime.Now;
+             displayFormat = "yyyy/MM/dd";
+         }
+ 
+@@ -195,7 +195,7 @@ namespace Banshee.Widgets
+             set { displayFormat = value; }
+         }
+ 
+-        public DateTime Date {
++        public System.DateTime Date {
+             get { return date; }
+         }
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 2d876ca..934ac2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch
 Use-notify-sharp-3.0-to-match-Gtk-3.0.patch
 Use-dbus-2.patch
 libbnpx11-Don-t-use-non-existent-macros.patch
+Fix-ambiguity-in-DateTime-class.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git



More information about the Pkg-cli-apps-commits mailing list