Hello community, here is the log from the commit of package gnome-packagekit for openSUSE:12.3 checked in at 2013-02-11 11:00:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/gnome-packagekit (Old) and /work/SRC/openSUSE:12.3/.gnome-packagekit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-packagekit", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.3/gnome-packagekit/gnome-packagekit.changes 2013-01-31 01:18:20.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.gnome-packagekit.new/gnome-packagekit.changes 2013-02-11 11:00:08.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Feb 10 00:54:33 UTC 2013 - [email protected] + +- Add gpk-Dont-crash-if-the-window-invoking-task-exits.patch, Don't + crash if the window that invoked the task exits before the task + starts up (rh#756208). + +------------------------------------------------------------------- New: ---- gpk-Dont-crash-if-the-window-invoking-task-exits.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-packagekit.spec ++++++ --- /var/tmp/diff_new_pack.FMTVBa/_old 2013-02-11 11:00:09.000000000 +0100 +++ /var/tmp/diff_new_pack.FMTVBa/_new 2013-02-11 11:00:09.000000000 +0100 @@ -34,6 +34,8 @@ Patch1: gnome-packagekit-OnlyShowIn.patch # PATCH-FIX-UPSTREAM gnome-packagekit-larger-details-pane.patch bnc#730971 bgo#666635 badshah400@gmailcom -- Make the details pane in the update viewer larger (patch came from Gary, pushed to upstream bug) Patch2: gnome-packagekit-larger-details-pane.patch +# PATCH-FIX-UPSTREAM gpk-Dont-crash-if-the-window-invoking-task-exits.patch rh#756208 [email protected] -- Don't crash if the window that invoked the task exits before the task starts up, taken from upstream stable git. +Patch3: gpk-Dont-crash-if-the-window-invoking-task-exits.patch BuildRequires: PackageKit-devel BuildRequires: desktop-file-utils BuildRequires: docbook-utils-minimal @@ -87,6 +89,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure \ ++++++ gpk-Dont-crash-if-the-window-invoking-task-exits.patch ++++++ >From 10abf863788775bb119e6dee9875487a12f15e12 Mon Sep 17 00:00:00 2001 From: Richard Hughes <[email protected]> Date: Wed, 28 Nov 2012 14:53:41 +0000 Subject: Don't crash if the window that invoked the task exits before the task starts up Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=756208 --- diff --git a/src/gpk-dbus.c b/src/gpk-dbus.c index 8dc19c5..aa43581 100644 --- a/src/gpk-dbus.c +++ b/src/gpk-dbus.c @@ -334,6 +334,7 @@ gpk_dbus_create_task (GpkDbus *dbus, guint32 xid, const gchar *interaction, DBus gchar *sender; gchar *exec; guint timestamp = 0; + gboolean ret; task = gpk_dbus_task_new (); @@ -349,8 +350,9 @@ gpk_dbus_create_task (GpkDbus *dbus, guint32 xid, const gchar *interaction, DBus /* try to get the user time of the window */ if (xid != 0) { - gpk_x11_set_xid (dbus->priv->x11, xid); - timestamp = gpk_x11_get_user_time (dbus->priv->x11); + ret = gpk_x11_set_xid (dbus->priv->x11, xid); + if (ret) + timestamp = gpk_x11_get_user_time (dbus->priv->x11); } /* set the context for the return values */ diff --git a/src/gpk-x11.c b/src/gpk-x11.c index 9b54454..2a5b13f 100644 --- a/src/gpk-x11.c +++ b/src/gpk-x11.c @@ -54,6 +54,8 @@ gpk_x11_set_xid (GpkX11 *x11, guint32 xid) g_return_val_if_fail (GPK_IS_X11 (x11), FALSE); window = gdk_x11_window_foreign_new_for_display (x11->priv->gdk_display, xid); + if (window == NULL) + return FALSE; /* save the x state */ x11->priv->display = GDK_DISPLAY_XDISPLAY (x11->priv->gdk_display); -- cgit v0.9.0.2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
