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
1=== modified file 'debian/patches/82_rhythmbox-indicators.patch'
2--- debian/patches/82_rhythmbox-indicators.patch 2010-03-04 15:19:03 +0000
3+++ debian/patches/82_rhythmbox-indicators.patch 2010-03-10 20:00:37 +0000
4@@ -2,7 +2,7 @@
5 # Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=606972
6 # Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rhythmbox/+bug/498588
7 diff --git a/configure.ac b/configure.ac
8-index 74aaeb8..bf012da 100644
9+index 6349a15..134ec20 100644
10 --- a/configure.ac
11 +++ b/configure.ac
12 @@ -46,6 +46,7 @@ LIBSOUP_REQS=2.26.0
13@@ -43,7 +43,7 @@
14 dnl daap support
15 if test "x$enable_daap" != "xno"; then
16 if test x"$have_mdns" = xno; then
17-@@ -949,4 +973,10 @@ else
18+@@ -951,4 +975,10 @@ else
19 AC_MSG_NOTICE([ iTunes detection browser plugin (for podcasts) disabled])
20 fi
21
22@@ -377,7 +377,7 @@
23 +{
24 +}
25 diff --git a/plugins/status-icon/rb-status-icon-plugin.c b/plugins/status-icon/rb-status-icon-plugin.c
26-index 41c59be..70da8f3 100644
27+index 4c931b5..9c50d65 100644
28 --- a/plugins/status-icon/rb-status-icon-plugin.c
29 +++ b/plugins/status-icon/rb-status-icon-plugin.c
30 @@ -107,6 +107,9 @@ struct _RBStatusIconPluginPrivate
31@@ -457,21 +457,18 @@
32 break;
33
34 default:
35-@@ -571,10 +599,47 @@ update_tooltip (RBStatusIconPlugin *plugin)
36+@@ -571,10 +599,32 @@ update_tooltip (RBStatusIconPlugin *plugin)
37 gboolean playing;
38 char *elapsed_string;
39 GString *secondary;
40 +#ifdef HAVE_APP_INDICATOR
41 + GtkAction *action;
42-+ GtkUIManager *ui_manager;
43-+ GtkWidget *widget;
44 +#endif
45
46 rb_shell_player_get_playing (plugin->priv->shell_player, &playing, NULL);
47 elapsed_string = rb_shell_player_get_playing_time_string (plugin->priv->shell_player);
48
49 +#ifdef HAVE_APP_INDICATOR
50-+ g_object_get (plugin->priv->shell, "ui-manager", &ui_manager, NULL);
51 + action = gtk_action_group_get_action (plugin->priv->action_group,
52 + "TrayDisplayArtist");
53 + if (plugin->priv->current_artist != NULL &&
54@@ -481,11 +478,6 @@
55 + } else {
56 + gtk_action_set_visible (action, FALSE);
57 + }
58-+ /* Requires manual synchronization because of Gtk+ bug */
59-+ widget = gtk_ui_manager_get_widget (GTK_UI_MANAGER (ui_manager),
60-+ "/RhythmboxIndicator/DisplayArtist");
61-+ gtk_menu_item_set_label (GTK_MENU_ITEM (widget),
62-+ gtk_action_get_label (action));
63 +
64 + action = gtk_action_group_get_action (plugin->priv->action_group,
65 + "TrayDisplayTitle");
66@@ -494,18 +486,11 @@
67 + } else {
68 + gtk_action_set_label (action, plugin->priv->current_title);
69 + }
70-+ /* Requires manual synchronization because of Gtk+ bug */
71-+ widget = gtk_ui_manager_get_widget (GTK_UI_MANAGER (ui_manager),
72-+ "/RhythmboxIndicator/DisplayTitle");
73-+ gtk_menu_item_set_label (GTK_MENU_ITEM (widget),
74-+ gtk_action_get_label (action));
75-+
76-+ g_object_unref (ui_manager);
77 +#endif
78 secondary = g_string_sized_new (100);
79 if (plugin->priv->current_album_and_artist != NULL) {
80 g_string_append (secondary, plugin->priv->current_album_and_artist);
81-@@ -701,6 +766,10 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)
82+@@ -701,6 +751,10 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)
83 g_free (plugin->priv->current_album_and_artist);
84 plugin->priv->current_title = NULL;
85 plugin->priv->current_album_and_artist = NULL;
86@@ -516,7 +501,7 @@
87
88 if (entry == NULL)
89 return;
90-@@ -712,11 +781,17 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)
91+@@ -712,11 +766,17 @@ update_current_playing_data (RBStatusIconPlugin *plugin, RhythmDBEntry *entry)
92 entry,
93 RHYTHMDB_PROP_STREAM_SONG_ARTIST);
94 if (value != NULL) {
95@@ -534,7 +519,7 @@
96 }
97
98 /* get album, preferring streaming song details */
99-@@ -1222,6 +1297,14 @@ impl_get_config_widget (RBPlugin *bplugin)
100+@@ -1222,6 +1282,14 @@ impl_get_config_widget (RBPlugin *bplugin)
101 plugin->priv->icon_combo = GTK_WIDGET (gtk_builder_get_object (builder, "statusiconmode"));
102 plugin->priv->notify_combo = GTK_WIDGET (gtk_builder_get_object (builder, "notificationmode"));
103 plugin->priv->wheel_combo = GTK_WIDGET (gtk_builder_get_object (builder, "mousewheelmode"));
104@@ -549,7 +534,7 @@
105 g_signal_connect_object (plugin->priv->notify_combo,
106 "changed",
107 G_CALLBACK (notification_config_changed_cb),
108-@@ -1251,6 +1334,9 @@ impl_activate (RBPlugin *bplugin,
109+@@ -1251,6 +1319,9 @@ impl_activate (RBPlugin *bplugin,
110 RhythmDBEntry *entry;
111 GtkWindow *window;
112 char *uifile;
113@@ -559,7 +544,7 @@
114
115 rb_debug ("activating status icon plugin");
116
117-@@ -1330,6 +1416,18 @@ impl_activate (RBPlugin *bplugin,
118+@@ -1330,6 +1401,18 @@ impl_activate (RBPlugin *bplugin,
119 }
120 update_tooltip (plugin);
121
122@@ -578,7 +563,7 @@
123 g_object_unref (ui_manager);
124 g_object_unref (window);
125 }
126-@@ -1418,6 +1516,10 @@ impl_deactivate (RBPlugin *bplugin,
127+@@ -1418,6 +1501,10 @@ impl_deactivate (RBPlugin *bplugin,
128 plugin->priv->current_title = NULL;
129 plugin->priv->current_album_and_artist = NULL;
130 plugin->priv->tooltip_markup = NULL;

Subscribers

People subscribed via source and target branches