diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-06-29 13:11:58 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-06-29 13:11:58 +0000 |
| commit | 4f28b9be4c6bfe125da8b5d116f28622b082de5f (patch) | |
| tree | 373ec67d5e3772766f7e53bad555dc86c508522f /gnome-extra/gnome-system-monitor | |
| parent | Mark stable on x86 (diff) | |
| download | historical-4f28b9be4c6bfe125da8b5d116f28622b082de5f.tar.gz historical-4f28b9be4c6bfe125da8b5d116f28622b082de5f.tar.bz2 historical-4f28b9be4c6bfe125da8b5d116f28622b082de5f.zip | |
Fix crash at startup
Diffstat (limited to 'gnome-extra/gnome-system-monitor')
4 files changed, 27 insertions, 6 deletions
diff --git a/gnome-extra/gnome-system-monitor/ChangeLog b/gnome-extra/gnome-system-monitor/ChangeLog index b05942058a9f..3febb633b168 100644 --- a/gnome-extra/gnome-system-monitor/ChangeLog +++ b/gnome-extra/gnome-system-monitor/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/gnome-system-monitor # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.20 2003/06/20 14:56:21 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.21 2003/06/29 13:09:39 azarah Exp $ + + 29 Jun 2003; Martin Schlemmer <azarah@gentoo.org> + gnome-system-monitor-2.0.5.ebuild, + files/gnome-system-monitor-2.0.5-fix-startup-crash.patch: + Fix crash at startup in some cases. *gnome-system-monitor-2.0.5 (20 Jun 2003) diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest index 7d12b32f1e22..96fa4d8444dd 100644 --- a/gnome-extra/gnome-system-monitor/Manifest +++ b/gnome-extra/gnome-system-monitor/Manifest @@ -1,8 +1,9 @@ -MD5 42d76312d2ad2c8d00d29717c31f45da ChangeLog 2576 +MD5 0229fc440fe567cf6e5550651f9d5682 ChangeLog 2763 +MD5 8f022cd65e92e06a24444ecd46a59eb6 gnome-system-monitor-2.0.5.ebuild 981 MD5 fd7ab71c1935e6a3569df94c78eaaba6 gnome-system-monitor-2.0.2.ebuild 881 MD5 263e871d536b70d5b61387c3f16efb7c gnome-system-monitor-2.0.4-r1.ebuild 1062 -MD5 97e43ec614c3e57568f4b346e0ddfadd gnome-system-monitor-2.0.5.ebuild 863 -MD5 e2ccad43cdc14e5a482cf77dc6462d8d files/digest-gnome-system-monitor-2.0.2 79 +MD5 268ebc98d434a875921bb2e5d45d3ff5 files/digest-gnome-system-monitor-2.0.5 79 MD5 2c9980b13ea40191fc1ced1f33fc8145 files/digest-gnome-system-monitor-2.0.4-r1 79 +MD5 e2ccad43cdc14e5a482cf77dc6462d8d files/digest-gnome-system-monitor-2.0.2 79 MD5 b39b1d001c6cfb36a860351aed50ddb3 files/gnome-system-monitor-devicesviewimprovements.patch 20935 -MD5 268ebc98d434a875921bb2e5d45d3ff5 files/digest-gnome-system-monitor-2.0.5 79 +MD5 19acc82cb5fc63387b37c71ddf4c09c6 files/gnome-system-monitor-2.0.5-fix-startup-crash.patch 616 diff --git a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.0.5-fix-startup-crash.patch b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.0.5-fix-startup-crash.patch new file mode 100644 index 000000000000..4d6dd142594c --- /dev/null +++ b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.0.5-fix-startup-crash.patch @@ -0,0 +1,12 @@ +--- gnome-system-monitor-2.0.5/src/procman.c.orig 2003-06-29 14:17:58.000000000 +0200 ++++ gnome-system-monitor-2.0.5/src/procman.c 2003-06-29 14:38:07.000000000 +0200 +@@ -389,7 +389,8 @@ + visible = gconf_client_get_bool (client, key, NULL); + g_free (key); + +- column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree), i); ++ if (NULL == (column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree), i))) ++ column = (gtk_tree_view_get_columns (GTK_TREE_VIEW (tree)))->data; + gtk_tree_view_column_set_visible (column, visible); + if (width > 0) + gtk_tree_view_column_set_fixed_width (column, width); diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.0.5.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.0.5.ebuild index 1431147fa724..665362f0f072 100644 --- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.0.5.ebuild +++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.0.5.ebuild,v 1.1 2003/06/20 14:54:57 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.0.5.ebuild,v 1.2 2003/06/29 13:09:39 azarah Exp $ inherit gnome2 eutils @@ -29,6 +29,9 @@ DOCS="AUTHORS ChangeLog COPYING HACKING README INSTALL NEWS TODO" src_unpack() { unpack ${A} + + # Fix a crash at startup - <azarah@gentoo.org> 29 Jun 2003 + cd ${S}; epatch ${FILESDIR}/${P}-fix-startup-crash.patch } # fix some possible problem patchrelated |