[Gnash-commit] gnash ChangeLog gui/gtk.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/02/10 18:28:20

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp 

Log message:
        Can't use is_muted() at the moment to test whether the sound handler is 
muted or not for the GTK menu. It currently never is muted at startup, so I've 
commented it out.
        
        And bjacques is still committing two days ago (correct Changelog).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5607&r2=1.5608
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.141&r2=1.142

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5607
retrieving revision 1.5608
diff -u -b -r1.5607 -r1.5608
--- ChangeLog   10 Feb 2008 13:30:59 -0000      1.5607
+++ ChangeLog   10 Feb 2008 18:28:20 -0000      1.5608
@@ -1,4 +1,9 @@
-2008-02-08 Bastiaan Jacques <address@hidden>
+2008-02-10 Benjamin Wolsey <address@hidden>
+
+       * gui/gtk.cpp: Don't use is_muted() to set the 'Sound' menu toggle,
+         as the function seems to have changed.
+
+2008-02-10 Bastiaan Jacques <address@hidden>
 
        * libamf/sol.cpp: in writeFile, allocate enough space to account
        for two padding bytes, which are written depending on the AMF element

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- gui/gtk.cpp 31 Jan 2008 11:08:56 -0000      1.141
+++ gui/gtk.cpp 10 Feb 2008 18:28:20 -0000      1.142
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.141 2008/01/31 11:08:56 bwy Exp $ */
+/* $Id: gtk.cpp,v 1.142 2008/02/10 18:28:20 bwy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
@@ -457,7 +457,10 @@
             
GTK_CHECK_MENU_ITEM(gtk_check_menu_item_new_with_label(_("Sound")));
         // Set toggle inactive if an active sound handler is muted at start 
(can't
         // happen at the moment, but might in the future).
-        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(menuitem_sound), 
(!s->is_muted()) );
+        
+        // The is_muted() function appears to have changed, and this doesn't 
work at the
+        // moment:
+        // gtk_check_menu_item_set_active 
(GTK_CHECK_MENU_ITEM(menuitem_sound), (!s->is_muted()) );
         gtk_menu_append(_popup_menu, GTK_WIDGET(menuitem_sound));
         gtk_widget_show(GTK_WIDGET(menuitem_sound));
         g_signal_connect(GTK_OBJECT(menuitem_sound), "activate",