[rhythmbox/gobject-introspection: 35/41] Merge branch 'master' into gobject-introspection

[Jonathan Matthew <jmatthew src gnome org>]

commit 112b5e58d1c2b03f3c46a7336c9865d177829465
Merge: ca84d5b 2fb8523
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sun Dec 12 12:58:29 2010 +1000

    Merge branch 'master' into gobject-introspection
    
    Conflicts:
    	bindings/python/rb.defs
    	plugins/cd-recorder/rb-cd-recorder-plugin.c
    	plugins/context/context/ContextView.py
    	plugins/jamendo/jamendo/__init__.py
    	plugins/magnatune/magnatune/MagnatuneSource.py
    	plugins/magnatune/magnatune/__init__.py

 HACKING                                            |   10 +-
 help/Makefile.am                                   |    2 +-
 lib/rb-marshal.list                                |    2 +-
 plugins/audioscrobbler/Makefile.am                 |    1 +
 .../rb-audioscrobbler-radio-source.c               |   17 +-
 .../rb-audioscrobbler-radio-source.h               |    1 +
 .../rb-disc-recorder-plugin.c                      |    4 +-
 plugins/context/Makefile.am                        |    6 +-
 plugins/context/context/ContextView.py             |   13 +-
 plugins/context/context/LinksTab.py                |  181 ++++
 plugins/context/context/Makefile.am                |    1 +
 plugins/context/img/links/Allmusic16x16.png        |  Bin 0 -> 803 bytes
 plugins/context/img/links/Discogs16x16.png         |  Bin 0 -> 771 bytes
 plugins/context/img/links/Wikipedia16x16.png       |  Bin 0 -> 381 bytes
 plugins/context/tmpl/links-tmpl.html               |   30 +
 .../rb-dbus-media-server-plugin.c                  |  550 ++++++++++++-
 plugins/jamendo/jamendo/__init__.py                |    4 +-
 plugins/magnatune/magnatune/MagnatuneSource.py     |    4 +-
 plugins/magnatune/magnatune/__init__.py            |    6 +-
 plugins/mpris/rb-mpris-plugin.c                    |   12 +-
 po/cs.po                                           |  791 +++++++++---------
 po/es.po                                           |  871 ++++++++++----------
 po/sl.po                                           |   81 ++-
 shell/rb-shell.c                                   |    6 +-
 24 files changed, 1692 insertions(+), 901 deletions(-)
---
diff --cc plugins/context/context/ContextView.py
index e2301b2,ab65927..4138fa4
--- a/plugins/context/context/ContextView.py
+++ b/plugins/context/context/ContextView.py
@@@ -24,18 -24,17 +24,19 @@@
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
  
- import gobject
 -import rb, rhythmdb
 -import gtk, gobject, gio
 -import pango
++import gobject, gio
  import webkit
  import os
  
  import ArtistTab as at
  import AlbumTab as abt
  import LyricsTab as lt
+ import LinksTab as lit
  
 +import rb
 +from gi.repository import Gtk, Gdk, Pango
 +from gi.repository import RB
 +
  context_ui = """
  <ui>
      <toolbar name="ToolBar">
diff --cc plugins/jamendo/jamendo/__init__.py
index a30c6c4,ca590c8..40cd7c8
--- a/plugins/jamendo/jamendo/__init__.py
+++ b/plugins/jamendo/jamendo/__init__.py
@@@ -95,18 -90,18 +95,18 @@@ class Jamendo(RB.Plugin)
  
  		# Add button
  		manager = shell.get_player().get_property('ui-manager')
 -		action = gtk.Action('JamendoDownloadAlbum', _('_Download Album'),
 -				_("Download this album using BitTorrent"),
 -				'gtk-save')
 +		action = Gtk.Action(name='JamendoDownloadAlbum', label=_('_Download Album'),
 +				tooltip=_("Download this album using BitTorrent"),
 +				stock_id='gtk-save')
- 		action.connect('activate', lambda a: shell.get_property("selected-source").download_album())
+ 		action.connect('activate', lambda a: shell.get_property("selected-page").download_album())
 -		self.action_group = gtk.ActionGroup('JamendoPluginActions')
 +		self.action_group = Gtk.ActionGroup(label='JamendoPluginActions')
  		self.action_group.add_action(action)
  		
  		# Add Button for Donate
 -		action = gtk.Action('JamendoDonateArtist', _('_Donate to Artist'),
 -				_("Donate Money to this Artist"),
 -				'gtk-jump-to')
 +		action = Gtk.Action(name='JamendoDonateArtist', label=_('_Donate to Artist'),
 +				tooltip=_("Donate Money to this Artist"),
 +				stock_id='gtk-jump-to')
- 		action.connect('activate', lambda a: shell.get_property("selected-source").launch_donate())
+ 		action.connect('activate', lambda a: shell.get_property("selected-page").launch_donate())
  		self.action_group.add_action(action)
  
  		manager.insert_action_group(self.action_group, 0)
diff --cc plugins/magnatune/magnatune/__init__.py
index 090fe03,fd661c2..bd6a898
--- a/plugins/magnatune/magnatune/__init__.py
+++ b/plugins/magnatune/magnatune/__init__.py
@@@ -113,22 -110,22 +113,22 @@@ class Magnatune(RB.Plugin)
  
  		manager = shell.get_player().get_property('ui-manager')
  		# Add the popup menu actions
 -		self.action_group = gtk.ActionGroup('MagnatunePluginActions')
 +		self.action_group = Gtk.ActionGroup(name='MagnatunePluginActions')
  
 -		action = gtk.Action('MagnatuneDownloadAlbum', _('Download Album'),
 -				_("Download this album from Magnatune"),
 -				'gtk-save')
 +		action = Gtk.Action(name='MagnatuneDownloadAlbum', label=_('Download Album'),
 +				tooltip=_("Download this album from Magnatune"),
 +				stock_id='gtk-save')
- 		action.connect('activate', lambda a: self.shell.get_property("selected-source").download_album())
+ 		action.connect('activate', lambda a: self.shell.get_property("selected-page").download_album())
  		self.action_group.add_action(action)
 -		action = gtk.Action('MagnatuneArtistInfo', _('Artist Information'),
 -				_("Get information about this artist"),
 -				'gtk-info')
 +		action = Gtk.Action(name='MagnatuneArtistInfo', label=_('Artist Information'),
 +				tooltip=_("Get information about this artist"),
 +				stock_id='gtk-info')
- 		action.connect('activate', lambda a: self.shell.get_property("selected-source").display_artist_info())
+ 		action.connect('activate', lambda a: self.shell.get_property("selected-page").display_artist_info())
  		self.action_group.add_action(action)
 -		action = gtk.Action('MagnatuneCancelDownload', _('Cancel Downloads'),
 -				_("Stop downloading purchased albums"),
 -				'gtk-stop')
 +		action = Gtk.Action(name='MagnatuneCancelDownload', label=_('Cancel Downloads'),
 +				tooltip=_("Stop downloading purchased albums"),
 +				stock_id='gtk-stop')
- 		action.connect('activate', lambda a: self.shell.get_property("selected-source").cancel_downloads())
+ 		action.connect('activate', lambda a: self.shell.get_property("selected-page").cancel_downloads())
  		action.set_sensitive(False)
  		self.action_group.add_action(action)