diff options
author | Koop Mast <kwm@FreeBSD.org> | 2010-11-20 15:37:08 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2010-11-20 15:37:08 +0000 |
commit | 3680f27ebff58ece429c4e032f9ad84fb1372114 (patch) | |
tree | 6c5ff4664c1a779ddad350ac887e5706dbfdd4eb /audio/rhythmbox/files/patch-remote_dbus_rb-client.c | |
parent | - Upgrade 1.2000. (diff) |
Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this
release can be found at http://library.gnome.org/misc/release-notes/2.32/
This will be the last release of the GNOME 2.x series, mainly a bugfix and
bridge release to the first release of the GNOME 3.x series.
This release features commits by avl, marcus, mezz and myself.
The FreeBSD GNOME Team would like to thank the following contributors and
testers for there help with this release:
Zane C.B. <vvelox@vvelox.net>
romain@
Olaf Seibert <O.Seibert@cs.ru.nl>
DomiX
Bapt <baptiste.daroussin@gmail.com>
jsa@
miwi@
Sergio de Almeida Lenzi <lenzi.sergio@gmail.com>
Maxim Samsonov <xors@mne.ru>
Kris Moore
And pav@ for 2 exp-runs
PR: ports/152255
ports/143260
ports/141033
ports/149629
ports/150350
ports/151523
With hat: gnome@
Notes
Notes:
svn path=/head/; revision=264837
Diffstat (limited to 'audio/rhythmbox/files/patch-remote_dbus_rb-client.c')
-rw-r--r-- | audio/rhythmbox/files/patch-remote_dbus_rb-client.c | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/audio/rhythmbox/files/patch-remote_dbus_rb-client.c b/audio/rhythmbox/files/patch-remote_dbus_rb-client.c new file mode 100644 index 000000000000..c73cde0dcc11 --- /dev/null +++ b/audio/rhythmbox/files/patch-remote_dbus_rb-client.c @@ -0,0 +1,38 @@ +--- remote/dbus/rb-client.c.orig 2010-10-10 11:56:07.000000000 -0400 ++++ remote/dbus/rb-client.c 2010-10-10 11:57:02.000000000 -0400 +@@ -54,7 +54,7 @@ static gboolean previous = FALSE; + static gboolean notify = FALSE; + + static gboolean play = FALSE; +-static gboolean pause = FALSE; ++static gboolean rbpause = FALSE; + static gboolean play_pause = FALSE; + static gboolean stop = FALSE; + +@@ -91,7 +91,7 @@ static GOptionEntry args[] = { + { "notify", 0, 0, G_OPTION_ARG_NONE, ¬ify, N_("Show notification of the playing song"), NULL }, + + { "play", 0, 0, G_OPTION_ARG_NONE, &play, N_("Resume playback if currently paused"), NULL }, +- { "pause", 0, 0, G_OPTION_ARG_NONE, &pause, N_("Pause playback if currently playing"), NULL }, ++ { "pause", 0, 0, G_OPTION_ARG_NONE, &rbpause, N_("Pause playback if currently playing"), NULL }, + { "play-pause", 0, 0, G_OPTION_ARG_NONE, &play_pause, N_("Toggle play/pause mode"), NULL }, + /* { "stop", 0, 0, G_OPTION_ARG_NONE, &stop, N_("Stop playback"), NULL }, */ + +@@ -608,7 +608,7 @@ main (int argc, char **argv) + if (next || previous || + clear_queue || + play_uri || other_stuff || +- play || pause || play_pause || stop || ++ play || rbpause || play_pause || stop || + print_playing || print_playing_format || notify || + (set_volume > -0.01) || volume_up || volume_down || print_volume || mute || unmute || (set_rating > -0.01)) + no_present = TRUE; +@@ -696,7 +696,7 @@ main (int argc, char **argv) + org_gnome_Rhythmbox_Player_get_playing (player_proxy, &is_playing, &error); + if (!annoy (&error)) { + rb_debug ("playback state: %d", is_playing); +- if (play || pause || play_pause) { ++ if (play || rbpause || play_pause) { + if (is_playing != play || play_pause) { + rb_debug ("calling playPause to change playback state"); + org_gnome_Rhythmbox_Player_play_pause (player_proxy, FALSE, &error); |