Merge lp:~jpetersen/ubuntu/lucid/rhythmbox/appindicator into lp:ubuntu/lucid/rhythmbox

[Jan Arne Petersen]

82_rhythmbox-indicators.patch: Remove workaround for a bug fixed in indicator-application.

With current indicator-application the Artist/Title menu items will be updated.

[James Westby (james-w)]

review: Abstain

[Ken VanDine (ken-vandine)]

Approve, I actually merged it into lp:~ubuntu-desktop/rhythmbox/ubuntu

It will get included in the next upload, we are in beta freeze right now and this isn't really urgent enough to try to push this through before beta-1.

review: Approve

=== modified file 'debian/patches/82_rhythmbox-indicators.patch'
--- debian/patches/82_rhythmbox-indicators.patch	2010-03-04 15:19:03 +0000
+++ debian/patches/82_rhythmbox-indicators.patch	2010-03-10 20:00:37 +0000
@@ -2,7 +2,7 @@
 # Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=606972
 # Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rhythmbox/+bug/498588
 diff --git a/configure.ac b/configure.ac
-index 74aaeb8..bf012da 100644
+index 6349a15..134ec20 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -46,6 +46,7 @@ LIBSOUP_REQS=2.26.0
@@ -43,7 +43,7 @@
  dnl daap support
  if test "x$enable_daap" != "xno"; then
  	if test x"$have_mdns" = xno; then
-@@ -949,4 +973,10 @@ else
+@@ -951,4 +975,10 @@ else
  	AC_MSG_NOTICE([   iTunes detection browser plugin (for podcasts) disabled])
  fi
  
@@ -377,7 +377,7 @@
 +{
 +}
 diff --git a/plugins/status-icon/rb-status-icon-plugin.c b/plugins/status-icon/rb-status-icon-plugin.c
-index 41c59be..70da8f3 100644
+index 4c931b5..9c50d65 100644
 --- a/plugins/status-icon/rb-status-icon-plugin.c
 +++ b/plugins/status-icon/rb-status-icon-plugin.c
 @@ -107,6 +107,9 @@ struct _RBStatusIconPluginPrivate
@@ -457,21 +457,18 @@
  		break;
  
  	default:
-@@ -571,10 +599,47 @@ update_tooltip (RBStatusIconPlugin *plugin)
+@@ -571,10 +599,32 @@ update_tooltip (RBStatusIconPlugin *plugin)
  	gboolean playing;
  	char *elapsed_string;
  	GString *secondary;
 +#ifdef HAVE_APP_INDICATOR
 +	GtkAction *action;
-+        GtkUIManager *ui_manager;
-+	GtkWidget *widget;
 +#endif
  
  	rb_shell_player_get_playing (plugin->priv->shell_player, &playing, NULL);
  	elapsed_string = rb_shell_player_get_playing_time_string (plugin->priv->shell_player);
  
 +#ifdef HAVE_APP_INDICATOR
-+        g_object_get (plugin->priv->shell, "ui-manager", &ui_manager, NULL);
 +	action = gtk_action_group_get_action (plugin->priv->action_group,
 +					      "TrayDisplayArtist");
 +	if (plugin->priv->current_artist != NULL &&
@@ -481,11 +478,6 @@
 +	} else {
 +		gtk_action_set_visible (action, FALSE);
 +	}
-+	/* Requires manual synchronization because of Gtk+ bug */
-+        widget = gtk_ui_manager_get_widget (GTK_UI_MANAGER (ui_manager),
-+                                            "/RhythmboxIndicator/DisplayArtist");
-+	gtk_menu_item_set_label (GTK_MENU_ITEM (widget),
-+				 gtk_action_get_label (action));
 +
 +	action = gtk_action_group_get_action (plugin->priv->action_group,
 +					      "TrayDisplayTitle");
@@ -494,18 +486,11 @@
 +	} else {
 +		gtk_action_set_label (action, plugin->priv->current_title);
 +	}
-+	/* Requires manual synchronization because of Gtk+ bug */
-+        widget = gtk_ui_manager_get_widget (GTK_UI_MANAGER (ui_manager),
-+                                            "/RhythmboxIndicator/DisplayTitle");
-+	gtk_menu_item_set_label (GTK_MENU_ITEM (widget),
-+				 gtk_action_get_label (action));
-+
-+	g_object_unref (ui_manager);
 +#endif
  	secondary = g_string_sized_new (100);
  	if (plugin->priv->current_album_and_artist != NULL) {
  		g_string_append (secondary, plugin->priv->current_album_and_artist);
-@@ -701,6 +766,10 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)
+@@ -701,6 +751,10 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)
  	g_free (plugin->priv->current_album_and_artist);
  	plugin->priv->current_title = NULL;
  	plugin->priv->current_album_and_artist = NULL;
@@ -516,7 +501,7 @@
  
  	if (entry == NULL)
  		return;
-@@ -712,11 +781,17 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)
+@@ -712,11 +766,17 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)
  						       entry,
  						       RHYTHMDB_PROP_STREAM_SONG_ARTIST);
  	if (value != NULL) {
@@ -534,7 +519,7 @@
  	}
  
  	/* get album, preferring streaming song details */
-@@ -1222,6 +1297,14 @@ impl_get_config_widget (RBPlugin *bplugin)
+@@ -1222,6 +1282,14 @@ impl_get_config_widget (RBPlugin *bplugin)
  	plugin->priv->icon_combo = GTK_WIDGET (gtk_builder_get_object (builder, "statusiconmode"));
  	plugin->priv->notify_combo = GTK_WIDGET (gtk_builder_get_object (builder, "notificationmode"));
  	plugin->priv->wheel_combo = GTK_WIDGET (gtk_builder_get_object (builder, "mousewheelmode"));
@@ -549,7 +534,7 @@
  	g_signal_connect_object (plugin->priv->notify_combo,
  				 "changed",
  				 G_CALLBACK (notification_config_changed_cb),
-@@ -1251,6 +1334,9 @@ impl_activate (RBPlugin *bplugin,
+@@ -1251,6 +1319,9 @@ impl_activate (RBPlugin *bplugin,
  	RhythmDBEntry *entry;
  	GtkWindow *window;
  	char *uifile;
@@ -559,7 +544,7 @@
  
  	rb_debug ("activating status icon plugin");
  
-@@ -1330,6 +1416,18 @@ impl_activate (RBPlugin *bplugin,
+@@ -1330,6 +1401,18 @@ impl_activate (RBPlugin *bplugin,
  	}
  	update_tooltip (plugin);
  
@@ -578,7 +563,7 @@
  	g_object_unref (ui_manager);
  	g_object_unref (window);
  }
-@@ -1418,6 +1516,10 @@ impl_deactivate	(RBPlugin *bplugin,
+@@ -1418,6 +1501,10 @@ impl_deactivate	(RBPlugin *bplugin,
  	plugin->priv->current_title = NULL;
  	plugin->priv->current_album_and_artist = NULL;
  	plugin->priv->tooltip_markup = NULL;