diff options
author | adamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-04-28 14:44:01 +0800 |
---|---|---|
committer | adamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-04-28 14:44:01 +0800 |
commit | be02e474a36f661928958b58b3f766c1ffbd86d7 (patch) | |
tree | ecde6e6c7b74157197a174ad601930a2fd702a43 /deskutils/gnotime/files/patch-src::prefs.c | |
parent | b13d299cfb1c7d366a4aff12ce1551b62fe4af64 (diff) | |
download | marcuscom-ports-be02e474a36f661928958b58b3f766c1ffbd86d7.tar marcuscom-ports-be02e474a36f661928958b58b3f766c1ffbd86d7.tar.gz marcuscom-ports-be02e474a36f661928958b58b3f766c1ffbd86d7.tar.bz2 marcuscom-ports-be02e474a36f661928958b58b3f766c1ffbd86d7.tar.lz marcuscom-ports-be02e474a36f661928958b58b3f766c1ffbd86d7.tar.xz marcuscom-ports-be02e474a36f661928958b58b3f766c1ffbd86d7.tar.zst marcuscom-ports-be02e474a36f661928958b58b3f766c1ffbd86d7.zip |
Re-add gnotime, and tell it to look for the correct gtkhtml3 lib version.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3953 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'deskutils/gnotime/files/patch-src::prefs.c')
-rw-r--r-- | deskutils/gnotime/files/patch-src::prefs.c | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/deskutils/gnotime/files/patch-src::prefs.c b/deskutils/gnotime/files/patch-src::prefs.c new file mode 100644 index 000000000..40db4b8d8 --- /dev/null +++ b/deskutils/gnotime/files/patch-src::prefs.c @@ -0,0 +1,95 @@ +--- src/prefs.c.orig Mon May 24 20:25:52 2004 ++++ src/prefs.c Mon May 24 20:29:36 2004 +@@ -200,10 +200,12 @@ + scan_time_string (const char *str) + { + int hours=0, minutes=0, seconds = 0; ++ int totalsecs; + char buff[24]; ++ char *p; + strncpy (buff, str, 24); + buff[23]=0; +- char * p = strchr (buff, ':'); ++ p = strchr (buff, ':'); + if (p) *p = 0; + hours = atoi (buff); + if (p) +@@ -221,7 +223,7 @@ + minutes %= 60; + hours %= 24; + +- int totalsecs = hours*3600 + minutes*60 + seconds; ++ totalsecs = hours*3600 + minutes*60 + seconds; + if (12*3600 < totalsecs) totalsecs -= 24*3600; + return totalsecs; + } +@@ -373,14 +375,16 @@ + if (5 == page) + { + int change = 0; ++ int off, day; ++ const char *buff; + config_idle_timeout = atoi(gtk_entry_get_text(GTK_ENTRY(odlg->idle_secs))); + + /* Hunt for the hour-of night on which to start */ +- const char * buff = gtk_entry_get_text (odlg->daystart_secs); +- int off = scan_time_string (buff); ++ buff = gtk_entry_get_text (odlg->daystart_secs); ++ off = scan_time_string (buff); + SET_VAL (config_daystart_offset,off); + +- int day = get_optionmenu_item (odlg->weekstart_menu); ++ day = get_optionmenu_item (odlg->weekstart_menu); + SET_VAL (config_weekstart_offset, day); + + if (change) +@@ -421,6 +425,8 @@ + options_dialog_set(PrefsDialog *odlg) + { + char s[30]; ++ int hour, secs, day; ++ char buff[24]; + + SET_ACTIVE(secs); + SET_ACTIVE(statusbar); +@@ -495,7 +501,6 @@ + gtk_entry_set_text(GTK_ENTRY(odlg->idle_secs), s); + + /* Set the correct menu item based on current values */ +- int hour; + if (0<config_daystart_offset) + { + hour = (config_daystart_offset +1800)/3600; +@@ -510,14 +515,13 @@ + set_optionmenu_item (odlg->daystart_menu, hour); + + /* Print the daystart offset as a string in 24 hour time */ +- int secs = config_daystart_offset; ++ secs = config_daystart_offset; + if (0 > secs) secs += 24*3600; +- char buff[24]; + qof_print_hours_elapsed_buff (buff, 24, secs, config_show_secs); + gtk_entry_set_text (odlg->daystart_secs, buff); + + /* Set the correct menu item based on current values */ +- int day = config_weekstart_offset; ++ day = config_weekstart_offset; + set_optionmenu_item (odlg->weekstart_menu, day); + + /* set to unmodified as it reflects the current state of the app */ +@@ -531,12 +535,13 @@ + { + PrefsDialog *dlg = data; + ++ int secs; ++ char buff[24]; + int hour = get_optionmenu_item (dlg->daystart_menu); + hour += -3; /* menu starts at 9PM */ + +- int secs = hour * 3600; ++ secs = hour * 3600; + if (0 > secs) secs += 24*3600; +- char buff[24]; + qof_print_hours_elapsed_buff (buff, 24, secs, config_show_secs); + gtk_entry_set_text (dlg->daystart_secs, buff); + } |