diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2010-08-02 14:08:57 +0200 |
|---|---|---|
| committer | Bazaar Package Importer <james.westby@ubuntu.com> | 2010-08-02 14:08:57 +0200 |
| commit | 4122614e725c4e41278142cfce1d1fc8fb4cfc22 (patch) | |
| tree | a688f5509645905fe23b2235112783799c8dca46 | |
| parent | 8b415cbf36a002db4110a8a6b7477d0d9142033f (diff) | |
| parent | 022c9bd2558d5881523d68d217c398e475a9da6e (diff) | |
| download | ayatana-indicator-sound-4122614e725c4e41278142cfce1d1fc8fb4cfc22.tar.gz ayatana-indicator-sound-4122614e725c4e41278142cfce1d1fc8fb4cfc22.tar.bz2 ayatana-indicator-sound-4122614e725c4e41278142cfce1d1fc8fb4cfc22.zip | |
Backport upstream commit to fix the indicator crashing when rhythmbox starts
(lp: #612299)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/play-button.c | 21 |
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); - } } |