summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Boshell <leonardop@gentoo.org>2003-09-16 14:31:08 +0000
committerLeonardo Boshell <leonardop@gentoo.org>2003-09-16 14:31:08 +0000
commit2353f956087198e4e6a1898302a8569b23e558e2 (patch)
tree2b7807472be8d0fbdb52ddcf5a09ce3fe422d9b1 /gnome-extra/nautilus-media
parentMaking synclient executable to close bug #28857. Thanks to Hanno Boeck <hanno... (diff)
downloadhistorical-2353f956087198e4e6a1898302a8569b23e558e2.tar.gz
historical-2353f956087198e4e6a1898302a8569b23e558e2.tar.bz2
historical-2353f956087198e4e6a1898302a8569b23e558e2.zip
fixing the patch, which had a problem dereferencing a possible NULL pointer
Diffstat (limited to 'gnome-extra/nautilus-media')
-rw-r--r--gnome-extra/nautilus-media/ChangeLog6
-rw-r--r--gnome-extra/nautilus-media/files/nautilus-media-0.3.3.1-gcc2_fix.patch12
2 files changed, 11 insertions, 7 deletions
diff --git a/gnome-extra/nautilus-media/ChangeLog b/gnome-extra/nautilus-media/ChangeLog
index a78e4333ef22..5ed8636df3ab 100644
--- a/gnome-extra/nautilus-media/ChangeLog
+++ b/gnome-extra/nautilus-media/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for gnome-extra/nautilus-media
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/ChangeLog,v 1.16 2003/09/14 17:10:15 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/ChangeLog,v 1.17 2003/09/16 14:31:08 leonardop Exp $
+ 15 Sep 2003; L. Boshell <leonardop@gentoo.org>
+ files/nautilus-media-0.3.3.1-gcc2_fix.patch : Fix troubling patch.
+ Thanks to TGL for his contribution on bug #28632.
+
14 Sep 2003; foser <foser@gentoo.org> nautilus-media-0.3.3.1.ebuild :
Change gcc2 patch name to something recognizable
add gst-plugins-libpng dep for thumbnail support
diff --git a/gnome-extra/nautilus-media/files/nautilus-media-0.3.3.1-gcc2_fix.patch b/gnome-extra/nautilus-media/files/nautilus-media-0.3.3.1-gcc2_fix.patch
index 6f52a0188df3..e27a4877ec0f 100644
--- a/gnome-extra/nautilus-media/files/nautilus-media-0.3.3.1-gcc2_fix.patch
+++ b/gnome-extra/nautilus-media/files/nautilus-media-0.3.3.1-gcc2_fix.patch
@@ -1,17 +1,17 @@
diff -NurB nautilus-media-0.3.3.1-orig/media-info/media-info.c nautilus-media-0.3.3.1/media-info/media-info.c
---- nautilus-media-0.3.3.1-orig/media-info/media-info.c 2003-09-13 21:08:38.000000000 -0500
-+++ nautilus-media-0.3.3.1/media-info/media-info.c 2003-09-13 21:08:59.000000000 -0500
-@@ -258,11 +258,11 @@
+--- nautilus-media-0.3.3.1-orig/media-info/media-info.c 2003-08-12 09:04:06.000000000 -0500
++++ nautilus-media-0.3.3.1/media-info/media-info.c 2003-09-15 08:27:05.000000000 -0500
+@@ -258,10 +258,12 @@
gboolean
gst_media_info_read_idler (GstMediaInfo *info, GstMediaInfoStream **streamp)
{
-+ GstMediaInfoPriv *priv = info->priv;
++ GstMediaInfoPriv *priv;
+
/* if it's NULL then we're sure something went wrong higher up) */
if (info == NULL) return FALSE;
- GstMediaInfoPriv *priv = info->priv;
--
++ priv = info->priv;
+
g_assert (streamp != NULL);
switch (priv->state)
- {