rpms/gnotime/FC-3 gnotime-gtkhtml3.6-qof.patch, NONE, 1.1 gnotime-separate-timeouts.patch, NONE, 1.1 gnotime.spec, 1.2, 1.3 gnotime-gtkhtml3-qof.patch, 1.1, NONE
Toshio Ernie Kuratomi (toshio)
fedora-extras-commits at redhat.com
Sat May 7 13:55:52 UTC 2005
Author: toshio
Update of /cvs/extras/rpms/gnotime/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27725
Modified Files:
gnotime.spec
Added Files:
gnotime-gtkhtml3.6-qof.patch gnotime-separate-timeouts.patch
Removed Files:
gnotime-gtkhtml3-qof.patch
Log Message:
* Tue May 3 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-5.fc3.8
- Sync relevant changes from the devel branch:
+ Add a patch adapted from the gnotime tracker. Original patch by
goedson-users.sf.net. SF Tracker: 1171394. This allows separate setting
of the idle project and no project timeouts.
+ Require(pre): GConf2.
+ Fix up scriptlets to properly install and uninstall gconf schemas via
gconftool-2.
+ Fix gtkhtml3 detection so 3.6 (as used in FC4) is detected.
gnotime-gtkhtml3.6-qof.patch:
--- NEW FILE gnotime-gtkhtml3.6-qof.patch ---
Index: configure.in
===================================================================
RCS file: /cvsroot/gttr/gnotime/configure.in,v
retrieving revision 1.44
diff -u -r1.44 configure.in
--- configure.in 23 May 2004 21:15:00 -0000 1.44
+++ configure.in 20 Jul 2004 18:36:02 -0000
@@ -50,6 +50,8 @@
LIBGTKHTML_REQUIRED=3.0.0
LIBXML2_REQUIRED=2.0.0
SCROLLKEEPER_BUILD_REQUIRED=0.3.5
+LIBQOF_REQUIRED_MIN=0.5.0
+LIBQOF_REQUIRED_MAX=0.5.0
dnl *******************************
dnl Guile checks
@@ -167,7 +169,12 @@
dnl gtkhtml
dnl *******************************
-PKG_CHECK_MODULES(LIBGTKHTML, libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED)
+for GTKHTMLVER in 3.6 3.5 3.4 3.2 3.1 3.0; do
+ if $PKG_CONFIG --exists libgtkhtml-$GTKHTMLVER; then
+ PKG_CHECK_MODULES(LIBGTKHTML, libgtkhtml-$GTKHTMLVER >= $LIBGTKHTML_REQUIRED)
+ break
+ fi
+done
AC_SUBST(LIBGTKHTML_CFLAGS)
AC_SUBST(LIBGTKHTML_LIBS)
@@ -182,6 +189,42 @@
AC_SUBST(LIBXML2_LIBS)
dnl *****************************
+dnl libqof
+dnl *****************************
+
+AC_ARG_WITH(system-qof,
+AC_HELP_STRING([--with-system-qof],
+[use installed libqof rather than the bundled one. If not specified, configure will use the system qof if installed, otherwise its own.]),
+
+[
+if test x$withval = "xyes"; then
+ PKG_CHECK_MODULES(LIBQOF, qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX)
+ qofbuild=no
+else
+ AC_MSG_NOTICE([Using internal libqof])
+ LIBQOF_CFLAGS='-I$(top_srcdir)/lib -I$(top_srcdir)/lib/qof'
+ LIBQOF_LIBS='$(top_builddir)/lib/qof/libqof.la $(top_builddir)/lib/libqofsql/libqofsql.la'
+ qofbuild=yes
+fi
+],
+[
+if $PKG_CONFIG --exists "qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX"; then
+ PKG_CHECK_MODULES(LIBQOF, qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX)
+ qofbuild=no
+else
+ AC_MSG_NOTICE([Using internal libqof])
+ LIBQOF_CFLAGS='-I$(top_srcdir)/lib -I$(top_srcdir)/lib/qof'
+ LIBQOF_LIBS='$(top_builddir)/lib/qof/libqof.la $(top_builddir)/lib/libqofsql/libqofsql.la'
+ qofbuild=yes
+fi
+])
+
+AM_CONDITIONAL(QOFBUILD, test x$qofbuild = xyes)
+
+AC_SUBST(LIBQOF_CFLAGS)
+AC_SUBST(LIBQOF_LIBS)
+
+dnl *****************************
dnl scrollkeeper
dnl *****************************
dnl To substitute into the gnotime.spec
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/gttr/gnotime/src/Makefile.am,v
retrieving revision 1.28
--- src/Makefile.am 24 Apr 2004 00:39:56 -0000 1.28
+++ src/Makefile.am 20 Jul 2004 18:36:02 -0000
@@ -91,11 +91,10 @@
${LIBGNOMEVFS_CFLAGS} \
${LIBGTKHTML_CFLAGS} \
${LIBGLADE_CFLAGS} \
+ ${LIBQOF_CFLAGS} \
${LIBXML2_CFLAGS}
INCLUDES = \
- -I../lib \
- -I../lib/qof \
-I$(includedir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGTTGLADEDIR=\""$(datadir)/gnotime"\" \
@@ -109,8 +108,7 @@
gnotime_LDADD = \
$(GNOTIME_LIBS) \
- ../lib/qof/libqof.la \
- ../lib/libqofsql/libqofsql.la \
+ $(LIBQOF_LIBS) \
$(LIBGLADE_LIBS) \
$(LIBGTKHTML_LIBS) \
${LIBGNOMEVFS_LIBS} \
@@ -125,7 +123,3 @@
down.xpm \
left.xpm \
design.txt
-
-
-
-
Index: lib/libqofsql/Makefile.am
===================================================================
RCS file: /cvsroot/gttr/gnotime/lib/libqofsql/Makefile.am,v
retrieving revision 1.1
--- lib/libqofsql/Makefile.am 9 Apr 2004 04:58:52 -0000 1.1
+++ lib/libqofsql/Makefile.am 20 Jul 2004 18:36:02 -0000
@@ -1,6 +1,9 @@
## Process this file with automake to produce Makefile.in
+if QOFBUILD
lib_LTLIBRARIES = libqofsql.la
+noinst_PROGRAMS = sql_parse_test
+endif
libqofsql_la_SOURCES = \
parser.c \
@@ -15,9 +18,11 @@
sql_tree.h
qofsqlincludedir = ${pkgincludedir}
+if QOFBUILD
qofsqlinclude_HEADERS = sql_parser.h
-
-noinst_PROGRAMS = sql_parse_test
+else
+noinst_HEADERS = sql_parser.h
+endif
EXTRA_DIST = \
.cvsignore \
Index: lib/qof/Makefile.am
===================================================================
RCS file: /cvsroot/gttr/gnotime/lib/qof/Makefile.am,v
retrieving revision 1.7
--- lib/qof/Makefile.am 3 May 2004 03:46:59 -0000 1.7
+++ lib/qof/Makefile.am 20 Jul 2004 18:36:03 -0000
@@ -1,7 +1,8 @@
# pkglib_LTLIBRARIES = libqof.la
-
+if QOFBUILD
lib_LTLIBRARIES = libqof.la
+endif
libqof_la_SOURCES = \
gnc-date.c \
@@ -28,7 +29,7 @@
qofsql.c
qofincludedir = ${pkgincludedir}
-qofinclude_HEADERS = \
+public_headers = \
gnc-date.h \
gnc-engine-util.h \
gnc-numeric.h \
@@ -67,7 +68,14 @@
qofquerycore-p.h \
qofsession-p.h
-
+if QOFBUILD
+qofinclude_HEADERS = \
+ $(public_headers)
+else
+noinst_HEADERS += \
+ $(public_headers)
+endif
+
EXTRA_DIST = \
README \
.cvsignore
@@ -83,6 +91,3 @@
-I$(includedir) \
-DPREFIX=\""$(prefix)"\" \
-DDATADIR=\""$(datadir)"\"
-
-
-
gnotime-separate-timeouts.patch:
--- NEW FILE gnotime-separate-timeouts.patch ---
# Modified from patch by Goedson Teixeira Paixao goedson at users.sf.net
# and posted into the gnotime tracker:
# http://sourceforge.net/tracker/index.php?func=detail&aid=1171394&group_id=55463&atid=477105
diff -urNad gnotime-2.2.1/glade/prefs.glade /tmp/dpep.7xYbhV/gnotime-2.2.1/glade/prefs.glade
--- gnotime-2.2.1/glade/prefs.glade 2004-04-16 02:14:09.000000000 -0300
+++ /tmp/dpep.7xYbhV/gnotime-2.2.1/glade/prefs.glade 2005-03-27 10:54:23.292240224 -0300
@@ -10,6 +10,11 @@
<property name="modal">False</property>
<property name="resizable">False</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<child internal-child="notebook">
<widget class="GtkNotebook" id="notebook1">
@@ -45,6 +50,7 @@
<property name="label" translatable="yes">Show Project Importance</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -66,6 +72,7 @@
<property name="label" translatable="yes">Show Project Urgency</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -87,6 +94,7 @@
<property name="label" translatable="yes">Show Project Status</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -108,6 +116,7 @@
<property name="label" translatable="yes">Show Total Time Ever</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -129,6 +138,7 @@
<property name="label" translatable="yes">Show Time This Year</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -150,6 +160,7 @@
<property name="label" translatable="yes">Show Time This Month</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -171,6 +182,7 @@
<property name="label" translatable="yes">Show Time This Week</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -192,6 +204,7 @@
<property name="label" translatable="yes">Show Percent Complete</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -214,6 +227,7 @@
<property name="label" translatable="yes">Show Estimated Effort</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -235,6 +249,7 @@
<property name="label" translatable="yes">Show Project Due Date</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -256,6 +271,7 @@
<property name="label" translatable="yes">Show Planned Project End Date</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -277,6 +293,7 @@
<property name="label" translatable="yes">Show Planned Project Start Date</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -298,6 +315,7 @@
<property name="label" translatable="yes">Show Current Diary Entry</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -319,6 +337,7 @@
<property name="label" translatable="yes">Show Project Description</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -340,6 +359,7 @@
<property name="label" translatable="yes">Show Time For The Current Diary Entry</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -361,6 +381,7 @@
<property name="label" translatable="yes">Show Time Yesterday</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -382,6 +403,7 @@
<property name="label" translatable="yes">Show Time Today</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -403,6 +425,7 @@
<property name="label" translatable="yes">Show Time Last Week</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -487,6 +510,7 @@
<property name="label" translatable="yes">Show Seconds</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -508,6 +532,7 @@
<property name="label" translatable="yes">Show Status Bar</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -529,6 +554,7 @@
<property name="label" translatable="yes">Show Table Header</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -550,6 +576,7 @@
<property name="label" translatable="yes">Show Sub-Projects</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -803,6 +830,7 @@
<property name="label" translatable="yes">Use Logfile</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1006,6 +1034,8 @@
<property name="max_saved">10</property>
<property name="directory_entry">False</property>
<property name="modal">False</property>
+ <property name="use_filechooser">False</property>
+ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
<child internal-child="entry">
<widget class="GtkEntry" id="filename combo">
@@ -1103,6 +1133,7 @@
<property name="label" translatable="yes">Show Toolbar Icons</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1121,6 +1152,7 @@
<property name="label" translatable="yes">Show Toolbar Texts</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1139,6 +1171,7 @@
<property name="label" translatable="yes">Show Tooltips</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1199,6 +1232,7 @@
<property name="label" translatable="yes">Show `New'</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1217,6 +1251,7 @@
<property name="label" translatable="yes">Show `Cut', `Copy', `Paste'</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1235,6 +1270,7 @@
<property name="label" translatable="yes">Show `Journal'</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1253,6 +1289,7 @@
<property name="label" translatable="yes">Show `Properties'</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1271,6 +1308,7 @@
<property name="label" translatable="yes">Show `Timer'</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1289,6 +1327,7 @@
<property name="label" translatable="yes">Show `Preferences'</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1307,6 +1346,7 @@
<property name="label" translatable="yes">Show `Help'</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1325,6 +1365,7 @@
<property name="label" translatable="yes">Show `Quit'</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -1487,6 +1528,97 @@
</child>
<child>
+ <widget class="GtkFrame" id="frame9">
+ <property name="border_width">4</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+ <child>
+ <widget class="GtkTable" id="table7">
+ <property name="visible">True</property>
+ <property name="n_rows">1</property>
+ <property name="n_columns">2</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">8</property>
+
+ <child>
+ <widget class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Idle Seconds:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="no project secs">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">The current active project will be made inactive after there has been no keyboard/mouse activity after this number of seconds. Set to -1 to disable.</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">No Project Timeout</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkFrame" id="frame8">
<property name="visible">True</property>
<property name="label_xalign">0</property>
--- gnotime-2.2.1/src/active-dialog.c 2004-04-01 22:31:05.000000000 -0300
+++ /tmp/dpep.7xYbhV/gnotime-2.2.1/src/active-dialog.c 2005-03-27 10:54:23.297239464 -0300
@@ -34,7 +34,7 @@
#include "util.h"
-extern int config_idle_timeout;
+int config_no_project_timeout;
struct GttActiveDialog_s
{
@@ -196,13 +196,13 @@
*/
if (cur_proj) return;
if (FALSE == ad->armed) return;
- if (0 > config_idle_timeout) return;
+ if (0 >= config_no_project_timeout) return;
/* If there hasn't been a project running in a while, then pop. */
now = time(0);
idle_time = now - ad->time_armed;
// printf ("duude armed, waiting %d %d\n", idle_time, config_idle_timeout);
- if (idle_time <= config_idle_timeout) return;
+ if (idle_time <= config_no_project_timeout) return;
/* Due to GtkDialog broken-ness, re-realize the GUI */
if (NULL == ad->gtxml)
@@ -264,3 +264,4 @@
}
/* =========================== END OF FILE ============================== */
+
--- gnotime-2.2.1/src/gconf-io.c 2004-04-22 23:06:58.000000000 -0300
+++ /tmp/dpep.7xYbhV/gnotime-2.2.1/src/gconf-io.c 2005-03-27 10:55:11.570900752 -0300
@@ -216,6 +216,7 @@
g_snprintf(s, sizeof (s), "%ld", time(0));
SETSTR ("/Misc/LastTimer", s);
SETINT ("/Misc/IdleTimeout", config_idle_timeout);
+ SETINT ("/Misc/NoProjectTimeout", config_no_project_timeout);
SETINT ("/Misc/AutosavePeriod", config_autosave_period);
SETINT ("/Misc/TimerRunning", timer_is_running());
SETINT ("/Misc/CurrProject", gtt_project_get_id (cur_proj));
@@ -358,6 +359,7 @@
cur_proj_id = GETINT("/Misc/CurrProject", -1);
config_idle_timeout = GETINT ("/Misc/IdleTimeout", 300);
+ config_no_project_timeout = GETINT ("/Misc/NoProjectTimeout", 300);
config_autosave_period = GETINT ("/Misc/AutosavePeriod", 60);
config_daystart_offset = GETINT ("/Misc/DayStartOffset", 0);
config_weekstart_offset = GETINT ("/Misc/WeekStartOffset", 0);
--- gnotime-2.2.1/src/prefs.c 2004-04-25 15:26:25.000000000 -0300
+++ /tmp/dpep.7xYbhV/gnotime-2.2.1/src/prefs.c 2005-03-27 10:54:23.298239312 -0300
@@ -138,6 +138,7 @@
GtkCheckButton *show_tb_exit;
GtkEntry *idle_secs;
+ GtkEntry *no_project_secs;
GtkEntry *daystart_secs;
GtkOptionMenu *daystart_menu;
GtkOptionMenu *weekstart_menu;
@@ -374,6 +375,7 @@
{
int change = 0;
config_idle_timeout = atoi(gtk_entry_get_text(GTK_ENTRY(odlg->idle_secs)));
+ config_no_project_timeout = atoi(gtk_entry_get_text(GTK_ENTRY(odlg->no_project_secs)));
/* Hunt for the hour-of night on which to start */
const char * buff = gtk_entry_get_text (odlg->daystart_secs);
@@ -494,6 +496,9 @@
g_snprintf(s, sizeof (s), "%d", config_idle_timeout);
gtk_entry_set_text(GTK_ENTRY(odlg->idle_secs), s);
+ g_snprintf(s, sizeof (s), "%d", config_no_project_timeout);
+ gtk_entry_set_text(GTK_ENTRY(odlg->no_project_secs), s);
+
/* Set the correct menu item based on current values */
int hour;
if (0<config_daystart_offset)
@@ -696,6 +701,9 @@
w = GETWID ("idle secs");
dlg->idle_secs = GTK_ENTRY(w);
+ w = GETWID ("no project secs");
+ dlg->no_project_secs = GTK_ENTRY(w);
+
w = GETWID ("daystart entry");
dlg->daystart_secs = GTK_ENTRY(w);
--- gnotime-2.2.1/src/timer.c 2004-04-28 02:59:05.000000000 -0300
+++ /tmp/dpep.7xYbhV/gnotime-2.2.1/src/timer.c 2005-03-27 10:54:23.298239312 -0300
@@ -111,7 +111,7 @@
*/
if (!cur_proj)
{
- if (0 < config_idle_timeout)
+ if (0 < config_no_project_timeout)
{
/* Make sure the idle dialog is visible */
raise_idle_dialog (idt);
--- gnotime-2.2.1/src/timer.h 2003-01-02 15:53:51.000000000 -0200
+++ /tmp/dpep.7xYbhV/gnotime-2.2.1/src/timer.h 2005-03-27 10:54:23.298239312 -0300
@@ -36,6 +36,7 @@
/* The idle timeout is how long, in seconds, that the system seems idle
* before the clock stops itself */
extern int config_idle_timeout;
+extern int config_no_project_timeout;
/* The autosave period is how long, in seconds, we wait before doing a
* periodic save-thyself. */
Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/FC-3/gnotime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnotime.spec 16 Dec 2004 18:07:34 -0000 1.2
+++ gnotime.spec 7 May 2005 13:55:49 -0000 1.3
@@ -1,6 +1,6 @@
Name: gnotime
Version: 2.2.1
-Release: 5
+Release: 5.fc3.8
Epoch: 0
Summary: Tracks and reports time spent
@@ -9,25 +9,28 @@
URL: http://gttr.sourceforge.net/
Source0: http://dl.sf.net/gttr/%{name}-%{version}.tar.gz
# Images to go with the help files.
-Source1: http://www.tiki-lounge.com/~toshio/fedora/gtt_restartwin.png
-Source2: http://www.tiki-lounge.com/~toshio/fedora/gtt_startprojwin.png
+Source1: http://www.tiki-lounge.com/~toshio/fedora/gtt_restartwin.png
+Source2: http://www.tiki-lounge.com/~toshio/fedora/gtt_startprojwin.png
# Simple patch to make the .desktop more complete
Patch0: http://www.tiki-lounge.com/~toshio/fedora/gnotime-desktop.patch
# Combined patch allowing builds with gtkhtml3.0 or 3.1 and
# builds with a libqof installed on the system instead of bundled with Gnotime.
-Patch1: http://www.tiki-lounge.com/~toshio/fedora/gnotime-gtkhtml3-qof.patch
+Patch1: http://www.tiki-lounge.com/~toshio/fedora/gnotime-gtkhtml3.6-qof.patch
# Fixes includes of qof headers in source files.
-Patch2: http://www.tiki-lounge.com/~toshio/fedora/gnotime-qof-include.patch
+Patch2: http://www.tiki-lounge.com/~toshio/fedora/gnotime-qof-include.patch
# Fixes the idle timer for kernel 2.6.
-Patch3: http://www.tiki-lounge.com/~toshio/fedora/gnotime-idle.patch
+Patch3: http://www.tiki-lounge.com/~toshio/fedora/gnotime-idle.patch
# Fixes problems with calls to gnome_help
-Patch4: http://www.tiki-lounge.com/~toshio/fedora/gnotime-help.patch
+Patch4: http://www.tiki-lounge.com/~toshio/fedora/gnotime-help.patch
# Fixes problems with popup menus failing to pass data arguments to callbacks
-Patch5: http://www.tiki-lounge.com/~toshio/fedora/gnotime-popup-menus.patch
+Patch5: http://www.tiki-lounge.com/~toshio/fedora/gnotime-popup-menus.patch
# Fixes problem with gnome_help being invoked when the toplevel is unknown
-Patch6: http://www.tiki-lounge.com/~toshio/fedora/gnotime-help-error.patch
+Patch6: http://www.tiki-lounge.com/~toshio/fedora/gnotime-help-error.patch
# Add wordwrapping to textviews
-Patch7: http://www.tiki-lounge.com/~toshio/fedora/gnotime-wordwrap.patch
+Patch7: http://www.tiki-lounge.com/~toshio/fedora/gnotime-wordwrap.patch
+# Adapt a patch from the gnotime issue tracker to separate the idle timeout
+# from the no project running timeout.
+Patch8: http://www.tiki-lounge.com/~toshio/fedora/gnotime-separate-timeouts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,15 +42,13 @@
BuildRequires: qof-devel >= 0:0.5.0
BuildRequires: qof-devel < 0:0.6.0
# Because we modify configure.in, we need to BR the auto* tools.
-BuildRequires: libtool
+BuildRequires: libtool
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
+Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2
-#Conflicts:
-#Obsoletes:
-#BuildConflicts:
%description
A combination of stop-watch, diary, consultant billing system, and project
@@ -69,6 +70,7 @@
%patch5 -p0
%patch6 -p0
%patch7 -p0
+%patch8 -p1
cp $RPM_SOURCE_DIR/gtt_restartwin.png $RPM_BUILD_DIR/%{name}-%{version}/doc/C/figures/
cp $RPM_SOURCE_DIR/gtt_startprojwin.png $RPM_BUILD_DIR/%{name}-%{version}/doc/C/figures/
@@ -104,16 +106,34 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/gnotime.schemas &> /dev/null || :
+ # If applicable:
+ # gconftool-2 --makefile-uninstall-rule \
+ # %{_sysconfdir}/gconf/schemas/OLDSCHEMA.schemas &> /dev/null || :
+ killall -HUP gconfd-2 || :
+ unset GCONF_CONFIG_SOURCE
+fi
+
%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+gconftool-2 --makefile-install-rule \
+ %{_sysconfdir}/gconf/schemas/gnotime.schemas &>/dev/null || :
+unset GCONF_CONFIG_SOURCE
+killall -HUP gconfd-2 || :
scrollkeeper-update -q -o %{_datadir}/omf/gnotime || :
%preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCE
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/gnotime.schemas &> /dev/null || :
+ unset GCONF_CONFIG_SOURCE
+ killall -HUP gconfd-2 || :
+fi
%postun
scrollkeeper-update -q || :
@@ -129,10 +149,20 @@
%{_sysconfdir}/gconf/schemas/*
%changelog
+* Tue May 3 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-5.fc3.8
+- Sync relevant changes from the devel branch:
+ + Add a patch adapted from the gnotime tracker. Original patch by
+ goedson-users.sf.net. SF Tracker: 1171394. This allows separate setting
+ of the idle project and no project timeouts.
+ + Require(pre): GConf2.
+ + Fix up scriptlets to properly install and uninstall gconf schemas via
+ gconftool-2.
+ + Fix gtkhtml3 detection so 3.6 (as used in FC4) is detected.
+
* Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-5
- Patch to fix a crash when invoking gnome_help.
- Patch to wordwrap diary notes.
-
+
* Thu Sep 30 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-0.fdr.4
- New patch to fix the Activity entry in the popup menu.
@@ -184,6 +214,6 @@
* Mon Dec 15 2003 Toshio Kuratomi <toshio[AT]tiki-lounge.com> - 0:2.1.7-0.fdr.1
- Initial Fedora RPM release.
-- Partially adapted from the gnotime.spec.in by Eric Anderson
+- Partially adapted from the gnotime.spec.in by Eric Anderson
<eric.anderson[AT]cordata.net> from the Red Hat directory in the gnotime
distribution.
--- gnotime-gtkhtml3-qof.patch DELETED ---
More information about the fedora-extras-commits
mailing list