[banshee] Dap: fix some nitpicks in recently committed PotentialSource class
- From: Andrés Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] Dap: fix some nitpicks in recently committed PotentialSource class
- Date: Fri, 1 Aug 2014 22:59:48 +0000 (UTC)
commit 2d7c05dd80d90e35c4a6d9ea5122662249be1a46
Author: Andrés G. Aragoneses <knocte gmail com>
Date: Sat Aug 2 00:59:40 2014 +0200
Dap: fix some nitpicks in recently committed PotentialSource class
src/Dap/Banshee.Dap/Banshee.Dap/PotentialSource.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap/PotentialSource.cs
b/src/Dap/Banshee.Dap/Banshee.Dap/PotentialSource.cs
index 8aab60c..35e6ac9 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap/PotentialSource.cs
+++ b/src/Dap/Banshee.Dap/Banshee.Dap/PotentialSource.cs
@@ -26,12 +26,16 @@
using System;
+using Mono.Unix;
+
using Banshee.Collection.Database;
using Banshee.Dap.Gui;
using Banshee.Hardware;
using Banshee.Sources;
using Banshee.Sources.Gui;
+
using Hyena;
+
using Mono.Addins;
namespace Banshee.Dap
@@ -119,23 +123,22 @@ namespace Banshee.Dap
private bool TryDeviceInitialize (bool force, out DapSource source)
{
lock (lock_object) {
- source = default (DapSource);
+ source = null;
if (initialized) {
return false;
}
SetStatus (
- AddinManager.CurrentLocalizer.GetString ("Trying to Claim Your Device\u2026"),
+ Catalog.GetString ("Trying to claim your device..."),
false,
true,
"dialog-information"
);
Log.Debug ("PotentialSource: Creating Instance");
- DapSource src = null;
try {
- src = (DapSource) Claimant.CreateInstance ();
+ DapSource src = (DapSource) Claimant.CreateInstance ();
Log.Debug ("PotentialSource: Initializing Device");
src.DeviceInitialize (Device, force);
Log.Debug ("PotentialSource: Loading Contents");
@@ -153,11 +156,11 @@ namespace Banshee.Dap
Log.Error (e);
}
- bool success = !object.ReferenceEquals (source, default (DapSource));
+ bool success = (source != null);
SetStatus (
- success ? AddinManager.CurrentLocalizer.GetString ("Connection Successful. Please
wait\u2026")
- : AddinManager.CurrentLocalizer.GetString ("Connection Failed\u2026"),
+ success ? Catalog.GetString ("Connection successful. Please wait...")
+ : Catalog.GetString ("Connection failed"),
!success,
success,
success ? "dialog-information"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]