DisOrder 5.0.1

diff --git a/CHANGES.html b/CHANGES.html
index ed1e9b4e474bfe4330c3bc7e70411fbe1764065a..976b1169445551f28e1c3e1948baf80c63b4c76d 100644 (file)
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -68,6 +68,20 @@ span.command {
 <p>This file documents recent user-visible changes to <a
  href="http://www.greenend.org.uk/rjk/disorder/">DisOrder</a>.</p>
 
+<h2>Changes up to version 5.0.1</h2>
+
+<div class=section>
+
+<h3>Disobedience</h3>
+
+<div class=section>
+
+<p>The sense of the Control &#x2192; Playing menu item was fixed.</p>
+
+</div>
+
+</div>
+
 <h2>Changes up to version 5.0</h2>
 
   <div class=section>

diff --git a/configure.ac b/configure.ac
index b0290c98c4d450e473da709db6c8e01e64f20a94..4a3c37ad5e07270cca0f78b3ac5e98388fe28855 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,9 +18,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-AC_INIT([disorder], [5.0], [richard+disorder@sfere.greenend.org.uk])
+AC_INIT([disorder], [5.0.1], [richard+disorder@sfere.greenend.org.uk])
 AC_CONFIG_AUX_DIR([config.aux])
-AM_INIT_AUTOMAKE(disorder, [5.0])
+AM_INIT_AUTOMAKE(disorder, [5.0.1])
 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 

diff --git a/debian/changelog b/debian/changelog
index e76e763f350116678903c405d19c5d3320db0c0d..b7e0a8de89240c23a3b32fb562d514ac3d5c8ee4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+disorder (5.0.1) unstable; urgency=low
+
+  * Disorder 5.0.1
+  * The sense of the Control -> Playing menu item was fixed.
+
+ -- Richard Kettlewell <rjk@greenend.org.uk>  Thu, 10 Jun 2010 09:18:58 +0100
+
 disorder (5.0) unstable; urgency=low
 
   * DisOrder 5.0

diff --git a/disobedience/control.c b/disobedience/control.c
index b2dfce0da5f883e22ac57327efc350a380469771..f45492f1e191ed767f273fe452d3f18c26721462 100644 (file)
--- a/disobedience/control.c
+++ b/disobedience/control.c
@@ -128,6 +128,9 @@ struct icon {
    * Can be NULL for always sensitive.
    */
   int (*sensitive)(void);
+
+  /** @brief True if the menu item has inverse sense to the button */
+  gboolean menu_invert;
   
   /** @brief Pointer to button */
   GtkWidget *button;
@@ -192,6 +195,7 @@ static struct icon icons[] = {
     action_go_on: disorder_eclient_pause,
     action_go_off: disorder_eclient_resume,
     events: "pause-changed playing-changed rights-changed playing-track-changed",
+    menu_invert: TRUE,
   },
   {
     stock: TRUE,
@@ -418,7 +422,8 @@ static void icon_changed(const char attribute((unused)) *event,
   /* Icons with an associated menu item */
   if(icon->item) {
     if(icon->toggle)
-      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(icon->item), on);
+      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(icon->item),
+                                     !!icon->menu_invert ^ !!on);
     gtk_widget_set_sensitive(icon->item, sensitive);
   }
   --suppress_actions;