rpms/ethereal/devel ethereal-gtk-dialog.patch, NONE, 1.1 ethereal.spec, 1.62, 1.63
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 2 12:32:09 UTC 2006
Author: rvokal
Update of /cvs/dist/rpms/ethereal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15515
Modified Files:
ethereal.spec
Added Files:
ethereal-gtk-dialog.patch
Log Message:
- rebuilt against new net-snmp-5.3
- gtk dialog bug (#156568)
ethereal-gtk-dialog.patch:
dcerpc_stat.c | 5 +++--
expert_comp_dlg.c | 2 +-
file_dlg.c | 8 +++++---
filter_dlg.c | 17 +++++++++++++----
filter_dlg.h | 4 +++-
find_dlg.c | 5 +++--
io_stat.c | 3 ++-
main.c | 5 +++--
tap_dfilter_dlg.c | 3 ++-
9 files changed, 35 insertions(+), 17 deletions(-)
--- NEW FILE ethereal-gtk-dialog.patch ---
Bugzilla Bug 156568 – "Display Filter" dialog cannot receive input
diff -rdu gtk/dcerpc_stat.c gtk.2/dcerpc_stat.c
--- gtk/dcerpc_stat.c 2005-12-27 03:20:26.000000000 +0100
+++ gtk.2/dcerpc_stat.c 2006-01-02 02:12:46.000000000 +0100
@@ -1,7 +1,7 @@
/* dcerpc_stat.c
* dcerpc_stat 2002 Ronnie Sahlberg
*
- * $Id: dcerpc_stat.c 15793 2005-09-14 08:59:41Z guy $
+ * $Id: dcerpc_stat.c 16926 2005-12-31 17:09:27Z ulfl $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald at ethereal.com>
@@ -550,7 +550,8 @@
static construct_args_t args = {
"Service Response Time Statistics Filter",
FALSE,
- FALSE
+ FALSE,
+ FALSE
};
/* if the window is already open, bring it to front and
diff -rdu gtk/expert_comp_dlg.c gtk.2/expert_comp_dlg.c
--- gtk/expert_comp_dlg.c 2005-12-27 18:17:10.000000000 +0100
+++ gtk.2/expert_comp_dlg.c 2006-01-02 02:12:42.000000000 +0100
@@ -1,7 +1,7 @@
/* expert_comp_dlg.c
* expert_comp_dlg 2005 Greg Morris
*
- * $Id: expert_comp_dlg.c 16904 2005-12-27 17:17:03Z gerald $
+ * $Id: expert_comp_dlg.c 16889 2005-12-23 10:55:05Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald at ethereal.com>
diff -rdu gtk/file_dlg.c gtk.2/file_dlg.c
--- gtk/file_dlg.c 2005-12-27 03:20:25.000000000 +0100
+++ gtk.2/file_dlg.c 2006-01-02 02:12:38.000000000 +0100
@@ -1,7 +1,7 @@
/* file_dlg.c
* Dialog boxes for handling files
*
- * $Id: file_dlg.c 16403 2005-11-06 22:43:25Z ulfl $
+ * $Id: file_dlg.c 16926 2005-12-31 17:09:27Z ulfl $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald at ethereal.com>
@@ -431,7 +431,8 @@
static construct_args_t args = {
"Ethereal: Read Filter",
FALSE,
- FALSE
+ FALSE,
+ TRUE
};
if (file_open_w != NULL) {
@@ -760,7 +761,8 @@
static construct_args_t args = {
"Ethereal: Read Filter",
FALSE,
- FALSE
+ FALSE,
+ TRUE
};
if (file_merge_w != NULL) {
diff -rdu gtk/filter_dlg.c gtk.2/filter_dlg.c
--- gtk/filter_dlg.c 2005-12-27 03:20:26.000000000 +0100
+++ gtk.2/filter_dlg.c 2006-01-02 02:12:52.000000000 +0100
@@ -1,7 +1,7 @@
/* filter_dlg.c
* Dialog boxes for (display and capture) filter editing
*
- * $Id: filter_dlg.c 15465 2005-08-20 12:09:48Z ulfl $
+ * $Id: filter_dlg.c 16926 2005-12-31 17:09:27Z ulfl $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald at ethereal.com>
@@ -105,7 +105,8 @@
static construct_args_t args = {
"Ethereal: Capture Filter",
FALSE,
- FALSE
+ FALSE,
+ FALSE
};
/* Has a filter dialog box already been opened for that button? */
@@ -194,7 +195,8 @@
static construct_args_t args = {
"Ethereal: Capture Filter",
FALSE,
- FALSE
+ FALSE,
+ FALSE
};
/* Has a filter dialog box already been opened for editing
@@ -222,7 +224,8 @@
static construct_args_t args = {
"Ethereal: Display Filter",
TRUE,
- TRUE
+ TRUE,
+ FALSE
};
display_filter_construct_cb(OBJECT_GET_DATA(top_level, E_FILT_BT_PTR_KEY), &args);
@@ -362,6 +365,12 @@
gtk_window_set_default_size(GTK_WINDOW(main_w), 400, 400);
OBJECT_SET_DATA(main_w, E_FILT_CONSTRUCT_ARGS_KEY, construct_args);
+ if(construct_args->modal_and_transient) {
+ GdkWindow* parent = gtk_widget_get_parent_window(parent_filter_te);
+ gtk_window_set_transient_for(GTK_WINDOW(main_w), GTK_WINDOW(parent));
+ gtk_window_set_modal(GTK_WINDOW(main_w), TRUE);
+ }
+
main_vb = gtk_vbox_new(FALSE, 0);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
gtk_container_add(GTK_CONTAINER(main_w), main_vb);
diff -rdu gtk/filter_dlg.h gtk.2/filter_dlg.h
--- gtk/filter_dlg.h 2005-12-27 03:20:26.000000000 +0100
+++ gtk.2/filter_dlg.h 2006-01-02 02:12:52.000000000 +0100
@@ -1,7 +1,7 @@
/* filter_dlg.h
* Definitions for dialog boxes for filter editing
*
- * $Id: filter_dlg.h 16403 2005-11-06 22:43:25Z ulfl $
+ * $Id: filter_dlg.h 16926 2005-12-31 17:09:27Z ulfl $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald at ethereal.com>
@@ -41,6 +41,8 @@
gboolean wants_apply_button; /**< dialog should have an Apply button */
gboolean activate_on_ok; /**< if parent text widget should be
activated on "Ok" or "Apply" */
+ gboolean modal_and_transient; /**< dialog is modal and transient to the
+ parent window (e.g. to gtk_file_chooser) */
} construct_args_t;
/** Create a "Capture Filter" dialog box caused by a button click.
diff -rdu gtk/find_dlg.c gtk.2/find_dlg.c
--- gtk/find_dlg.c 2005-12-27 03:20:25.000000000 +0100
+++ gtk.2/find_dlg.c 2006-01-02 02:12:39.000000000 +0100
@@ -1,7 +1,7 @@
/* find_dlg.c
* Routines for "find frame" window
*
- * $Id: find_dlg.c 15465 2005-08-20 12:09:48Z ulfl $
+ * $Id: find_dlg.c 16926 2005-12-31 17:09:27Z ulfl $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald at ethereal.com>
@@ -125,7 +125,8 @@
static construct_args_t args = {
"Ethereal: Search Filter",
FALSE,
- TRUE
+ TRUE,
+ FALSE
};
if (find_frame_w != NULL) {
diff -rdu gtk/io_stat.c gtk.2/io_stat.c
--- gtk/io_stat.c 2005-12-27 03:20:26.000000000 +0100
+++ gtk.2/io_stat.c 2006-01-02 02:12:50.000000000 +0100
@@ -1,7 +1,7 @@
/* io_stat.c
* io_stat 2002 Ronnie Sahlberg
*
- * $Id: io_stat.c 16346 2005-10-27 19:42:24Z guy $
+ * $Id: io_stat.c 16926 2005-12-31 17:09:27Z ulfl $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald at ethereal.com>
@@ -1085,6 +1085,7 @@
io->graphs[i].args->title = NULL;
io->graphs[i].args->wants_apply_button=TRUE;
io->graphs[i].args->activate_on_ok=TRUE;
+ io->graphs[i].args->modal_and_transient=FALSE;
io->graphs[i].filter_bt=NULL;
}
diff -rdu gtk/main.c gtk.2/main.c
--- gtk/main.c 2005-12-27 03:20:26.000000000 +0100
+++ gtk.2/main.c 2006-01-02 02:12:45.000000000 +0100
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c 16870 2005-12-21 08:59:52Z guy $
+ * $Id: main.c 16926 2005-12-31 17:09:27Z ulfl $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald at ethereal.com>
@@ -3273,7 +3273,8 @@
static construct_args_t args = {
"Ethereal: Display Filter",
TRUE,
- TRUE
+ TRUE,
+ FALSE
};
/* use user-defined title if preference is set */
diff -rdu gtk/tap_dfilter_dlg.c gtk.2/tap_dfilter_dlg.c
--- gtk/tap_dfilter_dlg.c 2005-12-27 03:20:25.000000000 +0100
+++ gtk.2/tap_dfilter_dlg.c 2006-01-02 02:12:39.000000000 +0100
@@ -2,7 +2,7 @@
* Routines for display filter dialog used by gui taps
* Copyright 2003 Lars Roland
*
- * $Id: tap_dfilter_dlg.c 15501 2005-08-21 19:24:11Z guy $
+ * $Id: tap_dfilter_dlg.c 16926 2005-12-31 17:09:27Z ulfl $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald at ethereal.com>
@@ -160,6 +160,7 @@
end_dlg_list->args.title = g_strdup_printf("%s Filter", dlg_data->win_title);
end_dlg_list->args.wants_apply_button = TRUE;
end_dlg_list->args.activate_on_ok = FALSE;
+ end_dlg_list->args.modal_and_transient = FALSE;
end_dlg_list->next = NULL;
dlg_data->index = end_dlg_list->cont.index;
current_dlg = end_dlg_list;
Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ethereal.spec 29 Dec 2005 11:10:40 -0000 1.62
+++ ethereal.spec 2 Jan 2006 12:32:06 -0000 1.63
@@ -4,7 +4,7 @@
Summary: Network traffic analyzer
Name: ethereal
Version: 0.10.14
-Release: 1
+Release: 2
License: GPL
Group: Applications/Internet
Source0: http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
@@ -12,14 +12,15 @@
Source2: ethereal.console
Source3: ethereal.desktop
Source4: ethereal.png
-Patch4: ethereal-0.10.13-pie.patch
+Patch1: ethereal-0.10.13-pie.patch
+Patch2: ethereal-gtk-dialog.patch
Url: http://www.ethereal.com/
BuildRoot: %{_tmppath}/%{name}-root
Requires: libpcap >= 0.6
-Requires: net-snmp >= 5.2.2
+Requires: net-snmp >= 5.3
BuildRequires: libpcap >= 0.6
-BuildRequires: net-snmp-devel >= 5.0
-BuildRequires: net-snmp-utils >= 5.0
+BuildRequires: net-snmp-devel >= 5.3
+BuildRequires: net-snmp-utils >= 5.3
BuildRequires: zlib-devel, bzip2-devel
BuildRequires: openssl-devel
BuildRequires: glib2-devel, gtk2-devel
@@ -49,7 +50,8 @@
%prep
%setup -q -n %{name}-%{version}
-%patch4 -p1 -b .pie
+%patch1 -p1 -b .pie
+%patch2 -p0 -b .gtk
%build
%ifarch s390 s390x
@@ -159,6 +161,10 @@
%changelog
+* Mon Jan 02 2006 Radek Vokal <rvokal at redhat.com> 0.10.14-2
+- rebuilt against new net-snmp-5.3
+- gtk dialog bug (#156568)
+
* Thu Dec 29 2005 Radek Vokal <rvokal at redhat.com> 0.10.14-1
- update to 0.10.14
More information about the fedora-cvs-commits
mailing list