head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.12 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.10 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.8 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.6 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.4 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.2 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.2.0.34 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.32 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.30 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.28 pkgsrc-2008Q1:1.2.0.26 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.24 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.22 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.20 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.18 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.16 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.14 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.12 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.10 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.0.2 pkgsrc-2004Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2008.10.28.23.38.34; author wiz; state dead; branches; next 1.2; 1.2 date 2005.03.16.12.48.49; author rillig; state Exp; branches; next 1.1; 1.1 date 2004.11.24.22.35.25; author kristerw; state Exp; branches; next ; desc @@ 1.3 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-ae,v 1.2 2005/03/16 12:48:49 rillig Exp $ --- src/journal.c.orig Sat May 8 18:14:49 2004 +++ src/journal.c Wed Mar 16 11:03:07 2005 @@@@ -197,11 +197,12 @@@@ remember_uri (Wiggy *wig, const char * f static void save_to_gnomevfs (Wiggy *wig, const char * filename) { - + gboolean exists; + GnomeVFSResult result; /* Don't clobber the file, ask user for permission */ GnomeVFSURI *parsed_uri; parsed_uri = gnome_vfs_uri_new (filename); - gboolean exists = gnome_vfs_uri_exists (parsed_uri); + exists = gnome_vfs_uri_exists (parsed_uri); gnome_vfs_uri_unref (parsed_uri); if (exists) { @@@@ -217,7 +218,6 @@@@ save_to_gnomevfs (Wiggy *wig, const char } /* Try to open the file for writing */ - GnomeVFSResult result; result = gnome_vfs_create (&wig->handle, filename, GNOME_VFS_OPEN_WRITE, FALSE, 0644); @@@@ -392,12 +392,14 @@@@ interval_move_up_clicked_cb(GtkWidget * GttTask *tsk = gtt_interval_get_parent (wig->interval); GttProject *prj = gtt_task_get_parent (tsk); GList *tasks = gtt_project_get_tasks (prj); + GList *this_task, *prev_task; + GttTask *newtask; if (!tasks) return; - GList *this_task = g_list_find (tasks, tsk); + this_task = g_list_find (tasks, tsk); if (!this_task) return; - GList *prev_task = this_task->prev; - if (!prev_task) return; - GttTask *newtask = prev_task->data; + prev_task = this_task->prev; + if (!prev_task) return; /* FIXME: Memory leak */ + newtask = prev_task->data; gtt_task_append_interval (newtask, wig->interval); } @@@@ -408,12 +410,14 @@@@ interval_move_down_clicked_cb(GtkWidget GttTask *tsk = gtt_interval_get_parent (wig->interval); GttProject *prj = gtt_task_get_parent (tsk); GList *tasks = gtt_project_get_tasks (prj); + GList *this_task, *next_task; + GttTask *newtask; if (!tasks) return; - GList *this_task = g_list_find (tasks, tsk); + this_task = g_list_find (tasks, tsk); if (!this_task) return; - GList *next_task = this_task->next; + next_task = this_task->next; if (!next_task) return; - GttTask *newtask = next_task->data; + newtask = next_task->data; gtt_task_add_interval (newtask, wig->interval); } @@@@ -461,6 +465,7 @@@@ interval_paste_memo_cb(GtkWidget * w, gp static void interval_popup_cb (Wiggy *wig) { + GttTask *tsk; gtk_menu_popup(GTK_MENU(wig->interval_popup), NULL, NULL, NULL, wig, 1, 0); if (cutted_task_list) @@@@ -494,7 +499,7 @@@@ interval_popup_cb (Wiggy *wig) gtk_widget_set_sensitive (wig->interval_move_down, FALSE); } - GttTask *tsk = gtt_interval_get_parent(wig->interval); + tsk = gtt_interval_get_parent(wig->interval); if (gtt_task_is_first_task (tsk)) { gtk_widget_set_sensitive (wig->interval_move_up, FALSE); @@@@ -558,6 +563,7 @@@@ task_edit_task_clicked_cb(GtkWidget * w, static void task_delete_memo_clicked_cb(GtkWidget * w, gpointer data) { + GList * ctl; Wiggy *wig = (Wiggy *) data; /* It is physically impossible to cut just the memo, without @@@@ -566,7 +572,7 @@@@ task_delete_memo_clicked_cb(GtkWidget * gtt_task_merge_up (wig->task); - GList * ctl = g_list_prepend(cutted_task_list, wig->task); + ctl = g_list_prepend(cutted_task_list, wig->task); gtt_task_remove (wig->task); cutted_task_list = ctl; } @@@@ -747,10 +753,11 @@@@ on_save_clicked_cb (GtkWidget *w, gpoint static void on_close_clicked_cb (GtkWidget *w, gpointer data) { + GtkWidget *topper; Wiggy *wig = (Wiggy *) data; if (NULL == wig->top) return; /* avoid recursive double-free */ - GtkWidget *topper = wig->top; /* avoid recursion */ + topper = wig->top; /* avoid recursion */ wig->top = NULL; gtk_widget_destroy (topper); @@@@ -836,19 +843,20 @@@@ static void html_url_requested_cb(GtkHTML *doc, const gchar * url, GtkHTMLStream *handle, gpointer data) { + GnomeVFSResult result; + GnomeVFSHandle *vfs; +#define BSZ 16000 + char buff[BSZ]; + GnomeVFSFileSize bytes_read; + Wiggy *wig = data; const char * path = gtt_ghtml_resolve_path (url, wig->filepath); if (!path) return; - GnomeVFSResult result; - GnomeVFSHandle *vfs; result = gnome_vfs_open (&vfs, path, GNOME_VFS_OPEN_READ); if (GNOME_VFS_OK != result) return; -#define BSZ 16000 - char buff[BSZ]; - GnomeVFSFileSize bytes_read; result = gnome_vfs_read (vfs, buff, BSZ, &bytes_read); while (GNOME_VFS_OK == result) { @@@@ -909,8 +917,10 @@@@ get_hover_msg (const gchar *url) return msg; } + { char * msg = _("Left-click to bring up menu"); return g_strdup (msg); + } } static gint @@@@ -972,8 +982,13 @@@@ html_on_url_cb(GtkHTML *doc, const gchar /* Create and initialize the hover-help window */ if (!wig->hover_help_window) { + GtkWindow *wino; + GtkWidget *frame; + GtkWidget *align; + GtkWidget *label; + int px=0, py=0, rx=0, ry=0; wig->hover_help_window = gtk_window_new(GTK_WINDOW_POPUP); - GtkWindow *wino = GTK_WINDOW (wig->hover_help_window); + wino = GTK_WINDOW (wig->hover_help_window); gtk_window_set_decorated (wino, FALSE); gtk_window_set_destroy_with_parent (wino, TRUE); gtk_window_set_transient_for (wino, GTK_WINDOW(wig->top)); @@@@ -981,19 +996,19 @@@@ html_on_url_cb(GtkHTML *doc, const gchar gtk_window_set_resizable (wino, FALSE); /* FALSE to enable auto-resize */ /* There must be a better way to draw a line around the box ?? */ - GtkWidget *frame = gtk_frame_new (NULL); + frame = gtk_frame_new (NULL); gtk_container_add(GTK_CONTAINER(wino), frame); gtk_container_set_resize_mode (GTK_CONTAINER(frame), GTK_RESIZE_PARENT); gtk_widget_show (frame); /* There must be a better way to pad the text all around ?? */ - GtkWidget *align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); + align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); // gtk_alignment_set_padding (GTK_ALIGNMENT(align), 6, 6, 6, 6); gtk_container_add(GTK_CONTAINER(frame), align); gtk_container_set_resize_mode (GTK_CONTAINER(align), GTK_RESIZE_PARENT); gtk_widget_show (align); - GtkWidget *label = gtk_label_new ("xxx"); + label = gtk_label_new ("xxx"); wig->hover_label = GTK_LABEL (label); gtk_container_add(GTK_CONTAINER(align), label); gtk_widget_show (label); @@@@ -1002,7 +1017,6 @@@@ html_on_url_cb(GtkHTML *doc, const gchar gtk_window_set_focus (GTK_WINDOW(wig->top), GTK_WIDGET(wig->html)); /* Set up in initial default, so later move works. */ - int px=0, py=0, rx=0, ry=0; gtk_widget_get_pointer (GTK_WIDGET(wig->top), &px, &py); gtk_window_get_position (GTK_WINDOW(wig->top), &rx, &ry); gtk_window_move (wino, rx+px, ry+py); @@@@ -1053,25 +1067,28 @@@@ static GList * perform_form_query (KvpFrame *kvpf) { GList *results, *n; + char *user_debug; + QofSqlQuery *q; + char *query_string; if (!kvpf) return NULL; /* Allow the user to enable form debugging by adding the following html: * */ - char *user_debug = kvp_frame_get_string (kvpf, "debug"); + user_debug = kvp_frame_get_string (kvpf, "debug"); if (user_debug) { printf ("Debug: HTML Form Input=%s\n", kvp_frame_to_string (kvpf)); } - QofSqlQuery *q = qof_sql_query_new(); + q = qof_sql_query_new(); if (!book) book = qof_book_new(); qof_sql_query_set_book (q, book); qof_sql_query_set_kvp (q, kvpf); - char *query_string = kvp_frame_get_string (kvpf, "query"); + query_string = kvp_frame_get_string (kvpf, "query"); if (!query_string) return NULL; if (0 == query_string[0]) return NULL; @ 1.2 log @Added patches to enable building with gcc-2.95.3. Approved by wiz. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 2004/11/24 22:35:25 kristerw Exp $ @ 1.1 log @Make this build under NetBSD 1.6.2 (C99-isms, and a missing header file). @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- src/journal.c.orig Wed Nov 24 22:18:52 2004 +++ src/journal.c Wed Nov 24 22:26:45 2004 @@@@ -195,11 +195,12 @@@@ d20 1 a20 1 @@@@ -215,7 +216,6 @@@@ d28 55 a82 1 @@@@ -509,6 +509,7 @@@@ d90 1 a90 1 @@@@ -517,7 +518,7 @@@@ d99 1 a99 1 @@@@ -697,10 +698,11 @@@@ d112 1 a112 1 @@@@ -786,19 +788,20 @@@@ d138 1 a138 1 @@@@ -859,8 +862,10 @@@@ d149 1 a149 1 @@@@ -922,8 +927,13 @@@@ d164 1 a164 1 @@@@ -931,19 +941,19 @@@@ d187 1 a187 1 @@@@ -952,7 +962,6 @@@@ d195 1 a195 1 @@@@ -1003,25 +1012,28 @@@@ @