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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/01/22 03:26:17

Modified files:
        gui            : gtk.cpp 
        .              : ChangeLog 

Log message:
                * gui/gtk.cpp: Only initialize LIRC if lirc is enabled.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.135&r2=1.136
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5454&r2=1.5455

Patches:
Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- gui/gtk.cpp 21 Jan 2008 20:55:40 -0000      1.135
+++ gui/gtk.cpp 22 Jan 2008 03:26:16 -0000      1.136
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.135 2008/01/21 20:55:40 rsavoye Exp $ */
+/* $Id: gtk.cpp,v 1.136 2008/01/22 03:26:16 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
@@ -171,6 +171,7 @@
     _glue->prepDrawingArea(_drawing_area);
 #endif
 
+#ifdef USE_LIRC
     lirc = new Lirc();
     if (lirc->init("/dev/lircd")) {
         int fd = lirc->getFileFd();
@@ -178,6 +179,7 @@
     } else {
         log_msg("LIRC daemon not running");
     }
+#endif
     
     _renderer = _glue->createRenderHandler();
     if ( ! _renderer ) return false;

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5454
retrieving revision 1.5455
diff -u -b -r1.5454 -r1.5455
--- ChangeLog   22 Jan 2008 01:26:04 -0000      1.5454
+++ ChangeLog   22 Jan 2008 03:26:16 -0000      1.5455
@@ -1,5 +1,7 @@
 2008-01-21  Rob Savoye  <address@hidden>
 
+       * gui/gtk.cpp: Only initialize LIRC if lirc is enabled.
+
        * libamf/sol.cpp: Swap from host to network for the magic number,
        not network to host. Fixes #22013.