rpms/ethereal/devel ethereal-column.patch, NONE, 1.1 ethereal.spec, 1.68, 1.69
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 25 07:53:03 UTC 2006
Author: rvokal
Update of /cvs/dist/rpms/ethereal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27662
Modified Files:
ethereal.spec
Added Files:
ethereal-column.patch
Log Message:
- fix crash when tuning columns (#189428)
ethereal-column.patch:
column_prefs.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE ethereal-column.patch ---
--- ethereal-0.99.0-SVN-17918/gtk/column_prefs.c.old 2006-04-20 01:53:02.000000000 +0200
+++ ethereal-0.99.0-SVN-17918/gtk/column_prefs.c 2006-04-25 02:14:52.000000000 +0200
@@ -1,7 +1,7 @@
/* column_prefs.c
* Dialog box for column preferences
*
- * $Id: column_prefs.c 15465 2005-08-20 12:09:48Z ulfl $
+ * $Id: column_prefs.c 17983 2006-04-24 21:27:12Z jake $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald at ethereal.com>
@@ -638,6 +638,7 @@
return;
}
}
+ clp1 = g_list_find(prefs.col_list, cfmt);
gtk_tree_model_get(model, &iter2, 0, &title2, 1, &format2, 2,
&clp2, -1);
gtk_list_store_set(GTK_LIST_STORE(model), &iter2, 0, title1, 1,
@@ -645,7 +646,7 @@
gtk_list_store_set(GTK_LIST_STORE(model), &iter1, 0, title2, 1,
format2, 2, clp2, -1);
gtk_tree_selection_select_iter(sel, &iter2);
- /* clp1 = g_list_find(prefs.col_list, cfmt); */
+
column_set_arrow_button_sensitivity(clp1);
/* free strings read from the TreeModel */
Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ethereal.spec 20 Apr 2006 09:19:43 -0000 1.68
+++ ethereal.spec 25 Apr 2006 07:53:00 -0000 1.69
@@ -4,7 +4,7 @@
Summary: Network traffic analyzer
Name: ethereal
Version: 0.99.0
-Release: 0.svn.1
+Release: 0.svn.2
License: GPL
Group: Applications/Internet
Source0: http://www.ethereal.com/distribution/%{name}-%{version}-SVN-%{svn_version}.tar.gz
@@ -14,6 +14,7 @@
Source4: ethereal.png
Patch1: ethereal-0.10.13-pie.patch
Patch3: ethereal-0.10.14-nfsv4-opts.patch
+Patch4: ethereal-column.patch
Url: http://www.ethereal.com/
BuildRoot: %{_tmppath}/%{name}-root
Requires: libpcap >= 0.6
@@ -52,6 +53,8 @@
%setup -q -n %{name}-%{version}-SVN-%{svn_version}
%patch1 -p1 -b .pie
%patch3 -p1
+#fixed upstream
+%patch4 -p1 -b .column
%build
%ifarch s390 s390x
@@ -163,6 +166,9 @@
%changelog
+* Tue Apr 25 2006 Radek Vokál <rvokal at redhat.com> 0.99.0-0.svn.2
+- fix crash when tuning columns (#189428)
+
* Thu Apr 20 2006 Radek Vokál <rvokal at redhat.com> 0.99.0-0.svn.1
- 0.99.0 prerelease
More information about the fedora-cvs-commits
mailing list