head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.12 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.10 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.8 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.6 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.4 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.2 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.4.0.24 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.22 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.20 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.18 pkgsrc-2008Q1:1.4.0.16 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.14 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.12 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.10 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.8 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.6 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.4 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.2 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.3.0.6 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.4 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.2 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.2.0.6 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2; locks; strict; comment @# @; 1.5 date 2008.10.28.23.38.34; author wiz; state dead; branches; next 1.4; 1.4 date 2006.04.04.15.32.22; author jmmv; state Exp; branches; next 1.3; 1.3 date 2005.06.26.18.45.44; author jmmv; state Exp; branches; next 1.2; 1.2 date 2004.11.27.10.48.03; author jdolecek; state dead; branches; next 1.1; 1.1 date 2004.11.24.22.35.25; author kristerw; state Exp; branches; next ; desc @@ 1.5 log @Update to 2.3.0: New in the 2.3.0 Release: ------------------------- The main changes in this release are: * a new implementation of the projects tree using the GtkTreeView component which fixes a lot of the bugs regarding the projects tree manipulation and prepares the way for many customizations in future releases. * an initial implementation of a tray icon that displays timer status and allows the user to toggle the timer by clicking on it. * a rewrite of the idle detection using the XScreenSaver extension and of the timer system to make it more system power conservation friendly. * port of the report system to use guile version 1.8. * many changes in the configure script, including porperly checking for guile and gconf and version of available DBUS. * removal of some deprecated APIs usage. In addition, many bugs have been fixed, including: * broken behavior of drag-and-drop (#1856268) * compiles but crashes on startup in fedora core 5 (#1802501) * activity journal truncates seconds (#1706365) * green bar flickers when value changes (#1171204) * dragging project to make sub-project will not scroll (#831808) New in the 2.2.3 Release: ------------------------- This release brings better internationalization in reports with locale based formating of times and monetary values. The newly added support for DBus messages allows users to start/stop the timer and save/reload the data file from the command line using the gnotime-remote script. Also, an update user's manual covers most of the features available in this version. In addition, many bugs have been fixed, including: -- Crash when saving to full filesystem (#1548248) -- Day of century calculation error causing skipped day in reports -- Conflicting keybindings (#1639477) -- Invoice report doesn't work in locales other than C -- Hidden question dialog when overwriting file during report saving (http://bugs.debian.org/422023) @ text @$NetBSD: patch-am,v 1.4 2006/04/04 15:32:22 jmmv Exp $ --- configure.orig 2004-05-23 22:09:39.000000000 +0200 +++ configure @@@@ -12520,23 +12520,23 @@@@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED" >&5 -echo $ECHO_N "checking for libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED" >&5 +echo $ECHO_N "checking for libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED... $ECHO_C" >&6 - if $PKG_CONFIG --exists "libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED" ; then + if $PKG_CONFIG --exists "libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes echo "$as_me:$LINENO: checking LIBGTKHTML_CFLAGS" >&5 echo $ECHO_N "checking LIBGTKHTML_CFLAGS... $ECHO_C" >&6 - LIBGTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED"` + LIBGTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED"` echo "$as_me:$LINENO: result: $LIBGTKHTML_CFLAGS" >&5 echo "${ECHO_T}$LIBGTKHTML_CFLAGS" >&6 echo "$as_me:$LINENO: checking LIBGTKHTML_LIBS" >&5 echo $ECHO_N "checking LIBGTKHTML_LIBS... $ECHO_C" >&6 - LIBGTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED"` + LIBGTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED"` echo "$as_me:$LINENO: result: $LIBGTKHTML_LIBS" >&5 echo "${ECHO_T}$LIBGTKHTML_LIBS" >&6 else @@@@ -12544,7 +12544,7 @@@@ echo "${ECHO_T}$LIBGTKHTML_LIBS" >&6 LIBGTKHTML_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - LIBGTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED"` + LIBGTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED"` echo $LIBGTKHTML_PKG_ERRORS fi @@@@ -12559,8 +12559,8 @@@@ echo "${ECHO_T}$LIBGTKHTML_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @ 1.4 log @Use gtkhtml38 instead of gtkhtml36. Bump PKGREVISION to 7. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.3 2005/06/26 18:45:44 jmmv Exp $ @ 1.3 log @Use gtkhtml36 rather than gtkhtml3. Bump PKGREVISION. Idea from wiz@@ to let us remove gtkhtml3. @ text @d1 1 a1 1 $NetBSD$ d11 2 a12 2 + echo "$as_me:$LINENO: checking for libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED" >&5 +echo $ECHO_N "checking for libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED... $ECHO_C" >&6 d15 1 a15 1 + if $PKG_CONFIG --exists "libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED" ; then d23 1 a23 1 + LIBGTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED"` d30 1 a30 1 + LIBGTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED"` d39 1 a39 1 + LIBGTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED"` d49 2 a50 2 + { { echo "$as_me:$LINENO: error: Library requirements (libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} @ 1.2 log @Update gnotime to 2.2.1. Changes: * further use of GtkDialog * added filter for HTML diary * escape & in project name * add option to reparent intervals to tasks above or below * sync qof with latest qof sources * accepted main.c patch @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.1 2004/11/24 22:35:25 kristerw Exp $ d3 50 a52 80 --- lib/qof/qofsql.c.orig Wed Nov 24 18:11:27 2004 +++ lib/qof/qofsql.c Wed Nov 24 18:25:14 2004 @@@@ -155,8 +155,9 @@@@ if (('\'' == str[0]) || ('\"' == str[0])) { + size_t len; str ++; - size_t len = strlen(str); + len = strlen(str); str[len-1] = 0; } return str; @@@@ -168,6 +169,15 @@@@ char tmpbuff[128]; GSList *param_list; QofQueryPredData *pred_data = NULL; + QofQueryCompare qop; + char *table_name; + char *param_name; + sql_field_item * sparam; + char * qparam_name; + sql_field_item * svalue; + char * qvalue_name; + QofType param_type; + QofQuery *qq; if (NULL == cond) { @@@@ -183,14 +193,14 @@@@ PWARN("missing left paramter"); return NULL; } - sql_field_item * sparam = cond->d.pair.left->item; + sparam = cond->d.pair.left->item; if (SQL_name != sparam->type) { PWARN("we support only paramter names at this time (parsed %d)", sparam->type); return NULL; } - char * qparam_name = sparam->d.name->data; + qparam_name = sparam->d.name->data; if (NULL == qparam_name) { PWARN ("missing paramter name"); @@@@ -205,13 +215,13 @@@@ PWARN ("missing right paramter"); return NULL; } - sql_field_item * svalue = cond->d.pair.right->item; + svalue = cond->d.pair.right->item; if (SQL_name != svalue->type) { PWARN("we support only simple values (parsed as %d)", svalue->type); return NULL; } - char * qvalue_name = svalue->d.name->data; + qvalue_name = svalue->d.name->data; if (NULL == qvalue_name) { PWARN("missing value"); @@@@ -224,16 +234,18 @@@@ * If it is, look up the value. */ if (0 == strncasecmp (qvalue_name, "kvp://", 6)) { + KvpValue *kv; + KvpValueType kvt; if (NULL == query->kvp_join) { PWARN ("missing kvp frame"); return NULL; } - KvpValue *kv = kvp_frame_get_value (query->kvp_join, qvalue_name+5); + kv = kvp_frame_get_value (query->kvp_join, qvalue_name+5); /* If there's no value, its not an error; * we just don't do this predicate */ if (!kv) return NULL; - KvpValueType kvt = kvp_value_get_type (kv); + kvt = kvp_value_get_type (kv); a53 172 tmpbuff[0] = 0x0; qvalue_name = tmpbuff; @@@@ -273,7 +285,6 @@@@ param_list = qof_query_build_param_list (qparam_name, NULL); /* Get the where-term comparison operator */ - QofQueryCompare qop; switch (cond->op) { case SQL_eq: qop = QOF_COMPARE_EQUAL; break; @@@@ -292,8 +303,6 @@@@ /* OK, need to know the type of the thing being matched * in order to build the correct predicate. Get the type * from the object parameters. */ - char *table_name; - char *param_name; get_table_and_param (qparam_name, &table_name, ¶m_name); if (NULL == table_name) { @@@@ -306,7 +315,7 @@@@ return NULL; } - QofType param_type = qof_class_get_parameter_type (table_name, param_name); + param_type = qof_class_get_parameter_type (table_name, param_name); if (!param_type) return NULL; /* Can't happen */ if (!strcmp (param_type, QOF_TYPE_STRING)) @@@@ -343,19 +352,20 @@@@ } else if (!strcmp (param_type, QOF_TYPE_DATE)) { + time_t exact; + int rc; + Timespec ts; // XXX FIXME: this doesn't handle time strings, only date strings // XXX should also see if we need to do a day-compare or time-compare. /* work around highly bogus locale setting */ qof_date_format_set(QOF_DATE_FORMAT_US); - time_t exact; - int rc = qof_scan_date_secs (qvalue_name, &exact); + rc = qof_scan_date_secs (qvalue_name, &exact); if (0 == rc) { PWARN ("unable to parse date: %s", qvalue_name); return NULL; } - Timespec ts; ts.tv_sec = exact; ts.tv_nsec = 0; pred_data = qof_query_date_predicate (qop, QOF_DATE_MATCH_DAY, ts); @@@@ -375,6 +385,7 @@@@ } else if (!strcmp (param_type, QOF_TYPE_GUID)) { + GList *guid_list; GUID *guid = guid_malloc(); gboolean rc = string_to_guid (qvalue_name, guid); if (0 == rc) @@@@ -386,7 +397,7 @@@@ // XXX match any means eqal, what about not equal ?? // XXX less, than greater than don't make sense, // should check for those bad conditions - GList *guid_list = g_list_append (NULL, guid); + guid_list = g_list_append (NULL, guid); pred_data = qof_query_guid_predicate (QOF_GUID_MATCH_ANY, guid_list); // XXX FIXME the above is a memory leak! we leak both guid and glist. } @@@@ -404,7 +415,7 @@@@ return NULL; } - QofQuery *qq = qof_query_create(); + qq = qof_query_create(); qof_query_add_term (qq, param_list, pred_data, QOF_QUERY_FIRST_TERM); return qq; } @@@@ -418,11 +429,12 @@@@ { case SQL_pair: { + QofQuery * qq; + QofQueryOp qop; QofQuery *qleft = handle_where (query, swear->d.pair.left); QofQuery *qright = handle_where (query, swear->d.pair.right); if (NULL == qleft) return qright; if (NULL == qright) return qleft; - QofQueryOp qop; switch (swear->d.pair.op) { case SQL_and: qop = QOF_QUERY_AND; break; @@@@ -433,7 +445,7 @@@@ qof_query_destroy (qright); return NULL; } - QofQuery * qq = qof_query_merge (qleft, qright, qop); + qq = qof_query_merge (qleft, qright, qop); qof_query_destroy (qleft); qof_query_destroy (qright); return qq; @@@@ -460,12 +472,11 @@@@ static void handle_sort_order (QofSqlQuery *query, GList *sorder_list) { - if (!sorder_list) return; - GSList *qsp[3]; gboolean direction[3]; int i; + if (!sorder_list) return; for (i=0; i<3; i++) { qsp[i] = NULL; @@@@ -473,14 +484,16 @@@@ if (sorder_list) { + char * qparam_name; + GList *n; sql_order_field *sorder = sorder_list->data; /* Set the sort direction */ if (SQL_asc == sorder->order_type) direction[i] = TRUE; /* Find the paramter name */ - char * qparam_name = NULL; - GList *n = sorder->name; + qparam_name = NULL; + n = sorder->name; if (n) { qparam_name = n->data; @@@@ -509,6 +522,10 @@@@ qof_sql_query_run (QofSqlQuery *query, const char *str) { GList *node; + GList *tables; + sql_select_statement *sss; + sql_where * swear; + GList *results; if (!query) return NULL; query->parse_result = sql_parse (str); @@@@ -531,14 +548,14 @@@@ * user wrote "SELECT * FROM tableA, tableB WHERE ..." * then we don't have a single unique table-name. */ - GList *tables = sql_statement_get_tables (query->parse_result); + tables = sql_statement_get_tables (query->parse_result); if (1 == g_list_length (tables)) { query->single_global_tablename = tables->data; } - sql_select_statement *sss = query->parse_result->statement; - sql_where * swear = sss->where; + sss = query->parse_result->statement; + swear = sss->where; if (swear) { /* Walk over the where terms, turn them into QOF predicates */ @@@@ -562,7 +579,7 @@@@ qof_query_set_book (query->qof_query, query->book); // qof_query_print (query->qof_query); - GList *results = qof_query_run (query->qof_query); + results = qof_query_run (query->qof_query); return results; } @ 1.1 log @Make this build under NetBSD 1.6.2 (C99-isms, and a missing header file). @ text @d1 1 a1 1 $NetBSD$ @