Attachment 302203 Details for Bug 441062 – what's in git

[patch] what's in git

gpk-fix-kde.patch (text/plain), 1.50 KB, created by Richard Hughes on 2008-04-12 10:06:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard Hughes

Created: 2008-04-12 10:06:03 UTC

Size: 1.50 KB

patch

obsolete

>commit 1be8dd4330adc36c068d2a7e51718f8820df2b66
>Author: Richard Hughes <richard@hughsie.com>
>Date:   Sat Apr 12 11:02:30 2008 +0100
>
>    when gnome-icon theme is not available, don't crash gpk-update-icon when we try to do the animation. fixes rh#441062
>
>diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
>index 63b20f7..846fc03 100644
>--- a/src/gpk-update-viewer.c
>+++ b/src/gpk-update-viewer.c
>@@ -280,7 +280,7 @@ pk_updates_apply_cb (PolKitGnomeAction *action, gpointer data)
> /**
>  * pk_updates_animation_load_frames:
>  **/
>-static void
>+static gboolean
> pk_updates_animation_load_frames (void)
> {
> 	GtkWidget *widget;
>@@ -299,7 +299,10 @@ pk_updates_animation_load_frames (void)
> 		pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
> 						   "process-working",
> 						   w, 0, NULL);
>-
>+		/* can't load from gnome-icon-theme */
>+		if (pixbuf == NULL) {
>+			return FALSE;
>+		}
> 		cols = gdk_pixbuf_get_width (pixbuf) / w;
> 		rows = gdk_pixbuf_get_height (pixbuf) / h;
> 
>@@ -313,6 +316,7 @@ pk_updates_animation_load_frames (void)
> 
> 		g_object_unref (pixbuf);
> 	}
>+	return TRUE;
> }
> 
> /**
>@@ -327,6 +331,12 @@ pk_updates_animation_update (gpointer data)
> 
> 	column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (model), "progress-column"));
> 
>+	/* have we loaded a file */
>+	if (frames == NULL) {
>+		pk_warning ("no frames to process");
>+		return FALSE;
>+	}
>+
> 	gtk_tree_model_get_iter_first (model, &iter);
> 	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
> 			    column, frames[frame_counter],

Actions: View | Diff

Attachments on bug 441062: 302089 | 302090 | 302091 | 302203 | 302278 | 302290