aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--src/play-button.c21
2 files changed, 7 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog
index 5b0c684..4612ce9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-sound (0.3.9-0ubuntu2) maverick; urgency=low
+
+ * Backport upstream commit to fix the indicator crashing when rhythmbox starts
+ (lp: #612299)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 02 Aug 2010 12:08:57 +0200
+
indicator-sound (0.3.9-0ubuntu1) maverick; urgency=low
* New upstream release.
diff --git a/src/play-button.c b/src/play-button.c
index e4382c1..94e6f98 100644
--- a/src/play-button.c
+++ b/src/play-button.c
@@ -454,29 +454,8 @@ void
play_button_toggle_play_pause(GtkWidget* button, PlayButtonState update)
{
PlayButtonPrivate* priv = PLAY_BUTTON_GET_PRIVATE(button);
- gboolean changed = priv->current_state != update;
priv->current_state = update;
g_debug("PlayButton::toggle play state : %i", priv->current_state);
-
- if(changed == TRUE){
- g_debug("Toggle play pause - changed of state detected - redraw button");
- cairo_t *cr;
-
- cr = gdk_cairo_create (button->window);
-
- GList* list = g_hash_table_lookup(priv->command_coordinates,
- GINT_TO_POINTER(TRANSPORT_PLAY_PAUSE));
-
- cairo_rectangle(cr,
- GPOINTER_TO_INT(g_list_nth_data(list, 0)),
- GPOINTER_TO_INT(g_list_nth_data(list, 1)),
- GPOINTER_TO_INT(g_list_nth_data(list, 2)),
- GPOINTER_TO_INT(g_list_nth_data(list, 3)));
-
- cairo_clip(cr);
- draw (button, cr);
- cairo_destroy (cr);
- }
}