Attachment 693456 Details for Bug 906267 – evolution-2.28.3-button-icon-crash.patch

[patch] evolution-2.28.3-button-icon-crash.patch

evolution-2.28.3-button-icon-crash.patch (text/plain), 1.22 KB, created by Milan Crha on 2013-02-05 15:53:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Crha

Created: 2013-02-05 15:53:43 UTC

Size: 1.22 KB

patch

obsolete

>diff -up evolution-2.28.3/shell/e-shell-view.c.button-icon-crash evolution-2.28.3/shell/e-shell-view.c
>--- evolution-2.28.3/shell/e-shell-view.c.button-icon-crash	2013-02-05 16:49:37.984631490 +0100
>+++ evolution-2.28.3/shell/e-shell-view.c	2013-02-05 16:49:55.329841806 +0100
>@@ -90,9 +90,27 @@ impl_ShellView_setButtonIcon (PortableSe
> }
> 
> static void
>+shell_view_window_destroyed_cb (gpointer user_data,
>+				GObject *object)
>+{
>+	EShellView *view = user_data;
>+
>+	g_return_if_fail (view != NULL);
>+	g_return_if_fail ((gpointer) view->window == (gpointer) object);
>+
>+	view->window = NULL;
>+	bonobo_object_unref (view);
>+}
>+
>+static void
> impl_dispose (GObject *object)
> {
>-	/*EShellView *esv = (EShellView *)object;*/
>+	EShellView *esv = (EShellView *)object;
>+
>+	if (esv->window) {
>+		g_object_weak_unref (G_OBJECT (esv->window), shell_view_window_destroyed_cb, object);
>+		esv->window = NULL;
>+	}
> 
> 	((GObjectClass *)parent_class)->dispose(object);
> }
>@@ -130,8 +148,8 @@ EShellView *e_shell_view_new(struct _ESh
> {
> 	EShellView *new = g_object_new (e_shell_view_get_type (), NULL);
> 
>-	/* TODO: listen to destroy? */
> 	new->window = window;
>+	g_object_weak_ref (G_OBJECT (window), shell_view_window_destroyed_cb, new);
> 
> 	return new;
> }

Actions: View | Diff

Attachments on bug 906267: 690831 | 690832 | 690833 | 690834 | 690835 | 690836 | 690837 | 690838 | 690839 | 690840 | 693456