[banshee] Revert "[build] disable IGE integration calls for now"
- From: Aaron Bockover <abock src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [banshee] Revert "[build] disable IGE integration calls for now"
- Date: Mon, 28 Dec 2009 21:20:21 +0000 (UTC)
commit 6797ec6ee011b98949b1068d6a9edd51e2e88a9b
Author: Aaron Bockover <abockover novell com>
Date: Mon Dec 28 16:11:22 2009 -0500
Revert "[build] disable IGE integration calls for now"
This reverts commit 557ff5414474b421c49ad242e754751db2741763.
build/build.environment.mk | 3 +-
.../Banshee.Osx/Banshee.OsxBackend/OsxService.cs | 36 ++++++++-----------
2 files changed, 17 insertions(+), 22 deletions(-)
---
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 16106dc..1c28fc7 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -26,6 +26,7 @@ LINK_IPOD = $(IPODSHARP_LIBS)
LINK_BOO = $(BOO_LIBS)
LINK_WEBKIT = $(WEBKIT_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
+LINK_IGEMACINTEGRATION = $(IGEMACINTEGRATIONSHARP_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
LINK_MONO_ADDINS_GUI_DEPS = $(MONO_ADDINS_GUI_LIBS)
@@ -151,7 +152,7 @@ REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEP
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
REF_BACKEND_HAL = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_DBUS)
-REF_BACKEND_OSX = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_BACKEND_OSX = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_IGEMACINTEGRATION)
REF_BACKEND_BNPX11 = $(LINK_EXTENSION_NOWPLAYING_DEPS)
# Cute hack to replace a space with something
diff --git a/src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs b/src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs
index 52f3768..84351ed 100644
--- a/src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs
+++ b/src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs
@@ -34,7 +34,7 @@ using Mono.Unix;
using Banshee.ServiceStack;
using Banshee.Gui;
-// using IgeMacIntegration;
+using IgeMacIntegration;
namespace Banshee.OsxBackend
{
@@ -78,6 +78,7 @@ namespace Banshee.OsxBackend
return true;
}
+
void Initialize ()
{
// add close action
@@ -93,7 +94,6 @@ namespace Banshee.OsxBackend
elements_service.PrimaryWindow.WindowStateEvent += WindowStateHandler;
- /*
// bind gtk menu to global osx menu
BindMenuBar ();
@@ -104,7 +104,6 @@ namespace Banshee.OsxBackend
IgeMacDock doc = IgeMacDock.Default;
doc.Clicked += OnDockClicked;
doc.QuitActivate += OnDockQuitActivated;
- */
}
public void Dispose ()
@@ -125,7 +124,7 @@ namespace Banshee.OsxBackend
get { return "OsxService"; }
}
- /*private void OnDockClicked (object o, System.EventArgs args)
+ private void OnDockClicked (object o, System.EventArgs args)
{
SetWindowVisibility (true);
}
@@ -165,7 +164,6 @@ namespace Banshee.OsxBackend
about_group.AddMenuItem (about_item, null);
prefs_group.AddMenuItem (prefs_item, null);
}
-*/
private void RegisterCloseHandler ()
{
@@ -180,38 +178,34 @@ namespace Banshee.OsxBackend
return true;
}
-
private void CloseWindow (object o, EventArgs args)
{
- SetWindowVisibility (false);
+ SetWindowVisibility(false);
}
- private void SetCloseMenuItemSensitivity (bool sensitivity)
- {
- var ui = interface_action_service.UIManager;
- var close_item = (MenuItem)ui.GetWidget ("/MainMenu/MediaMenu/ClosePlaceholder/Close");
+ private void SetCloseMenuItemSensitivity (bool sensitivity) {
+ UIManager ui = interface_action_service.UIManager;
+ MenuItem close_item = ui.GetWidget ("/MainMenu/MediaMenu/ClosePlaceholder/Close") as MenuItem;
close_item.Sensitive = sensitivity;
}
private void SetWindowVisibility (bool visible)
{
- SetCloseMenuItemSensitivity (visible);
+ SetCloseMenuItemSensitivity(visible);
if (elements_service.PrimaryWindow.Visible != visible) {
elements_service.PrimaryWindow.ToggleVisibility ();
}
}
- private void WindowStateHandler (object obj, WindowStateEventArgs args)
- {
+ private void WindowStateHandler (object obj, WindowStateEventArgs args) {
switch (args.Event.NewWindowState) {
- case Gdk.WindowState.Iconified:
- SetCloseMenuItemSensitivity (false);
- break;
- case (Gdk.WindowState)0:
- SetCloseMenuItemSensitivity (true);
- break;
+ case Gdk.WindowState.Iconified:
+ SetCloseMenuItemSensitivity(false);
+ break;
+ case (Gdk.WindowState) 0:
+ SetCloseMenuItemSensitivity(true);
+ break;
}
}
-
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]