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

Add a patch from upstream git:

Browse Source 
Remove an assertion in ESourceSelector.
Related to bug #541192. Something accessibility-related is causing the
assertion to fail. The problem is still unknown, but the logic is more
forgiving now.

Fixes a crash when switching accounts in evolution when accessibility is
enabled.
This commit is contained in:
ajacoutot 2009-08-18 13:29:40 +00:00
parent 279517e337
commit fd5e4de123
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/evolution-data-server/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.47 2009/08/10 06:31:07 kili Exp $
# $OpenBSD: Makefile,v 1.48 2009/08/18 13:29:40 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= data backends for the Evolution mail/PIM suite
GNOME_PROJECT= evolution-data-server
GNOME_VERSION= 2.24.5
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= databases

33
databases/evolution-data-server/patches/patch-libedataserverui_e-source-selector_c Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-libedataserverui_e-source-selector_c,v 1.1 2009/08/18 13:29:40 ajacoutot Exp $
From upstream git:
Remove an assertion in ESourceSelector.
Related to bug #541192. Something accessibility-related is causing the
assertion to fail. The problem is still unknown, but the logic is more
forgiving now.
--- libedataserverui/e-source-selector.c.orig Tue Aug 18 14:19:19 2009
+++ libedataserverui/e-source-selector.c Tue Aug 18 14:21:24 2009
@@ -525,18 +525,17 @@ pixbuf_cell_data_func (GtkTreeViewColumn *column,
void *data;
gtk_tree_model_get (model, iter, 0, &data, -1);
+ g_return_if_fail (G_IS_OBJECT (data));
if (E_IS_SOURCE_GROUP (data)) {
- g_object_set (renderer,
- "visible", FALSE,
- NULL);
- } else {
+ g_object_set (renderer, "visible", FALSE, NULL);
+
+ } else if (E_IS_SOURCE (data)) {
ESource *source;
GdkPixbuf *pixbuf = NULL;
const gchar *color_spec;
GdkColor color;
- g_assert (E_IS_SOURCE (data));
source = E_SOURCE (data);
color_spec = e_source_peek_color_spec (source);