GNOME.org
 

[banshee] [MeeGo] Massive rename from Moblin to MeeGo

commit d110d68d2d81a1ed48cc9e71e047c88a0123cf48
Author: Aaron Bockover <abockover novell com>
Date:   Sat Mar 20 01:38:47 2010 -0400

    [MeeGo] Massive rename from Moblin to MeeGo

 Banshee.sln                                        |    2 +-
 build/build.environment.mk                         |    2 +-
 build/m4/banshee/meego.m4                          |   13 ++++
 build/m4/banshee/moblin.m4                         |   11 ----
 configure.ac                                       |    8 +-
 data/addin-xml-strings.cs                          |    8 +-
 profile-configure                                  |    3 +-
 src/Core/Banshee.Core/Resources/translators.xml    |    2 +-
 .../Banshee.MeeGo.addin.xml}                       |   12 ++--
 .../Banshee.MeeGo.csproj}                          |   28 +++++-----
 .../Banshee.MeeGo.dll.config}                      |    0
 .../Banshee.MeeGo}/MediaPanelContents.cs           |    4 +-
 .../Banshee.MeeGo/MeeGoPanel.cs}                   |   16 +++---
 .../Banshee.MeeGo/MeeGoService.cs}                 |   32 +++++-----
 .../Banshee.MeeGo/MeeGoTrackInfoDisplay.cs}        |    8 +-
 .../Banshee.MeeGo}/PlayQueueBox.cs                 |    4 +-
 .../Banshee.MeeGo}/PlaybackBox.cs                  |    2 +-
 .../Banshee.MeeGo}/RecentAlbumsList.cs             |    2 +-
 .../Banshee.MeeGo}/RecentAlbumsView.cs             |    4 +-
 .../Banshee.MeeGo}/SearchEntry.cs                  |    2 +-
 .../Banshee.MeeGo}/SearchHeader.cs                 |    4 +-
 src/Extensions/Banshee.MeeGo/Makefile.am           |   62 ++++++++++++++++++++
 .../Mutter/PanelClient.cs                          |    0
 .../Mutter/PanelGtk.cs                             |    0
 .../Mutter/SetSizeHandler.cs                       |    0
 .../meego-panel-banshee}                           |    0
 .../meego-panel-banshee.desktop.in.in              |    9 +++
 .../org.moblin.UX.Shell.Panels.banshee.service.in  |    3 +
 src/Extensions/Banshee.Moblin/Makefile.am          |   48 ---------------
 .../org.moblin.UX.Shell.Panels.media.service.in    |    3 -
 src/Extensions/Makefile.am                         |    2 +-
 31 files changed, 159 insertions(+), 135 deletions(-)
---
diff --git a/Banshee.sln b/Banshee.sln
index 52885cb..7e80c57 100644
--- a/Banshee.sln
+++ b/Banshee.sln
@@ -78,7 +78,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.NotificationArea",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.MultimediaKeys", "src\Extensions\Banshee.MultimediaKeys\Banshee.MultimediaKeys.csproj", "{8E8D7EAD-3B7A-4F7D-8146-75AFCB9DEE83}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.Moblin", "src\Extensions\Banshee.Moblin\Banshee.Moblin.csproj", "{4FBB954A-5CA9-44DC-97DA-7D549AC3EADB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.MeeGo", "src\Extensions\Banshee.MeeGo\Banshee.MeeGo.csproj", "{4FBB954A-5CA9-44DC-97DA-7D549AC3EADB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.PlayerMigration", "src\Extensions\Banshee.PlayerMigration\Banshee.PlayerMigration.csproj", "{0AB92BF8-3A25-46AD-9748-1236471E9408}"
 EndProject
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 767dcbf..d7c4c8e 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -127,7 +127,7 @@ REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
 REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_MOBLIN = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
 REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
diff --git a/build/m4/banshee/meego.m4 b/build/m4/banshee/meego.m4
new file mode 100644
index 0000000..44b79f2
--- /dev/null
+++ b/build/m4/banshee/meego.m4
@@ -0,0 +1,13 @@
+AC_DEFUN([BANSHEE_CHECK_MEEGO],
+[
+	AC_ARG_ENABLE(meego, AC_HELP_STRING([--enable-meego], [Enable Moblin integration]), , enable_meego="no")
+
+	if test "x$enable_meego" = "xyes"; then
+		AM_CONDITIONAL(HAVE_MEEGO, true)
+		MEEGO_PANELS_DIR=`$PKG_CONFIG --variable=moblin_panel_panels_dir moblin-panel`
+		AC_SUBST(MEEGO_PANELS_DIR)
+	else
+		AM_CONDITIONAL(HAVE_MEEGO, false)
+	fi
+])
+
diff --git a/configure.ac b/configure.ac
index a6bcfb2..6019081 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,8 +153,8 @@ BANSHEE_CHECK_REMOTE_AUDIO
 dnl MonoTorrent support (optional)
 BANSHEE_CHECK_TORRENT
 
-dnl Moblin integration (optional)
-BANSHEE_CHECK_MOBLIN
+dnl MeeGo integration (optional)
+BANSHEE_CHECK_MEEGO
 
 dnl Gapless, if we have a new-enough playbin2
 ENABLE_GAPLESS="no"
@@ -312,7 +312,7 @@ src/Extensions/Banshee.InternetRadio/Makefile
 src/Extensions/Banshee.Lastfm/Makefile
 src/Extensions/Banshee.LibraryWatcher/Makefile
 src/Extensions/Banshee.MiniMode/Makefile
-src/Extensions/Banshee.Moblin/Makefile
+src/Extensions/Banshee.MeeGo/Makefile
 src/Extensions/Banshee.MultimediaKeys/Makefile
 src/Extensions/Banshee.NotificationArea/Makefile
 src/Extensions/Banshee.NowPlaying/Makefile
@@ -350,7 +350,7 @@ ${PACKAGE}-${VERSION}
   Operating System/Desktop Environment:
     GNOME Support:     ${enable_gnome}
     OSX Support:       ${enable_osx}
-    Moblin Support:    ${enable_moblin}
+    MeeGo Support:     ${enable_meego}
 
   Digital Audio Player (DAP) Support:
     Mass Storage:      yes
diff --git a/data/addin-xml-strings.cs b/data/addin-xml-strings.cs
index 286261c..48a8ccb 100644
--- a/data/addin-xml-strings.cs
+++ b/data/addin-xml-strings.cs
@@ -123,15 +123,15 @@ internal static class AddinXmlStringCatalog
         Catalog.GetString (@"Automatically update music and video libraries");
         Catalog.GetString (@"Utilities");
 
+        // ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml
+        Catalog.GetString (@"MeeGo Support");
+        Catalog.GetString (@"Provides MeeGo integration, including a custom media panel.");
+
         // ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml
         Catalog.GetString (@"Mini Mode");
         Catalog.GetString (@"Control Banshee through a small window with only playback controls and track information.");
         Catalog.GetString (@"Utilities");
 
-        // ../src/Extensions/Banshee.Moblin/Banshee.Moblin.addin.xml
-        Catalog.GetString (@"Moblin Support");
-        Catalog.GetString (@"Provides Moblin integration, including a custom media panel.");
-
         // ../src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml
         Catalog.GetString (@"Multimedia Keys");
         Catalog.GetString (@"Control playback via the multimedia keys on your keyboard.");
diff --git a/profile-configure b/profile-configure
index cc04aa0..64a18f5 100755
--- a/profile-configure
+++ b/profile-configure
@@ -11,7 +11,7 @@ profiles=(
 		--disable-docs
 	"
 	"meego
-		--enable-moblin
+		--enable-meego
 		--disable-gnome
 		--disable-daap
 		--disable-webkit
@@ -28,7 +28,6 @@ for ((i=0; i<${#profiles[ ]}; i++)); do
 	profile=(${profiles[$i]})
 	if [ "${profile[0]}" = "$selected_profile" ]; then
 		configure="./configure"
-		echo ${#profile[ ]}
 		for ((j=1; j<${#profile[ ]}; j++)); do
 			configure="$configure ${profile[$j]}"
 		done
diff --git a/src/Core/Banshee.Core/Resources/translators.xml b/src/Core/Banshee.Core/Resources/translators.xml
index d70e828..99f0cb5 100644
--- a/src/Core/Banshee.Core/Resources/translators.xml
+++ b/src/Core/Banshee.Core/Resources/translators.xml
@@ -137,7 +137,7 @@
   <language code="pl" name="Polish">
     <person>Tomasz Dominikowski</person>
   </language>
-  <language code="pt" name="Português">
+  <language code="pt" name="">
     <person>António Lima</person>
     <person>Filipe Gomes</person>
   </language>
diff --git a/src/Extensions/Banshee.Moblin/Banshee.Moblin.addin.xml b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml
similarity index 61%
rename from src/Extensions/Banshee.Moblin/Banshee.Moblin.addin.xml
rename to src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml
index 571e71e..eb5a5ef 100644
--- a/src/Extensions/Banshee.Moblin/Banshee.Moblin.addin.xml
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Addin 
-    id="Banshee.Moblin"
+    id="Banshee.MeeGo"
     version="1.0"
     compatVersion="1.0"
-    copyright="© 2009 Novell Inc. Licensed under the MIT X11 license."
-    name="Moblin Support"
-    description="Provides Moblin integration, including a custom media panel."
+    copyright="© 2009-2010 Novell Inc. Licensed under the MIT X11 license."
+    name="MeeGo Support"
+    description="Provides MeeGo integration, including a custom media panel."
     author="Aaron Bockover"
     url="http://banshee-project.org/";
     defaultEnabled="true">
@@ -16,11 +16,11 @@
   </Dependencies>
   
   <Extension path="/Banshee/ServiceManager/Service">
-    <Service class="Banshee.Moblin.MoblinService"/>
+    <Service class="Banshee.MeeGo.MeeGoService"/>
   </Extension>
   
   <Extension path="/Banshee/ThickClient/GtkBaseClient/PostInitializeGtk">
-    <PostInitializeGtk class="Banshee.Moblin.MoblinPanel"/>
+    <PostInitializeGtk class="Banshee.MeeGo.MeeGoPanel"/>
   </Extension>
    
 </Addin>
diff --git a/src/Extensions/Banshee.Moblin/Banshee.Moblin.csproj b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.csproj
similarity index 81%
rename from src/Extensions/Banshee.Moblin/Banshee.Moblin.csproj
rename to src/Extensions/Banshee.MeeGo/Banshee.MeeGo.csproj
index 7029651..4029cc4 100644
--- a/src/Extensions/Banshee.Moblin/Banshee.Moblin.csproj
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.csproj
@@ -7,14 +7,14 @@
     <ProjectGuid>{4FBB954A-5CA9-44DC-97DA-7D549AC3EADB}</ProjectGuid>
     <OutputType>Library</OutputType>
     <UseParentDirectoryAsNamespace>true</UseParentDirectoryAsNamespace>
-    <AssemblyName>Banshee.Moblin</AssemblyName>
+    <AssemblyName>Banshee.MeeGo</AssemblyName>
     <SchemaVersion>2.0</SchemaVersion>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\Administrator\Application Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
     <Optimize>true</Optimize>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <RootNamespace>Banshee.Moblin</RootNamespace>
+    <RootNamespace>Banshee.MeeGo</RootNamespace>
     <AssemblyOriginatorKeyFile>.</AssemblyOriginatorKeyFile>
     <ReleaseVersion>1.3</ReleaseVersion>
   </PropertyGroup>
@@ -59,8 +59,8 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Banshee.Moblin.addin.xml">
-      <LogicalName>Banshee.Moblin.addin.xml</LogicalName>
+    <EmbeddedResource Include="Banshee.MeeGo.addin.xml">
+      <LogicalName>Banshee.MeeGo.addin.xml</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -80,18 +80,18 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Compile Include="Banshee.Moblin\MoblinService.cs" />
-    <Compile Include="Banshee.Moblin\MediaPanelContents.cs" />
+    <Compile Include="Banshee.MeeGo\MeeGoService.cs" />
+    <Compile Include="Banshee.MeeGo\MediaPanelContents.cs" />
     <Compile Include="Mutter\PanelClient.cs" />
     <Compile Include="Mutter\PanelGtk.cs" />
-    <Compile Include="Banshee.Moblin\SearchEntry.cs" />
-    <Compile Include="Banshee.Moblin\SearchHeader.cs" />
-    <Compile Include="Banshee.Moblin\PlayQueueBox.cs" />
-    <Compile Include="Banshee.Moblin\PlaybackBox.cs" />
-    <Compile Include="Banshee.Moblin\MoblinTrackInfoDisplay.cs" />
-    <Compile Include="Banshee.Moblin\RecentAlbumsList.cs" />
-    <Compile Include="Banshee.Moblin\MoblinPanel.cs" />
+    <Compile Include="Banshee.MeeGo\SearchEntry.cs" />
+    <Compile Include="Banshee.MeeGo\SearchHeader.cs" />
+    <Compile Include="Banshee.MeeGo\PlayQueueBox.cs" />
+    <Compile Include="Banshee.MeeGo\PlaybackBox.cs" />
+    <Compile Include="Banshee.MeeGo\MeeGoTrackInfoDisplay.cs" />
+    <Compile Include="Banshee.MeeGo\RecentAlbumsList.cs" />
+    <Compile Include="Banshee.MeeGo\MeeGoPanel.cs" />
     <Compile Include="Mutter\SetSizeHandler.cs" />
-    <Compile Include="Banshee.Moblin\RecentAlbumsView.cs" />
+    <Compile Include="Banshee.MeeGo\RecentAlbumsView.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/Extensions/Banshee.Moblin/Banshee.Moblin.dll.config b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.dll.config
similarity index 100%
rename from src/Extensions/Banshee.Moblin/Banshee.Moblin.dll.config
rename to src/Extensions/Banshee.MeeGo/Banshee.MeeGo.dll.config
diff --git a/src/Extensions/Banshee.Moblin/Banshee.Moblin/MediaPanelContents.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
similarity index 96%
rename from src/Extensions/Banshee.Moblin/Banshee.Moblin/MediaPanelContents.cs
rename to src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
index 5f93b52..4636afd 100644
--- a/src/Extensions/Banshee.Moblin/Banshee.Moblin/MediaPanelContents.cs
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
@@ -35,7 +35,7 @@ using Banshee.ServiceStack;
 using Banshee.Sources;
 using Banshee.PlayQueue;
 
-namespace Banshee.Moblin
+namespace Banshee.MeeGo
 {
     public class MediaPanelContents : HBox
     {
@@ -62,7 +62,7 @@ namespace Banshee.Moblin
             var button = new Button (Catalog.GetString ("Music Library"));
             button.Clicked += (o, e) => {
                 ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary);
-                ServiceManager.Get<MoblinService> ().PresentPrimaryInterface ();
+                ServiceManager.Get<MeeGoService> ().PresentPrimaryInterface ();
             };
             var hbox = new HBox ();
             hbox.PackStart (button, false, false, 0);
diff --git a/src/Extensions/Banshee.Moblin/Banshee.Moblin/MoblinPanel.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
similarity index 86%
rename from src/Extensions/Banshee.Moblin/Banshee.Moblin/MoblinPanel.cs
rename to src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
index 106b581..24db2f6 100644
--- a/src/Extensions/Banshee.Moblin/Banshee.Moblin/MoblinPanel.cs
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
@@ -1,5 +1,5 @@
 //
-// MoblinPanel.cs
+// MeeGoPanel.cs
 //
 // Author:
 //   Aaron Bockover <abockover novell com>
@@ -31,11 +31,11 @@ using Mutter;
 using Hyena;
 using Banshee.Base;
 
-namespace Banshee.Moblin
+namespace Banshee.MeeGo
 {
-    public class MoblinPanel : IDisposable
+    public class MeeGoPanel : IDisposable
     {
-        public static MoblinPanel Instance { get; private set; }
+        public static MeeGoPanel Instance { get; private set; }
 
         public PanelGtk ToolbarPanel { get; private set; }
         public Container ParentContainer { get; private set; }
@@ -43,10 +43,10 @@ namespace Banshee.Moblin
         public uint ToolbarPanelWidth { get; private set; }
         public uint ToolbarPanelHeight { get; private set; }
 
-        public MoblinPanel ()
+        public MeeGoPanel ()
         {
             if (Instance != null) {
-                throw new ApplicationException ("Only one MoblinPanel instance can exist");
+                throw new ApplicationException ("Only one MeeGoPanel instance can exist");
             }
 
             if (ApplicationContext.CommandLine.Contains ("mutter-panel")) {
@@ -70,9 +70,9 @@ namespace Banshee.Moblin
                     ToolbarPanelHeight = e.Height;
                 };
             } catch (Exception e) {
-                Log.Exception ("Could not bind to Moblin panel", e);
+                Log.Exception ("Could not bind to MeeGo panel", e);
 
-                var window = new Gtk.Window ("Moblin Media Panel");
+                var window = new Gtk.Window ("MeeGo Media Panel");
                 window.SetDefaultSize (1000, 500);
                 window.WindowPosition = Gtk.WindowPosition.Center;
                 ParentContainer = window;
diff --git a/src/Extensions/Banshee.Moblin/Banshee.Moblin/MoblinService.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
similarity index 90%
rename from src/Extensions/Banshee.Moblin/Banshee.Moblin/MoblinService.cs
rename to src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
index d66cccc..5366c53 100644
--- a/src/Extensions/Banshee.Moblin/Banshee.Moblin/MoblinService.cs
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
@@ -1,5 +1,5 @@
 //
-// MoblinService.cs
+// MeeGoService.cs
 //
 // Authors:
 //   Aaron Bockover <abockover novell com>
@@ -40,9 +40,9 @@ using Banshee.Gui;
 
 using Mutter;
 
-namespace Banshee.Moblin
+namespace Banshee.MeeGo
 {
-    public class MoblinService : IExtensionService
+    public class MeeGoService : IExtensionService
     {
         private GtkElementsService elements_service;
         private InterfaceActionService interface_action_service;
@@ -50,7 +50,7 @@ namespace Banshee.Moblin
         private PlayerEngineService player;
         private Banshee.Sources.Source now_playing;
 
-        public MoblinService ()
+        public MeeGoService ()
         {
         }
 
@@ -98,21 +98,21 @@ namespace Banshee.Moblin
         {
             ReflectionHackeryUpTheNereid ();
 
-            if (MoblinPanel.Instance == null) {
+            if (MeeGoPanel.Instance == null) {
                 return;
             }
 
-            var container = MoblinPanel.Instance.ParentContainer;
+            var container = MeeGoPanel.Instance.ParentContainer;
             foreach (var child in container.Children) {
                 container.Remove (child);
             }
             container.Add (new MediaPanelContents ());
             container.ShowAll ();
 
-            if (MoblinPanel.Instance.ToolbarPanel != null) {
+            if (MeeGoPanel.Instance.ToolbarPanel != null) {
                 container.SetSizeRequest (
-                    (int)MoblinPanel.Instance.ToolbarPanelWidth,
-                    (int)MoblinPanel.Instance.ToolbarPanelHeight);
+                    (int)MeeGoPanel.Instance.ToolbarPanelWidth,
+                    (int)MeeGoPanel.Instance.ToolbarPanelHeight);
             }
 
             elements_service.PrimaryWindowClose = () => {
@@ -146,12 +146,12 @@ namespace Banshee.Moblin
             // regular metacity does not seem to like this at all, crashing
             // and complaining "Window manager warning: Buggy client sent a
             // _NET_ACTIVE_WINDOW message with a timestamp of 0 for 0x2e00020"
-            if (MoblinPanel.Instance != null) {
+            if (MeeGoPanel.Instance != null) {
                 pwin.Decorated = false;
                 pwin.Maximize ();
             }
 
-            // Now we want to make the Toolbar work in the Moblin GTK theme
+            // Now we want to make the Toolbar work in the MeeGo GTK theme
             var pwin_toolbar = (Toolbar)pwin_type.GetProperty ("HeaderToolbar").GetValue (pwin, null);
             var pwin_toolbar_align = (Alignment)pwin_toolbar.Parent;
             pwin_toolbar_align.TopPadding = 0;
@@ -218,15 +218,15 @@ namespace Banshee.Moblin
         {
             elements_service.PrimaryWindow.Maximize ();
             elements_service.PrimaryWindow.Present ();
-            if (MoblinPanel.Instance != null && MoblinPanel.Instance.ToolbarPanel != null) {
-                MoblinPanel.Instance.ToolbarPanel.RequestHide ();
+            if (MeeGoPanel.Instance != null && MeeGoPanel.Instance.ToolbarPanel != null) {
+                MeeGoPanel.Instance.ToolbarPanel.RequestHide ();
             }
         }
 
         public void Dispose ()
         {
-            if (MoblinPanel.Instance != null) {
-                MoblinPanel.Instance.Dispose ();
+            if (MeeGoPanel.Instance != null) {
+                MeeGoPanel.Instance.Dispose ();
             }
 
             interface_action_service = null;
@@ -234,7 +234,7 @@ namespace Banshee.Moblin
         }
 
         string IService.ServiceName {
-            get { return "MoblinService"; }
+            get { return "MeeGoService"; }
         }
     }
 }
diff --git a/src/Extensions/Banshee.Moblin/Banshee.Moblin/MoblinTrackInfoDisplay.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTrackInfoDisplay.cs
similarity index 91%
rename from src/Extensions/Banshee.Moblin/Banshee.Moblin/MoblinTrackInfoDisplay.cs
rename to src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTrackInfoDisplay.cs
index b39ddf1..e18bc5b 100644
--- a/src/Extensions/Banshee.Moblin/Banshee.Moblin/MoblinTrackInfoDisplay.cs
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTrackInfoDisplay.cs
@@ -1,5 +1,5 @@
 //
-// MoblinTrackDisplay.cs
+// MeeGoTrackDisplay.cs
 //
 // Authors:
 //   Aaron Bockover <abockover novell com>
@@ -31,13 +31,13 @@ using System.Text.RegularExpressions;
 
 using Banshee.ServiceStack;
 
-namespace Banshee.Moblin
+namespace Banshee.MeeGo
 {
-    public class MoblinTrackInfoDisplay : Banshee.Gui.Widgets.ClassicTrackInfoDisplay
+    public class MeeGoTrackInfoDisplay : Banshee.Gui.Widgets.ClassicTrackInfoDisplay
     {
         private Regex line_three_split;
 
-        public MoblinTrackInfoDisplay () : base ()
+        public MeeGoTrackInfoDisplay () : base ()
         {
         }
 
diff --git a/src/Extensions/Banshee.Moblin/Banshee.Moblin/PlayQueueBox.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/PlayQueueBox.cs
similarity index 97%
rename from src/Extensions/Banshee.Moblin/Banshee.Moblin/PlayQueueBox.cs
rename to src/Extensions/Banshee.MeeGo/Banshee.MeeGo/PlayQueueBox.cs
index 4f8cf7f..cb50a3c 100644
--- a/src/Extensions/Banshee.Moblin/Banshee.Moblin/PlayQueueBox.cs
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/PlayQueueBox.cs
@@ -35,7 +35,7 @@ using Banshee.ServiceStack;
 using Banshee.Sources;
 using Banshee.PlayQueue;
 
-namespace Banshee.Moblin
+namespace Banshee.MeeGo
 {
     public class PlayQueueBox : VBox
     {
@@ -61,7 +61,7 @@ namespace Banshee.Moblin
                 })
             }, true, true, 0);
 
-            PackStart (new MoblinTrackInfoDisplay () {
+            PackStart (new MeeGoTrackInfoDisplay () {
                 HeightRequest = 64
             }, false, false, 10);
 
diff --git a/src/Extensions/Banshee.Moblin/Banshee.Moblin/PlaybackBox.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/PlaybackBox.cs
similarity index 98%
rename from src/Extensions/Banshee.Moblin/Banshee.Moblin/PlaybackBox.cs
rename to src/Extensions/Banshee.MeeGo/Banshee.MeeGo/PlaybackBox.cs
index 8eecd13..c39b318 100644
--- a/src/Extensions/Banshee.Moblin/Banshee.Moblin/PlaybackBox.cs
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/PlaybackBox.cs
@@ -32,7 +32,7 @@ using Banshee.Gui.Widgets;
 
 using Banshee.ServiceStack;
 
-namespace Banshee.Moblin
+namespace Banshee.MeeGo
 {
     public class PlaybackBox : HBox
     {
diff --git a/src/Extensions/Banshee.Moblin/Banshee.Moblin/RecentAlbumsList.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/RecentAlbumsList.cs
similarity index 99%
rename from src/Extensions/Banshee.Moblin/Banshee.Moblin/RecentAlbumsList.cs
rename to src/Extensions/Banshee.MeeGo/Banshee.MeeGo/RecentAlbumsList.cs
index 55fb740..0a42137 100644
--- a/src/Extensions/Banshee.Moblin/Banshee.Moblin/RecentAlbumsList.cs
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/RecentAlbumsList.cs
@@ -35,7 +35,7 @@ using Banshee.ServiceStack;
 using Banshee.Collection;
 using Banshee.Collection.Database;
 
-namespace Banshee.Moblin
+namespace Banshee.MeeGo
 {
     public class RecentAlbumsList
     {
diff --git a/src/Extensions/Banshee.Moblin/Banshee.Moblin/RecentAlbumsView.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/RecentAlbumsView.cs
similarity index 97%
rename from src/Extensions/Banshee.Moblin/Banshee.Moblin/RecentAlbumsView.cs
rename to src/Extensions/Banshee.MeeGo/Banshee.MeeGo/RecentAlbumsView.cs
index f7bfd57..9b10461 100644
--- a/src/Extensions/Banshee.Moblin/Banshee.Moblin/RecentAlbumsView.cs
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/RecentAlbumsView.cs
@@ -35,7 +35,7 @@ using Banshee.Collection;
 using Banshee.Collection.Gui;
 using Banshee.ServiceStack;
 
-namespace Banshee.Moblin
+namespace Banshee.MeeGo
 {
     public class RecentAlbumsView : Table
     {
@@ -69,7 +69,7 @@ namespace Banshee.Moblin
                     source.FilterType = TrackFilterType.None;
                     source.FilterQuery = String.Format ("artist=\"{0}\" album=\"{1}\"", Album.ArtistName, Album.Title);
                     ServiceManager.SourceManager.SetActiveSource (source);
-                    ServiceManager.Get<MoblinService> ().PresentPrimaryInterface ();
+                    ServiceManager.Get<MeeGoService> ().PresentPrimaryInterface ();
 
                     var player = ServiceManager.PlayerEngine;
                     if (!player.IsPlaying () || player.CurrentState == Banshee.MediaEngine.PlayerState.Paused) {
diff --git a/src/Extensions/Banshee.Moblin/Banshee.Moblin/SearchEntry.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs
similarity index 99%
rename from src/Extensions/Banshee.Moblin/Banshee.Moblin/SearchEntry.cs
rename to src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs
index 3146fbf..722112f 100644
--- a/src/Extensions/Banshee.Moblin/Banshee.Moblin/SearchEntry.cs
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs
@@ -33,7 +33,7 @@ using Banshee.ServiceStack;
 using Banshee.Gui;
 using Banshee.Collection;
 
-namespace Banshee.Moblin
+namespace Banshee.MeeGo
 {
     public class SearchEntry : Banshee.Widgets.SearchEntry
     {
diff --git a/src/Extensions/Banshee.Moblin/Banshee.Moblin/SearchHeader.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchHeader.cs
similarity index 96%
rename from src/Extensions/Banshee.Moblin/Banshee.Moblin/SearchHeader.cs
rename to src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchHeader.cs
index 2cecc88..9077da0 100644
--- a/src/Extensions/Banshee.Moblin/Banshee.Moblin/SearchHeader.cs
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchHeader.cs
@@ -34,7 +34,7 @@ using Banshee.Collection;
 using Banshee.ServiceStack;
 using Banshee.Gui;
 
-namespace Banshee.Moblin
+namespace Banshee.MeeGo
 {
     public class SearchHeader : HBox
     {
@@ -53,7 +53,7 @@ namespace Banshee.Moblin
                     source.FilterQuery = search.Entry.Query;
                     ServiceManager.SourceManager.SetActiveSource (source);
                     search.Entry.Query = String.Empty;
-                    ServiceManager.Get<MoblinService> ().PresentPrimaryInterface ();
+                    ServiceManager.Get<MeeGoService> ().PresentPrimaryInterface ();
                 }
             };
             PackStart (search, true, true, 0);
diff --git a/src/Extensions/Banshee.MeeGo/Makefile.am b/src/Extensions/Banshee.MeeGo/Makefile.am
new file mode 100644
index 0000000..724c50d
--- /dev/null
+++ b/src/Extensions/Banshee.MeeGo/Makefile.am
@@ -0,0 +1,62 @@
+ASSEMBLY = Banshee.MeeGo
+TARGET = library
+LINK = $(REF_EXTENSION_MEEGO) $(LINK_EXTENSION_PLAYQUEUE_DEPS)
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
+
+ INTLTOOL_DESKTOP_RULE@
+
+SOURCES =  \
+	Banshee.MeeGo/MediaPanelContents.cs \
+	Banshee.MeeGo/MeeGoPanel.cs \
+	Banshee.MeeGo/MeeGoService.cs \
+	Banshee.MeeGo/MeeGoTrackInfoDisplay.cs \
+	Banshee.MeeGo/PlaybackBox.cs \
+	Banshee.MeeGo/PlayQueueBox.cs \
+	Banshee.MeeGo/RecentAlbumsList.cs \
+	Banshee.MeeGo/RecentAlbumsView.cs \
+	Banshee.MeeGo/SearchEntry.cs \
+	Banshee.MeeGo/SearchHeader.cs \
+	Mutter/PanelClient.cs \
+	Mutter/PanelGtk.cs \
+	Mutter/SetSizeHandler.cs
+
+RESOURCES = Banshee.MeeGo.addin.xml
+
+if HAVE_MEEGO
+
+include $(top_srcdir)/build/build.mk
+
+module_SCRIPTS += Banshee.MeeGo.dll.config
+
+paneldir = $(libdir)/mutter-moblin
+panel_SCRIPTS = meego-panel-banshee
+
+servicedir = $(datadir)/dbus-1/services
+service_DATA = org.moblin.UX.Shell.Panels.banshee.service
+
+org.moblin.UX.Shell.Panels.banshee.service: org.moblin.UX.Shell.Panels.banshee.service.in $(top_builddir)/config.log
+	sed -e "s|\ libexecdir\@|$(libdir)/mutter-moblin|" $< > $@
+
+desktopfiles_in_files=meego-panel-banshee.desktop.in
+desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
+
+desktopfilesdir=$(MEEGO_PANELS_DIR)/
+desktopfiles_DATA = $(desktopfiles_files)
+
+%.desktop.in: %.desktop.in.in Makefile
+	sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
+
+clean-local:
+	rm org.moblin.UX.Shell.Panels.banshee.service \
+		meego-panel-banshee.desktop \
+		meego-panel-banshee.desktop.in
+
+else
+EXTRA_DIST = $(SOURCES) $(RESOURCES)
+endif
+
+EXTRA_DIST += \
+	Banshee.MeeGo.dll.config \
+	meego-panel-banshee \
+	org.moblin.UX.Shell.Panels.banshee.service.in \
+	meego-panel-banshee.desktop.in.in
diff --git a/src/Extensions/Banshee.Moblin/Mutter/PanelClient.cs b/src/Extensions/Banshee.MeeGo/Mutter/PanelClient.cs
similarity index 100%
rename from src/Extensions/Banshee.Moblin/Mutter/PanelClient.cs
rename to src/Extensions/Banshee.MeeGo/Mutter/PanelClient.cs
diff --git a/src/Extensions/Banshee.Moblin/Mutter/PanelGtk.cs b/src/Extensions/Banshee.MeeGo/Mutter/PanelGtk.cs
similarity index 100%
rename from src/Extensions/Banshee.Moblin/Mutter/PanelGtk.cs
rename to src/Extensions/Banshee.MeeGo/Mutter/PanelGtk.cs
diff --git a/src/Extensions/Banshee.Moblin/Mutter/SetSizeHandler.cs b/src/Extensions/Banshee.MeeGo/Mutter/SetSizeHandler.cs
similarity index 100%
rename from src/Extensions/Banshee.Moblin/Mutter/SetSizeHandler.cs
rename to src/Extensions/Banshee.MeeGo/Mutter/SetSizeHandler.cs
diff --git a/src/Extensions/Banshee.Moblin/moblin-panel-media b/src/Extensions/Banshee.MeeGo/meego-panel-banshee
similarity index 100%
rename from src/Extensions/Banshee.Moblin/moblin-panel-media
rename to src/Extensions/Banshee.MeeGo/meego-panel-banshee
diff --git a/src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in b/src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in
new file mode 100644
index 0000000..068ef53
--- /dev/null
+++ b/src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Exec= libexecdir@/meego-panel-banshee
+_Name=media
+_Comment=Quick access panel for your media
+OnlyShowIn=MOBLIN
+X-Moblin-Priority=Low
+X-Moblin-Service=org.moblin.UX.Shell.Panels.banshee
+X-Moblin-Panel-Button-Style=media-button
diff --git a/src/Extensions/Banshee.MeeGo/org.moblin.UX.Shell.Panels.banshee.service.in b/src/Extensions/Banshee.MeeGo/org.moblin.UX.Shell.Panels.banshee.service.in
new file mode 100644
index 0000000..1b0cf67
--- /dev/null
+++ b/src/Extensions/Banshee.MeeGo/org.moblin.UX.Shell.Panels.banshee.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.moblin.UX.Shell.Panels.banshee
+Exec= libexecdir@/meego-panel-banshee
diff --git a/src/Extensions/Makefile.am b/src/Extensions/Makefile.am
index 1963418..23ed398 100644
--- a/src/Extensions/Makefile.am
+++ b/src/Extensions/Makefile.am
@@ -18,7 +18,7 @@ SUBDIRS = \
 	Banshee.NowPlaying \
 	Banshee.PlayerMigration \
 	Banshee.PlayQueue \
-	Banshee.Moblin \
+	Banshee.MeeGo \
 	Banshee.Podcasting \
 	Banshee.Sample \
 	Banshee.SqlDebugConsole \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]