cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Bug #699980 - Calendar delete does not remove events from view

Browse Source
This commit is contained in:
ajacoutot 2013-05-14 12:36:36 +00:00
parent 7d721ee7a8
commit e8d3c23490
5 changed files with 85 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/evolution/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.196 2013/05/12 15:31:45 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.197 2013/05/14 12:36:36 ajacoutot Exp $
# XXX textproc/highlight
@ -13,6 +13,8 @@ GNOME_VERSION= 3.8.2
PKGNAME-main= ${DISTNAME}
PKGNAME-plugins= evolution-plugins-${GNOME_VERSION}
REVISION-main= 0
# NOTE: when R changes, increment EVO_VERSION accordingly and bump:
# mail/evolution-ews
# mail/evolution-rss
@ -38,7 +40,7 @@ WANTLIB-main += gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-3 goa-1.0
WANTLIB-main += gobject-2.0 gstreamer-1.0 gtk-3 gtkhtml-4.0 gtkhtml-editor-4.0
WANTLIB-main += gweather-3 ical icalvcal ldap-2.4 m notify nspr4 nss3
WANTLIB-main += pango-1.0 pangocairo-1.0 plc4 pthread secret-1 smime3
WANTLIB-main += soup-2.4 soup-gnome-2.4 webkitgtk-3.0 xml2
WANTLIB-main += soup-2.4 soup-gnome-2.4 webkitgtk-3.0 xml2 krb5
WANTLIB-plugins += ${WANTLIB}
WANTLIB-plugins += camel-1.2 canberra ebook-1.2 ebook-contacts-1.2 ecal-1.2

21
mail/evolution/patches/patch-e-util_e-source-selector_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-e-util_e-source-selector_c,v 1.1 2013/05/14 12:36:36 ajacoutot Exp $
From f0ee8d9c24fc1725408ddcddb68a6938562749cc Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 14 May 2013 10:02:32 +0000
Subject: Bug #699980 - Calendar delete does not remove events from view
--- e-util/e-source-selector.c.orig Wed May 8 14:03:18 2013
+++ e-util/e-source-selector.c Tue May 14 13:58:48 2013
@@ -1638,6 +1638,11 @@ e_source_selector_unselect_source (ESourceSelector *se
/* Make sure the ESource is in our tree model. */
source_index = selector->priv->source_index;
reference = g_hash_table_lookup (source_index, source);
+
+ /* can be NULL when the source was just removed */
+ if (!reference)
+ return;
+
g_return_if_fail (gtk_tree_row_reference_valid (reference));
class = E_SOURCE_SELECTOR_GET_CLASS (selector);

20
mail/evolution/patches/patch-modules_calendar_e-cal-shell-sidebar_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-modules_calendar_e-cal-shell-sidebar_c,v 1.1 2013/05/14 12:36:36 ajacoutot Exp $
From f0ee8d9c24fc1725408ddcddb68a6938562749cc Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 14 May 2013 10:02:32 +0000
Subject: Bug #699980 - Calendar delete does not remove events from view
--- modules/calendar/e-cal-shell-sidebar.c.orig Wed May 8 14:02:53 2013
+++ modules/calendar/e-cal-shell-sidebar.c Tue May 14 13:58:48 2013
@@ -390,6 +390,10 @@ cal_shell_sidebar_restore_state_cb (EShellWindow *shel
model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector));
g_signal_connect_swapped (
+ registry, "source-removed",
+ G_CALLBACK (e_cal_shell_sidebar_remove_source), shell_sidebar);
+
+ g_signal_connect_swapped (
model, "row-changed",
G_CALLBACK (cal_shell_sidebar_row_changed_cb),
shell_sidebar);

20
mail/evolution/patches/patch-modules_calendar_e-memo-shell-sidebar_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-modules_calendar_e-memo-shell-sidebar_c,v 1.1 2013/05/14 12:36:36 ajacoutot Exp $
From f0ee8d9c24fc1725408ddcddb68a6938562749cc Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 14 May 2013 10:02:32 +0000
Subject: Bug #699980 - Calendar delete does not remove events from view
--- modules/calendar/e-memo-shell-sidebar.c.orig Wed May 8 14:02:53 2013
+++ modules/calendar/e-memo-shell-sidebar.c Tue May 14 13:58:48 2013
@@ -386,6 +386,10 @@ memo_shell_sidebar_restore_state_cb (EShellWindow *she
model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector));
g_signal_connect_swapped (
+ registry, "source-removed",
+ G_CALLBACK (e_memo_shell_sidebar_remove_source), shell_sidebar);
+
+ g_signal_connect_swapped (
model, "row-changed",
G_CALLBACK (memo_shell_sidebar_row_changed_cb),
shell_sidebar);

20
mail/evolution/patches/patch-modules_calendar_e-task-shell-sidebar_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-modules_calendar_e-task-shell-sidebar_c,v 1.1 2013/05/14 12:36:36 ajacoutot Exp $
From f0ee8d9c24fc1725408ddcddb68a6938562749cc Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 14 May 2013 10:02:32 +0000
Subject: Bug #699980 - Calendar delete does not remove events from view
--- modules/calendar/e-task-shell-sidebar.c.orig Wed May 8 14:02:53 2013
+++ modules/calendar/e-task-shell-sidebar.c Tue May 14 13:58:48 2013
@@ -386,6 +386,10 @@ task_shell_sidebar_restore_state_cb (EShellWindow *she
model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector));
g_signal_connect_swapped (
+ registry, "source-removed",
+ G_CALLBACK (e_task_shell_sidebar_remove_source), shell_sidebar);
+
+ g_signal_connect_swapped (
model, "row-changed",
G_CALLBACK (task_shell_sidebar_row_changed_cb),
shell_sidebar);