From dfcd75d1640bced67434a61b9869962c50439586 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sat, 1 Jun 2002 17:28:10 +0000
Subject: [PATCH] Fix a problem where gnomecal would crash on the first of
 every month, and correct the link to gnomecal's help documentation.  Bump
 PORTREVISION.

PR:		38773 (help docs)
Obtained from:	gnome-pim CVS (crash fix)
---
 deskutils/gnome-pim/Makefile                  |  1 +
 .../files/patch-gncal_doc_C_topic.dat         |  6 +++++
 .../gnome-pim/files/patch-gncal_gnome-cal.c   | 27 +++++++++++++++++++
 deskutils/gnomepim/Makefile                   |  1 +
 .../files/patch-gncal_doc_C_topic.dat         |  6 +++++
 .../gnomepim/files/patch-gncal_gnome-cal.c    | 27 +++++++++++++++++++
 6 files changed, 68 insertions(+)
 create mode 100644 deskutils/gnome-pim/files/patch-gncal_doc_C_topic.dat
 create mode 100644 deskutils/gnome-pim/files/patch-gncal_gnome-cal.c
 create mode 100644 deskutils/gnomepim/files/patch-gncal_doc_C_topic.dat
 create mode 100644 deskutils/gnomepim/files/patch-gncal_gnome-cal.c

diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 77cbbee965d4..edd04e282eb2 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomepim
 PORTVERSION=	1.4.6
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.marcuscom.com/downloads/ \
 		http://www.eskil.org/gnome-pilot/download/tarballs/ \
diff --git a/deskutils/gnome-pim/files/patch-gncal_doc_C_topic.dat b/deskutils/gnome-pim/files/patch-gncal_doc_C_topic.dat
new file mode 100644
index 000000000000..78c2aef7c068
--- /dev/null
+++ b/deskutils/gnome-pim/files/patch-gncal_doc_C_topic.dat
@@ -0,0 +1,6 @@
+--- gncal/doc/C/topic.dat.orig	Sat Jun  1 13:10:13 2002
++++ gncal/doc/C/topic.dat	Sat Jun  1 13:10:21 2002
+@@ -1,2 +1,2 @@
+-gnomecal.html	Manual
++index.html	Manual
+ cmdline.html	Command line options 
diff --git a/deskutils/gnome-pim/files/patch-gncal_gnome-cal.c b/deskutils/gnome-pim/files/patch-gncal_gnome-cal.c
new file mode 100644
index 000000000000..cd3d8ba44c22
--- /dev/null
+++ b/deskutils/gnome-pim/files/patch-gncal_gnome-cal.c
@@ -0,0 +1,27 @@
+--- gncal/gnome-cal.c.orig	Sat Jun  1 13:08:01 2002
++++ gncal/gnome-cal.c	Sat Jun  1 13:09:41 2002
+@@ -76,7 +76,13 @@
+ static GtkWidget *
+ get_current_page (GnomeCalendar *gcal)
+ {
+-	return GTK_NOTEBOOK (gcal->notebook)->cur_page->child;
++    	GtkNotebookPage *page;
++
++	page = GTK_NOTEBOOK (gcal->notebook)->cur_page;
++	if (page)
++	    	return page->child;
++	else
++	    	return NULL;
+ }
+ 
+ char *
+@@ -111,6 +117,9 @@
+ 	g_return_if_fail (new_time != -1);
+ 
+ 	current = get_current_page (gcal);
++	if (!current)
++	    	return;
++
+ 	new_time = time_day_begin (new_time);
+ 
+ 	if (current == gcal->day_view) {
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index 77cbbee965d4..edd04e282eb2 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomepim
 PORTVERSION=	1.4.6
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.marcuscom.com/downloads/ \
 		http://www.eskil.org/gnome-pilot/download/tarballs/ \
diff --git a/deskutils/gnomepim/files/patch-gncal_doc_C_topic.dat b/deskutils/gnomepim/files/patch-gncal_doc_C_topic.dat
new file mode 100644
index 000000000000..78c2aef7c068
--- /dev/null
+++ b/deskutils/gnomepim/files/patch-gncal_doc_C_topic.dat
@@ -0,0 +1,6 @@
+--- gncal/doc/C/topic.dat.orig	Sat Jun  1 13:10:13 2002
++++ gncal/doc/C/topic.dat	Sat Jun  1 13:10:21 2002
+@@ -1,2 +1,2 @@
+-gnomecal.html	Manual
++index.html	Manual
+ cmdline.html	Command line options 
diff --git a/deskutils/gnomepim/files/patch-gncal_gnome-cal.c b/deskutils/gnomepim/files/patch-gncal_gnome-cal.c
new file mode 100644
index 000000000000..cd3d8ba44c22
--- /dev/null
+++ b/deskutils/gnomepim/files/patch-gncal_gnome-cal.c
@@ -0,0 +1,27 @@
+--- gncal/gnome-cal.c.orig	Sat Jun  1 13:08:01 2002
++++ gncal/gnome-cal.c	Sat Jun  1 13:09:41 2002
+@@ -76,7 +76,13 @@
+ static GtkWidget *
+ get_current_page (GnomeCalendar *gcal)
+ {
+-	return GTK_NOTEBOOK (gcal->notebook)->cur_page->child;
++    	GtkNotebookPage *page;
++
++	page = GTK_NOTEBOOK (gcal->notebook)->cur_page;
++	if (page)
++	    	return page->child;
++	else
++	    	return NULL;
+ }
+ 
+ char *
+@@ -111,6 +117,9 @@
+ 	g_return_if_fail (new_time != -1);
+ 
+ 	current = get_current_page (gcal);
++	if (!current)
++	    	return;
++
+ 	new_time = time_day_begin (new_time);
+ 
+ 	if (current == gcal->day_view) {