[banshee] Rename all Moblin instances to MeeGo

[Aaron Bockover <abock src gnome org>]

commit acf6457fbecbae29bdc91c682967ba1bccc0ae37
Author: Aaron Bockover <abockover novell com>
Date:   Wed Jul 28 15:27:21 2010 +0200

    Rename all Moblin instances to MeeGo
    
    The upstream MeeGo libraries have changed their naming for 1.1.

 build/m4/banshee/meego.m4                          |    2 +-
 configure.ac                                       |    2 +-
 src/Clients/Nereid/Nereid/PlayerInterface.cs       |    2 +-
 .../Banshee.MeeGo/Banshee.MeeGo.dll.config         |    2 +-
 src/Extensions/Banshee.MeeGo/Makefile.am           |   10 +++---
 .../Banshee.MeeGo/MeeGo.Panel/PanelClient.cs       |   30 ++++++++++----------
 .../Banshee.MeeGo/MeeGo.Panel/PanelGtk.cs          |    8 ++--
 ...> com.meego.UX.Shell.Panels.banshee.service.in} |    2 +-
 .../meego-panel-banshee.desktop.in.in              |    8 ++--
 .../Banshee.PlayQueue/QueueableSourceComboBox.cs   |    2 +-
 10 files changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/build/m4/banshee/meego.m4 b/build/m4/banshee/meego.m4
index eceebe3..8cd857c 100644
--- a/build/m4/banshee/meego.m4
+++ b/build/m4/banshee/meego.m4
@@ -1,6 +1,6 @@
 AC_DEFUN([BANSHEE_CHECK_MEEGO],
 [
-	AC_ARG_ENABLE(meego, AC_HELP_STRING([--enable-meego], [Enable Moblin integration]), , enable_meego="no")
+	AC_ARG_ENABLE(meego, AC_HELP_STRING([--enable-meego], [Enable MeeGo integration]), , enable_meego="no")
 
 	if test "x$enable_meego" = "xyes"; then
 		AM_CONDITIONAL(HAVE_MEEGO, true)
diff --git a/configure.ac b/configure.ac
index 7b0887e..1bef10f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,7 @@ dnl 'Media Player' from the app Name, bgo#596242, except
 dnl in MeeGo where GNOME >= 2.28, but we want the full name
 PKG_CHECK_MODULES(GNOME_2_28, gnome-desktop-2.0 >= 2.28,
 	HAVE_GNOME_2_28=yes, HAVE_GNOME_2_28=no)
-PKG_CHECK_MODULES(MEEGO_PANEL, moblin-panel,
+PKG_CHECK_MODULES(MEEGO_PANEL, meego-panel,
 	HAVE_MEEGO_PANEL=yes, HAVE_MEEGO_PANEL=no)
 if test "x$HAVE_GNOME_2_28" = "xno" -o "x$HAVE_MEEGO_PANEL" = "xyes"; then
 	BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player"
diff --git a/src/Clients/Nereid/Nereid/PlayerInterface.cs b/src/Clients/Nereid/Nereid/PlayerInterface.cs
index fae8e49..f27de71 100644
--- a/src/Clients/Nereid/Nereid/PlayerInterface.cs
+++ b/src/Clients/Nereid/Nereid/PlayerInterface.cs
@@ -186,7 +186,7 @@ namespace Nereid
 
             if (PlatformDetection.IsMeeGo) {
                 header_toolbar.IconSize = IconSize.LargeToolbar;
-                header_toolbar.Name = "moblin-toolbar";
+                header_toolbar.Name = "meego-toolbar";
             }
 
             toolbar_alignment.Add (header_toolbar);
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.dll.config b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.dll.config
index 6b344f2..c4b624a 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.dll.config
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.dll.config
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="libmoblin-panel" target="libmoblin-panel.so.0"/>
+  <dllmap dll="libmeego-panel" target="libmeego-panel.so.0"/>
 </configuration>
diff --git a/src/Extensions/Banshee.MeeGo/Makefile.am b/src/Extensions/Banshee.MeeGo/Makefile.am
index 29cfcdf..20efead 100644
--- a/src/Extensions/Banshee.MeeGo/Makefile.am
+++ b/src/Extensions/Banshee.MeeGo/Makefile.am
@@ -32,21 +32,21 @@ paneldir = $(libexecdir)
 panel_SCRIPTS = meego-panel-banshee
 
 servicedir = $(datadir)/dbus-1/services
-service_DATA = org.moblin.UX.Shell.Panels.banshee.service
+service_DATA = com.meego.UX.Shell.Panels.banshee.service
 
-org.moblin.UX.Shell.Panels.banshee.service: org.moblin.UX.Shell.Panels.banshee.service.in $(top_builddir)/config.log
+com.meego.UX.Shell.Panels.banshee.service: com.meego.UX.Shell.Panels.banshee.service.in $(top_builddir)/config.log
 	sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
 
 desktopfiles_in_files = meego-panel-banshee.desktop.in
 desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
-desktopfilesdir = $(datadir)/mutter-moblin/panels
+desktopfilesdir = $(datadir)/mutter-meego/panels
 desktopfiles_DATA = $(desktopfiles_files)
 
 %.desktop.in: %.desktop.in.in Makefile
 	sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
 
 clean-local:
-	rm -f org.moblin.UX.Shell.Panels.banshee.service \
+	rm -f com.meego.UX.Shell.Panels.banshee.service \
 		meego-panel-banshee.desktop \
 		meego-panel-banshee.desktop.in
 
@@ -57,5 +57,5 @@ endif
 EXTRA_DIST += \
 	Banshee.MeeGo.dll.config \
 	meego-panel-banshee \
-	org.moblin.UX.Shell.Panels.banshee.service.in \
+	com.meego.UX.Shell.Panels.banshee.service.in \
 	meego-panel-banshee.desktop.in.in
diff --git a/src/Extensions/Banshee.MeeGo/MeeGo.Panel/PanelClient.cs b/src/Extensions/Banshee.MeeGo/MeeGo.Panel/PanelClient.cs
index 4641ad7..b9d780d 100644
--- a/src/Extensions/Banshee.MeeGo/MeeGo.Panel/PanelClient.cs
+++ b/src/Extensions/Banshee.MeeGo/MeeGo.Panel/PanelClient.cs
@@ -31,7 +31,7 @@ namespace MeeGo.Panel
 {
     public class PanelClient : GLib.Object
     {
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern IntPtr mpl_panel_client_get_type ();
 
         public static new GLib.GType GType {
@@ -47,7 +47,7 @@ namespace MeeGo.Panel
         {
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern void mpl_panel_client_unload (IntPtr panel);
 
         public void Unload ()
@@ -55,7 +55,7 @@ namespace MeeGo.Panel
             mpl_panel_client_unload (Handle);
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern void mpl_panel_client_ready (IntPtr panel);
 
         public void Ready ()
@@ -63,7 +63,7 @@ namespace MeeGo.Panel
             mpl_panel_client_ready (Handle);
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern bool mpl_panel_client_set_delayed_ready (IntPtr panel, bool delayed);
 
         public bool SetDelayedReady (bool delayed)
@@ -71,7 +71,7 @@ namespace MeeGo.Panel
             return mpl_panel_client_set_delayed_ready (Handle, delayed);
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern void mpl_panel_client_show (IntPtr panel);
 
         public void Show ()
@@ -79,7 +79,7 @@ namespace MeeGo.Panel
             mpl_panel_client_show (Handle);
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern void mpl_panel_client_hide (IntPtr panel);
 
         public void Hide ()
@@ -87,10 +87,10 @@ namespace MeeGo.Panel
             mpl_panel_client_hide (Handle);
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern void mpl_panel_client_set_height_request (IntPtr panel, uint height);
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern uint mpl_panel_client_get_height_request (IntPtr panel);
 
         public uint HeightRequest {
@@ -98,7 +98,7 @@ namespace MeeGo.Panel
             set { mpl_panel_client_set_height_request (Handle, value); }
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern void mpl_panel_client_request_focus (IntPtr panel);
 
         public void RequestFocus ()
@@ -106,7 +106,7 @@ namespace MeeGo.Panel
             mpl_panel_client_request_focus (Handle);
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern void mpl_panel_client_request_button_style (IntPtr panel, string style);
 
         public void RequestButtonStyle (string style)
@@ -114,7 +114,7 @@ namespace MeeGo.Panel
             mpl_panel_client_request_button_style (Handle, style);
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern void mpl_panel_client_request_tooltip (IntPtr panel, string tooltip);
 
         public void RequestTooltip (string tooltip)
@@ -122,7 +122,7 @@ namespace MeeGo.Panel
             mpl_panel_client_request_tooltip (Handle, tooltip);
         }
         
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern void mpl_panel_client_request_button_state (IntPtr panel, PanelButtonState state);
 
         public void RequestButtonState (PanelButtonState state)
@@ -130,7 +130,7 @@ namespace MeeGo.Panel
             mpl_panel_client_request_button_state (Handle, state);
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern void mpl_panel_client_request_modality (IntPtr panel, bool modal);
 
         public void RequestModality (bool modal)
@@ -138,14 +138,14 @@ namespace MeeGo.Panel
             mpl_panel_client_request_modality (Handle, modal);
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern uint mpl_panel_client_get_xid (IntPtr panel);
 
         public uint Xid {
             get { return mpl_panel_client_get_xid (Handle); }
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern bool mpl_panel_client_is_windowless (IntPtr panel);
 
         public bool IsWindowless {
diff --git a/src/Extensions/Banshee.MeeGo/MeeGo.Panel/PanelGtk.cs b/src/Extensions/Banshee.MeeGo/MeeGo.Panel/PanelGtk.cs
index 68e0e3d..bba4fcc 100644
--- a/src/Extensions/Banshee.MeeGo/MeeGo.Panel/PanelGtk.cs
+++ b/src/Extensions/Banshee.MeeGo/MeeGo.Panel/PanelGtk.cs
@@ -33,14 +33,14 @@ namespace MeeGo.Panel
 {
     public class PanelGtk : PanelClient
     {
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern IntPtr mpl_panel_gtk_get_type ();
 
         public static new GLib.GType GType {
             get { return new GLib.GType (mpl_panel_gtk_get_type ()); }
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern IntPtr mpl_panel_gtk_new (string name, string tooltip, string stylesheet,
             string button_style, bool with_toolbar_service);
 
@@ -54,7 +54,7 @@ namespace MeeGo.Panel
         {
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern void mpl_panel_gtk_set_child (IntPtr panel, IntPtr child);
 
         public void SetChild (Widget child)
@@ -62,7 +62,7 @@ namespace MeeGo.Panel
             mpl_panel_gtk_set_child (Handle, child == null ? IntPtr.Zero : child.Handle);
         }
 
-        [DllImport ("libmoblin-panel")]
+        [DllImport ("libmeego-panel")]
         private static extern IntPtr mpl_panel_gtk_get_window (IntPtr panel);
 
         private Container container_window;
diff --git a/src/Extensions/Banshee.MeeGo/org.moblin.UX.Shell.Panels.banshee.service.in b/src/Extensions/Banshee.MeeGo/com.meego.UX.Shell.Panels.banshee.service.in
similarity index 57%
rename from src/Extensions/Banshee.MeeGo/org.moblin.UX.Shell.Panels.banshee.service.in
rename to src/Extensions/Banshee.MeeGo/com.meego.UX.Shell.Panels.banshee.service.in
index 1b0cf67..bfbb3bb 100644
--- a/src/Extensions/Banshee.MeeGo/org.moblin.UX.Shell.Panels.banshee.service.in
+++ b/src/Extensions/Banshee.MeeGo/com.meego.UX.Shell.Panels.banshee.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.moblin.UX.Shell.Panels.banshee
+Name=com.meego.UX.Shell.Panels.banshee
 Exec= libexecdir@/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
index 068ef53..b2a6340 100644
--- a/src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in
+++ b/src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in
@@ -3,7 +3,7 @@ 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
+OnlyShowIn=X-MEEGO-NB;
+X-Meego-Priority=Low
+X-Meego-Service=com.meego.UX.Shell.Panels.banshee
+X-Meego-Panel-Button-Style=media-button
diff --git a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/QueueableSourceComboBox.cs b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/QueueableSourceComboBox.cs
index 756af51..dccc590 100644
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/QueueableSourceComboBox.cs
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/QueueableSourceComboBox.cs
@@ -44,7 +44,7 @@ namespace Banshee.PlayQueue
             // width reporting in SourceRowRenderer does not work as
             // I would expect, so currently it's forced to 200px wide
             // which causes quite a problem with a UI like Muinshee
-            // and the Moblin Media Panel
+            // and the MeeGo Media Panel
             //
             // SourceRowRenderer renderer = new SourceRowRenderer ();
             // renderer.ParentWidget = this;