I think I do this more than anyone else
--
========================================================================
| Michael Koziarski |"Conventional wisdom is often |
| Data Engineer, Linux user | long on convention and short |
| & Objectivist. | on wisdom" -- |
| http://www.koziarski.com | Warren E. Buffett, BRK.A |
========================================================================
Index: ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/ChangeLog,v
retrieving revision 1.823
diff -u -r1.823 ChangeLog
--- ChangeLog 2002/03/13 13:24:48 1.823
+++ ChangeLog 2002/03/14 07:35:02
@@ -1,3 +1,8 @@
+2002-03-14 Michael A. Koziarski <[EMAIL PROTECTED]>
+
+ * configure.in: First stage of fixing the gnome compile problems.
+ Linking problems to be fixed next.
+
2002-03-12 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* README: add bulgarian
Index: configure.in
===================================================================
RCS file: /cvs/lyx/lyx-devel/configure.in,v
retrieving revision 1.97
diff -u -r1.97 configure.in
--- configure.in 2002/03/12 11:32:24 1.97
+++ configure.in 2002/03/14 07:35:11
@@ -198,6 +198,8 @@
`
;;
gnome)
+ LYX_PATH_XPM
+ LYX_PATH_XFORMS
AM_PATH_GTKMM(1.2.1,,
AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
AM_PATH_GNOMEMM
@@ -217,8 +219,8 @@
FRONTEND="xforms gnome"
FRONTEND_GUILIB="gnome/*.lo"
FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
- FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)
`gnome-config --cflags libglade gnomeui`"
- FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade
gnomeui`";;
+ FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms \$(GNOMEMM_INCLUDEDIR)
+\$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`"
+ FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(GNOMEMM_LIBS) \$(GTKMM_LIBS)
+`gnome-config --libs libglade gnomeui`";;
qt2)
LYX_PATH_XPM
LYX_PATH_XFORMS
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/lyx/lyx-devel/po/POTFILES.in,v
retrieving revision 1.268
diff -u -r1.268 POTFILES.in
--- po/POTFILES.in 2002/03/13 18:24:42 1.268
+++ po/POTFILES.in 2002/03/14 07:35:24
@@ -9,7 +9,6 @@
src/CutAndPaste.C
src/debug.C
src/exporter.C
-src/ext_l10n.h
src/FontLoader.C
src/frontends/controllers/biblio.C
src/frontends/controllers/ButtonController.h
Index: src/frontends/gnome/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/gnome/ChangeLog,v
retrieving revision 1.38
diff -u -r1.38 ChangeLog
--- src/frontends/gnome/ChangeLog 2002/03/11 22:47:40 1.38
+++ src/frontends/gnome/ChangeLog 2002/03/14 07:35:32
@@ -1,3 +1,10 @@
+2002-03-14 Michael A. Koziarski <[EMAIL PROTECTED]>
+
+ * Timeout_pimpl.C
+ * Timeout_pimpl.h: implemented running to fix compilation, linking
+ fix still to come
+
+
2002-03-11 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
* docygen fixes.
Index: src/frontends/gnome/Timeout_pimpl.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/gnome/Timeout_pimpl.C,v
retrieving revision 1.2
diff -u -r1.2 Timeout_pimpl.C
--- src/frontends/gnome/Timeout_pimpl.C 2002/03/11 22:47:40 1.2
+++ src/frontends/gnome/Timeout_pimpl.C 2002/03/14 07:35:33
@@ -4,6 +4,7 @@
* Read COPYING
*
* \author Baruch Even
+ * \author Michael Koziarski
*/
#include <config.h>
@@ -28,7 +29,11 @@
stop();
}
-
+bool Timeout::Pimpl::running() const
+{
+ return running_;
+}
+
void Timeout::Pimpl::start()
{
if (conn_.connected()) {
@@ -40,12 +45,14 @@
SigC::slot(this, &Timeout::Pimpl::timeoutEvent),
owner_->timeout_ms
);
+ running_ = true;
}
void Timeout::Pimpl::stop()
{
conn_.disconnect();
+ running_ = false;
}
Index: src/frontends/gnome/Timeout_pimpl.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/gnome/Timeout_pimpl.h,v
retrieving revision 1.4
diff -u -r1.4 Timeout_pimpl.h
--- src/frontends/gnome/Timeout_pimpl.h 2002/03/11 22:47:40 1.4
+++ src/frontends/gnome/Timeout_pimpl.h 2002/03/14 07:35:33
@@ -31,7 +31,10 @@
/// stop the timer
void stop();
/// reset
- void reset();
+ void reset();
+ /// Is the timer running?
+ bool running() const;
+
public:
/// The timeout signal, this gets called when the timeout passed.
@@ -41,6 +44,8 @@
Timeout * owner_;
/// Timer connection
SigC::Connection conn_;
+ /// Used for running as SigC::Connection::connected() isn't const
+ bool running_;
};
#endif
