← Back to branch summary

~ricotz/rhythmbox/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/04_pause_button.patch

  • Committer: Sebastien Bacher
  • Date: 2011-08-03 15:25:12 UTC
  • Revision ID: seb128@ubuntu.com-20110803152512-7hy30b1k7rud7vqj
Tags: 2.90.1~20110802-0ubuntu1
releasing version 2.90.1~20110802-0ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_pause_button.patch
5
5
Author: Bilal Akhtar <bilalakhtar@ubuntu.com>
6
6
Bug-Ubuntu: https://bugs.edge.launchpad.net/hundredpapercuts/+bug/71228
7
7
Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=326066
8
 
Index: rhythmbox-0.13.2/shell/rb-shell-player.c
 
8
Index: rhythmbox-2.90.1~20110802/shell/rb-shell-player.c
9
9
===================================================================
10
 
--- rhythmbox-0.13.2.orig/shell/rb-shell-player.c       2010-10-20 09:49:48.000000000 +1100
11
 
+++ rhythmbox-0.13.2/shell/rb-shell-player.c    2010-11-17 10:37:50.795470001 +1100
12
 
@@ -306,6 +306,9 @@
 
10
--- rhythmbox-2.90.1~20110802.orig/shell/rb-shell-player.c
 
11
+++ rhythmbox-2.90.1~20110802/shell/rb-shell-player.c
 
12
@@ -291,6 +291,9 @@
13
13
 
14
14
 static GtkActionEntry rb_shell_player_actions [] =
15
15
 {
19
19
        { "ControlPrevious", GTK_STOCK_MEDIA_PREVIOUS, N_("Pre_vious"), "<alt>Left",
20
20
          N_("Start playing the previous song"),
21
21
          G_CALLBACK (rb_shell_player_cmd_previous) },
22
 
@@ -323,9 +326,6 @@
 
22
@@ -308,9 +311,6 @@
23
23
 
24
24
 static GtkToggleActionEntry rb_shell_player_toggle_entries [] =
25
25
 {
29
29
        { "ControlShuffle", GNOME_MEDIA_SHUFFLE, N_("Sh_uffle"), "<control>U",
30
30
          N_("Play songs in a random order"),
31
31
          G_CALLBACK (rb_shell_player_shuffle_changed_cb) },
32
 
@@ -689,9 +689,6 @@
33
 
                                             rb_shell_player_n_toggle_entries,
34
 
                                             player);
 
32
@@ -697,9 +697,6 @@
 
33
                         action, "active",
 
34
                         G_SETTINGS_BIND_INVERT_BOOLEAN | G_SETTINGS_BIND_NO_SENSITIVITY);
35
35
 
36
36
-       action = gtk_action_group_get_action (player->priv->actiongroup,
37
37
-                                             "ControlPlay");
39
39
 
40
40
        player->priv->syncing_state = TRUE;
41
41
        rb_shell_player_set_playing_source (player, NULL);
42
 
@@ -3829,7 +3826,6 @@
 
42
@@ -3777,7 +3774,6 @@
43
43
 
44
44
        /* sync the active state of the action again */
45
45
        g_object_get (player, "playing", &playing, NULL);
47
47
 
48
48
        g_signal_handlers_unblock_by_func (action, rb_shell_player_cmd_play, player);
49
49
 
50
 
@@ -3852,11 +3848,17 @@
 
50
@@ -3800,11 +3796,17 @@
51
51
        if (playing) {
52
52
                if (rb_source_can_pause (player->priv->source)) {
53
53
                        tooltip = g_strdup (_("Pause playback"));
65
65
        }
66
66
        g_object_set (action, "tooltip", tooltip, NULL);
67
67
        g_free (tooltip);
68
 
@@ -3868,7 +3870,6 @@
 
68
@@ -3816,7 +3818,6 @@
69
69
        if (player->priv->unblock_play_id == 0) {
70
70
                g_signal_handlers_block_by_func (action, rb_shell_player_cmd_play, player);
71
71
        }