From 14672d41398a582c5f61a68303ee8aa9b04a071c Mon Sep 17 00:00:00 2001
From: Radek Vokál <rvokal@fedoraproject.org>
Date: May 07 2010 12:06:31 +0000
Subject: recreated disable_warning_dialog patch


---

diff --git a/wireshark-1.2.4-disable_warning_dialog.patch b/wireshark-1.2.4-disable_warning_dialog.patch
deleted file mode 100644
index bbf6a49..0000000
--- a/wireshark-1.2.4-disable_warning_dialog.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up wireshark-1.2.4/gtk/main.c.dialog wireshark-1.2.4/gtk/main.c
---- wireshark-1.2.4/gtk/main.c.dialog	2009-11-16 21:30:43.000000000 +0100
-+++ wireshark-1.2.4/gtk/main.c	2009-12-16 10:53:52.000000000 +0100
-@@ -1227,11 +1227,12 @@ set_display_filename(capture_file *cf)
- 
- GtkWidget           *close_dlg = NULL;
- 
--static void
-+/*static void
- priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
- {
-     recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog);
- }
-+*/
- 
- #ifdef _WIN32
- static void
-@@ -2559,7 +2560,7 @@ main(int argc, char *argv[])
-   main_load_window_geometry(top_level);
- 
-   /* Tell the user not to run as root. */
--  if (running_with_special_privs() && recent.privs_warn_if_elevated) {
-+/*  if (running_with_special_privs() && recent.privs_warn_if_elevated) {
-     cur_user = get_cur_username();
-     cur_group = get_cur_groupname();
-     priv_warning_dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
-@@ -2570,6 +2571,7 @@ main(int argc, char *argv[])
-     simple_dialog_check_set(priv_warning_dialog, "Don't show this message again.");
-     simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL);
-   }
-+*/
- 
- #ifdef _WIN32
-   /* Warn the user if npf.sys isn't loaded. */
diff --git a/wireshark-1.2.8-disable_warning_dialog.patch b/wireshark-1.2.8-disable_warning_dialog.patch
new file mode 100644
index 0000000..34d64c9
--- /dev/null
+++ b/wireshark-1.2.8-disable_warning_dialog.patch
@@ -0,0 +1,34 @@
+diff -up wireshark-1.2.8/gtk/main.c.dialog wireshark-1.2.8/gtk/main.c
+--- wireshark-1.2.8/gtk/main.c.dialog	2010-05-05 19:11:51.000000000 +0200
++++ wireshark-1.2.8/gtk/main.c	2010-05-07 11:08:23.995327341 +0200
+@@ -1247,11 +1247,12 @@ set_display_filename(capture_file *cf)
+ 
+ GtkWidget           *close_dlg = NULL;
+ 
+-static void
++/*static void
+ priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
+ {
+     recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog);
+ }
++*/
+ 
+ #ifdef _WIN32
+ static void
+@@ -1795,7 +1796,7 @@ check_and_warn_user_startup(gchar *cf_na
+   gpointer             priv_warning_dialog;
+ 
+   /* Tell the user not to run as root. */
+-  if (running_with_special_privs() && recent.privs_warn_if_elevated) {
++/*  if (running_with_special_privs() && recent.privs_warn_if_elevated) {
+     cur_user = get_cur_username();
+     cur_group = get_cur_groupname();
+     priv_warning_dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
+@@ -1806,6 +1807,7 @@ check_and_warn_user_startup(gchar *cf_na
+     simple_dialog_check_set(priv_warning_dialog, "Don't show this message again.");
+     simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL);
+   }
++*/
+ 
+ #ifdef _WIN32
+   /* Warn the user if npf.sys isn't loaded. */
diff --git a/wireshark.spec b/wireshark.spec
index 1fafa93..1e6c6cb 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -35,7 +35,7 @@ Patch3:		wireshark-0.99.7-path.patch
 Patch4:		wireshark-1.1.2-nfs41-backchnl-decode.patch
 Patch5:		wireshark-1.2.4-filter_null.patch
 Patch6:		wireshark-1.2.4-enable_lua.patch
-Patch7:		wireshark-1.2.4-disable_warning_dialog.patch
+Patch7:		wireshark-1.2.8-disable_warning_dialog.patch
 Patch8:		wireshark-1.2.6-nfs40-backchnl-decode.patch
 Patch9:		wireshark-1.2.6-smb-find-full-dir-info.patch
 Patch10:	wireshark-libtool-pie.patch
@@ -326,6 +326,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/idl2wrs
 
 %changelog
+* Fri May  7 2010 Radek Vokal <rvokal@redhat.com> - 1.2.8-3
+- fix patched applied without fuzz=0
+
 * Thu May  6 2010 Radek Vokal <rvokal@redhat.com> - 1.2.8-2
 - use sitearch instead of sitelib to avoid pyo and pyc conflicts