[evolution-patches] patch to fix #73031
- From: chenthill <pchenthill novell com>
- To: patches <evolution-patches lists ximian com>
- Subject: [evolution-patches] patch to fix #73031
- Date: Fri, 18 Mar 2005 17:46:42 +0530
Hi,
As described the bug there is no crash. We only get a warning with
updated gtk+.
thanks, chenthill.
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2691
diff -u -p -r1.2691 ChangeLog
--- ChangeLog 16 Mar 2005 14:51:00 -0000 1.2691
+++ ChangeLog 18 Mar 2005 12:08:24 -0000
@@ -1,3 +1,17 @@
+2005-03-18 Chenthill Palanisamy <pchenthill novell com>
+
+ Fixes #73031
+ * gui/dialogs/event-editor.c: (event_editor_finalize):
+ * gui/dialogs/task-editor.c: (task_editor_finalize): Added
+ a check for the presence of the object before unreffing it.
+
2005-03-16 Rodrigo Moya <rodrigo novell com>
Fixes #73101
Index: gui/dialogs/task-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-editor.c,v
retrieving revision 1.81
diff -u -p -r1.81 task-editor.c
--- gui/dialogs/task-editor.c 23 Feb 2005 12:42:44 -0000 1.81
+++ gui/dialogs/task-editor.c 18 Mar 2005 12:08:24 -0000
@@ -315,11 +315,25 @@ task_editor_finalize (GObject *object)
te = TASK_EDITOR (object);
priv = te->priv;
- g_object_unref (priv->task_page);
- g_object_unref (priv->task_details_page);
- g_object_unref (priv->meet_page);
+ if (priv->task_page) {
+ g_object_unref (priv->task_page);
+ priv->task_page = NULL;
+ }
+
+ if (priv->task_details_page) {
+ g_object_unref (priv->task_details_page);
+ priv->task_details_page = NULL;
+ }
- g_object_unref (priv->model);
+ if (priv->meet_page) {
+ g_object_unref (priv->meet_page);
+ priv->meet_page = NULL;
+ }
+
+ if (priv->model) {
+ g_object_unref (priv->model);
+ priv->model = NULL;
+ }
g_free (priv);
Index: gui/dialogs/event-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-editor.c,v
retrieving revision 1.59
diff -u -p -r1.59 event-editor.c
--- gui/dialogs/event-editor.c 23 Feb 2005 12:42:44 -0000 1.59
+++ gui/dialogs/event-editor.c 18 Mar 2005 12:08:24 -0000
@@ -332,12 +332,30 @@ event_editor_finalize (GObject *object)
ee = EVENT_EDITOR (object);
priv = ee->priv;
- g_object_unref (priv->event_page);
- g_object_unref (priv->recur_page);
- g_object_unref (priv->meet_page);
- g_object_unref (priv->sched_page);
+ if (priv->event_page) {
+ g_object_unref (priv->event_page);
+ priv->event_page = NULL;
+ }
+
+ if (priv->recur_page) {
+ g_object_unref (priv->recur_page);
+ priv->recur_page = NULL;
+ }
- g_object_unref (priv->model);
+ if (priv->meet_page) {
+ g_object_unref (priv->meet_page);
+ priv->meet_page = NULL;
+ }
+
+ if (priv->sched_page) {
+ g_object_unref (priv->sched_page);
+ priv->sched_page = NULL;
+ }
+
+ if (priv->model) {
+ g_object_unref (priv->model);
+ priv->model = NULL;
+ }
g_free (priv);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]