Ubuntu
rhythmbox package

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

  1. Lucid (10.04)
  2. appindicator
  3. Merge into lucid
Proposed by Jan Arne Petersen
Status: Merged
Merge reported by: James Westby
Merged at revision: not available
Proposed branch: lp:~jpetersen/ubuntu/lucid/rhythmbox/appindicator
Merge into: lp:ubuntu/lucid/rhythmbox
Diff against target: 130 lines (+10/-25)
1 file modified
debian/patches/82_rhythmbox-indicators.patch (+10/-25)
To merge this branch: bzr merge lp:~jpetersen/ubuntu/lucid/rhythmbox/appindicator
Reviewer Review Type Date Requested Status
Ken VanDine Approve
James Westby (community) Abstain
Review via email: mp+21077@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Abstain
Revision history for this message
Ken VanDine (ken-vandine) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
2# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=6069722# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=606972
3# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rhythmbox/+bug/4985883# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rhythmbox/+bug/498588
4diff --git a/configure.ac b/configure.ac4diff --git a/configure.ac b/configure.ac
5index 74aaeb8..bf012da 1006445index 6349a15..134ec20 100644
6--- a/configure.ac6--- a/configure.ac
7+++ b/configure.ac7+++ b/configure.ac
8@@ -46,6 +46,7 @@ LIBSOUP_REQS=2.26.08@@ -46,6 +46,7 @@ LIBSOUP_REQS=2.26.0
@@ -43,7 +43,7 @@
43 dnl daap support43 dnl daap support
44 if test "x$enable_daap" != "xno"; then44 if test "x$enable_daap" != "xno"; then
45 if test x"$have_mdns" = xno; then45 if test x"$have_mdns" = xno; then
46@@ -949,4 +973,10 @@ else46@@ -951,4 +975,10 @@ else
47 AC_MSG_NOTICE([ iTunes detection browser plugin (for podcasts) disabled])47 AC_MSG_NOTICE([ iTunes detection browser plugin (for podcasts) disabled])
48 fi48 fi
49 49
@@ -377,7 +377,7 @@
377+{377+{
378+}378+}
379diff --git a/plugins/status-icon/rb-status-icon-plugin.c b/plugins/status-icon/rb-status-icon-plugin.c379diff --git a/plugins/status-icon/rb-status-icon-plugin.c b/plugins/status-icon/rb-status-icon-plugin.c
380index 41c59be..70da8f3 100644380index 4c931b5..9c50d65 100644
381--- a/plugins/status-icon/rb-status-icon-plugin.c381--- a/plugins/status-icon/rb-status-icon-plugin.c
382+++ b/plugins/status-icon/rb-status-icon-plugin.c382+++ b/plugins/status-icon/rb-status-icon-plugin.c
383@@ -107,6 +107,9 @@ struct _RBStatusIconPluginPrivate383@@ -107,6 +107,9 @@ struct _RBStatusIconPluginPrivate
@@ -457,21 +457,18 @@
457 break;457 break;
458 458
459 default:459 default:
460@@ -571,10 +599,47 @@ update_tooltip (RBStatusIconPlugin *plugin)460@@ -571,10 +599,32 @@ update_tooltip (RBStatusIconPlugin *plugin)
461 gboolean playing;461 gboolean playing;
462 char *elapsed_string;462 char *elapsed_string;
463 GString *secondary;463 GString *secondary;
464+#ifdef HAVE_APP_INDICATOR464+#ifdef HAVE_APP_INDICATOR
465+ GtkAction *action;465+ GtkAction *action;
466+ GtkUIManager *ui_manager;
467+ GtkWidget *widget;
468+#endif466+#endif
469 467
470 rb_shell_player_get_playing (plugin->priv->shell_player, &playing, NULL);468 rb_shell_player_get_playing (plugin->priv->shell_player, &playing, NULL);
471 elapsed_string = rb_shell_player_get_playing_time_string (plugin->priv->shell_player);469 elapsed_string = rb_shell_player_get_playing_time_string (plugin->priv->shell_player);
472 470
473+#ifdef HAVE_APP_INDICATOR471+#ifdef HAVE_APP_INDICATOR
474+ g_object_get (plugin->priv->shell, "ui-manager", &ui_manager, NULL);
475+ action = gtk_action_group_get_action (plugin->priv->action_group,472+ action = gtk_action_group_get_action (plugin->priv->action_group,
476+ "TrayDisplayArtist");473+ "TrayDisplayArtist");
477+ if (plugin->priv->current_artist != NULL &&474+ if (plugin->priv->current_artist != NULL &&
@@ -481,11 +478,6 @@
481+ } else {478+ } else {
482+ gtk_action_set_visible (action, FALSE);479+ gtk_action_set_visible (action, FALSE);
483+ }480+ }
484+ /* Requires manual synchronization because of Gtk+ bug */
485+ widget = gtk_ui_manager_get_widget (GTK_UI_MANAGER (ui_manager),
486+ "/RhythmboxIndicator/DisplayArtist");
487+ gtk_menu_item_set_label (GTK_MENU_ITEM (widget),
488+ gtk_action_get_label (action));
489+481+
490+ action = gtk_action_group_get_action (plugin->priv->action_group,482+ action = gtk_action_group_get_action (plugin->priv->action_group,
491+ "TrayDisplayTitle");483+ "TrayDisplayTitle");
@@ -494,18 +486,11 @@
494+ } else {486+ } else {
495+ gtk_action_set_label (action, plugin->priv->current_title);487+ gtk_action_set_label (action, plugin->priv->current_title);
496+ }488+ }
497+ /* Requires manual synchronization because of Gtk+ bug */
498+ widget = gtk_ui_manager_get_widget (GTK_UI_MANAGER (ui_manager),
499+ "/RhythmboxIndicator/DisplayTitle");
500+ gtk_menu_item_set_label (GTK_MENU_ITEM (widget),
501+ gtk_action_get_label (action));
502+
503+ g_object_unref (ui_manager);
504+#endif489+#endif
505 secondary = g_string_sized_new (100);490 secondary = g_string_sized_new (100);
506 if (plugin->priv->current_album_and_artist != NULL) {491 if (plugin->priv->current_album_and_artist != NULL) {
507 g_string_append (secondary, plugin->priv->current_album_and_artist);492 g_string_append (secondary, plugin->priv->current_album_and_artist);
508@@ -701,6 +766,10 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)493@@ -701,6 +751,10 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)
509 g_free (plugin->priv->current_album_and_artist);494 g_free (plugin->priv->current_album_and_artist);
510 plugin->priv->current_title = NULL;495 plugin->priv->current_title = NULL;
511 plugin->priv->current_album_and_artist = NULL;496 plugin->priv->current_album_and_artist = NULL;
@@ -516,7 +501,7 @@
516 501
517 if (entry == NULL)502 if (entry == NULL)
518 return;503 return;
519@@ -712,11 +781,17 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)504@@ -712,11 +766,17 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)
520 entry,505 entry,
521 RHYTHMDB_PROP_STREAM_SONG_ARTIST);506 RHYTHMDB_PROP_STREAM_SONG_ARTIST);
522 if (value != NULL) {507 if (value != NULL) {
@@ -534,7 +519,7 @@
534 }519 }
535 520
536 /* get album, preferring streaming song details */521 /* get album, preferring streaming song details */
537@@ -1222,6 +1297,14 @@ impl_get_config_widget (RBPlugin *bplugin)522@@ -1222,6 +1282,14 @@ impl_get_config_widget (RBPlugin *bplugin)
538 plugin->priv->icon_combo = GTK_WIDGET (gtk_builder_get_object (builder, "statusiconmode"));523 plugin->priv->icon_combo = GTK_WIDGET (gtk_builder_get_object (builder, "statusiconmode"));
539 plugin->priv->notify_combo = GTK_WIDGET (gtk_builder_get_object (builder, "notificationmode"));524 plugin->priv->notify_combo = GTK_WIDGET (gtk_builder_get_object (builder, "notificationmode"));
540 plugin->priv->wheel_combo = GTK_WIDGET (gtk_builder_get_object (builder, "mousewheelmode"));525 plugin->priv->wheel_combo = GTK_WIDGET (gtk_builder_get_object (builder, "mousewheelmode"));
@@ -549,7 +534,7 @@
549 g_signal_connect_object (plugin->priv->notify_combo,534 g_signal_connect_object (plugin->priv->notify_combo,
550 "changed",535 "changed",
551 G_CALLBACK (notification_config_changed_cb),536 G_CALLBACK (notification_config_changed_cb),
552@@ -1251,6 +1334,9 @@ impl_activate (RBPlugin *bplugin,537@@ -1251,6 +1319,9 @@ impl_activate (RBPlugin *bplugin,
553 RhythmDBEntry *entry;538 RhythmDBEntry *entry;
554 GtkWindow *window;539 GtkWindow *window;
555 char *uifile;540 char *uifile;
@@ -559,7 +544,7 @@
559 544
560 rb_debug ("activating status icon plugin");545 rb_debug ("activating status icon plugin");
561 546
562@@ -1330,6 +1416,18 @@ impl_activate (RBPlugin *bplugin,547@@ -1330,6 +1401,18 @@ impl_activate (RBPlugin *bplugin,
563 }548 }
564 update_tooltip (plugin);549 update_tooltip (plugin);
565 550
@@ -578,7 +563,7 @@
578 g_object_unref (ui_manager);563 g_object_unref (ui_manager);
579 g_object_unref (window);564 g_object_unref (window);
580 }565 }
581@@ -1418,6 +1516,10 @@ impl_deactivate (RBPlugin *bplugin,566@@ -1418,6 +1501,10 @@ impl_deactivate (RBPlugin *bplugin,
582 plugin->priv->current_title = NULL;567 plugin->priv->current_title = NULL;
583 plugin->priv->current_album_and_artist = NULL;568 plugin->priv->current_album_and_artist = NULL;
584 plugin->priv->tooltip_markup = NULL;569 plugin->priv->tooltip_markup = NULL;

Subscribers

People subscribed via source and target branches