devel/gnotime gnotime-separate-timeouts.patch, NONE, 1.1 gnotime.spec, 1.8, 1.9

Toshio Ernie Kuratomi (toshio) fedora-extras-commits at redhat.com
Wed May 4 00:07:14 UTC 2005 

Author: toshio

Update of /cvs/extras/devel/gnotime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18787

Modified Files:
	gnotime.spec 
Added Files:
	gnotime-separate-timeouts.patch 
Log Message:
Added a patch to separate the idle timeout (when the computer isn't taking
user input put a project timer is running) from the start project timeout
(when no project timer is running, in case the user is doing something but
forgot to enable the timer.)  Original patch by Goedson Paixao from the
gnotime tracker:
http://sourceforge.net/tracker/index.php?func=detail&aid=1171394&group_id=55463&atid=477105


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/devel/gnotime/gnotime.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnotime.spec	31 Mar 2005 04:08:11 -0000	1.8
+++ gnotime.spec	4 May 2005 00:07:12 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.2.1
-Release:        7
+Release:        8
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
@@ -27,6 +27,9 @@
 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
+# 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)
 
@@ -66,6 +69,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/
@@ -144,6 +148,11 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon May 2 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-8
+- 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.
+
 * Wed Mar 30 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-7
 - Rebuild for FC4t1.
 - Fix typo in the %%pre scriptlet.

More information about the fedora-extras-commits mailing list