diff options
Diffstat (limited to 'deskutils/gnotime/files/patch-src::journal.c')
| -rw-r--r-- | deskutils/gnotime/files/patch-src::journal.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/deskutils/gnotime/files/patch-src::journal.c b/deskutils/gnotime/files/patch-src::journal.c index c8ad8d376655..2ecab2e4fa94 100644 --- a/deskutils/gnotime/files/patch-src::journal.c +++ b/deskutils/gnotime/files/patch-src::journal.c @@ -1,6 +1,6 @@ ---- src/journal.c.orig Sat May 8 12:14:49 2004 -+++ src/journal.c Thu Jul 8 00:23:23 2004 -@@ -200,8 +200,10 @@ +--- src/journal.c.orig Fri Sep 2 22:42:18 2005 ++++ src/journal.c Fri Oct 21 11:44:50 2005 +@@ -201,8 +201,10 @@ /* Don't clobber the file, ask user for permission */ GnomeVFSURI *parsed_uri; @@ -12,15 +12,15 @@ gnome_vfs_uri_unref (parsed_uri); if (exists) { -@@ -217,7 +219,6 @@ +@@ -218,7 +220,6 @@ } - + /* Try to open the file for writing */ - GnomeVFSResult result; - result = gnome_vfs_create (&wig->handle, filename, + result = gnome_vfs_create (&wig->handle, filename, GNOME_VFS_OPEN_WRITE, FALSE, 0644); -@@ -392,12 +393,15 @@ +@@ -393,12 +394,15 @@ GttTask *tsk = gtt_interval_get_parent (wig->interval); GttProject *prj = gtt_task_get_parent (tsk); GList *tasks = gtt_project_get_tasks (prj); @@ -39,7 +39,7 @@ gtt_task_append_interval (newtask, wig->interval); } -@@ -408,12 +412,15 @@ +@@ -409,12 +413,15 @@ GttTask *tsk = gtt_interval_get_parent (wig->interval); GttProject *prj = gtt_task_get_parent (tsk); GList *tasks = gtt_project_get_tasks (prj); @@ -58,15 +58,15 @@ gtt_task_add_interval (newtask, wig->interval); } -@@ -461,6 +468,7 @@ +@@ -462,6 +469,7 @@ static void interval_popup_cb (Wiggy *wig) { + GttTask *tsk; - gtk_menu_popup(GTK_MENU(wig->interval_popup), + gtk_menu_popup(GTK_MENU(wig->interval_popup), NULL, NULL, NULL, wig, 1, 0); if (cutted_task_list) -@@ -494,7 +502,7 @@ +@@ -495,7 +503,7 @@ gtk_widget_set_sensitive (wig->interval_move_down, FALSE); } @@ -75,15 +75,15 @@ if (gtt_task_is_first_task (tsk)) { gtk_widget_set_sensitive (wig->interval_move_up, FALSE); -@@ -558,6 +566,7 @@ +@@ -559,6 +567,7 @@ static void - task_delete_memo_clicked_cb(GtkWidget * w, gpointer data) + 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 +575,7 @@ +@@ -567,7 +576,7 @@ gtt_task_merge_up (wig->task); @@ -92,7 +92,7 @@ gtt_task_remove (wig->task); cutted_task_list = ctl; } -@@ -748,9 +757,10 @@ +@@ -749,9 +758,10 @@ on_close_clicked_cb (GtkWidget *w, gpointer data) { Wiggy *wig = (Wiggy *) data; @@ -102,9 +102,9 @@ - GtkWidget *topper = wig->top; /* avoid recursion */ + topper = wig->top; /* avoid recursion */ wig->top = NULL; - gtk_widget_destroy (topper); -@@ -838,17 +848,17 @@ + /* Unplug the timout function, so that timer doesn't +@@ -856,17 +866,17 @@ { Wiggy *wig = data; const char * path = gtt_ghtml_resolve_path (url, wig->filepath); @@ -114,20 +114,20 @@ GnomeVFSHandle *vfs; +#define BSZ 16000 + char buff[BSZ]; -+ GnomeVFSFileSize bytes_read; ++ GnomeVFSFileSize bytes_read; + if (!path) return; + 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; +- GnomeVFSFileSize bytes_read; result = gnome_vfs_read (vfs, buff, BSZ, &bytes_read); while (GNOME_VFS_OK == result) { -@@ -873,6 +883,7 @@ +@@ -891,6 +901,7 @@ { char * str; gpointer addr = NULL; @@ -135,7 +135,7 @@ /* h4x0r al3rt bare-naked pointer parsing! */ str = strstr (url, "0x"); -@@ -909,7 +920,6 @@ +@@ -927,7 +938,6 @@ return msg; } @@ -143,7 +143,7 @@ return g_strdup (msg); } -@@ -972,8 +982,14 @@ +@@ -991,8 +1001,14 @@ /* Create and initialize the hover-help window */ if (!wig->hover_help_window) { @@ -159,7 +159,7 @@ 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 +997,19 @@ +@@ -1000,19 +1016,19 @@ gtk_window_set_resizable (wino, FALSE); /* FALSE to enable auto-resize */ /* There must be a better way to draw a line around the box ?? */ @@ -176,13 +176,13 @@ 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 +1018,6 @@ +@@ -1021,7 +1037,6 @@ gtk_window_set_focus (GTK_WINDOW(wig->top), GTK_WIDGET(wig->html)); /* Set up in initial default, so later move works. */ @@ -190,7 +190,7 @@ 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 +1068,28 @@ +@@ -1072,25 +1087,28 @@ perform_form_query (KvpFrame *kvpf) { GList *results, *n; |