2014-08-14 00:18:19 +02:00
|
|
|
---
|
|
|
|
ui/gtk/main.c | 6 +++++-
|
|
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
Index: wireshark-1.12.0/ui/gtk/main.c
|
2012-06-23 15:53:46 +02:00
|
|
|
===================================================================
|
2014-08-14 00:18:19 +02:00
|
|
|
--- wireshark-1.12.0.orig/ui/gtk/main.c 2014-08-04 23:46:11.000000000 +0100
|
|
|
|
+++ wireshark-1.12.0/ui/gtk/main.c 2014-08-04 23:51:21.000000000 +0100
|
|
|
|
@@ -1378,11 +1378,13 @@ main_colorize_changed(gboolean packet_li
|
2011-11-04 23:54:00 +01:00
|
|
|
|
|
|
|
static GtkWidget *close_dlg = NULL;
|
2008-11-28 12:18:20 +01:00
|
|
|
|
2010-05-14 13:34:21 +02:00
|
|
|
+/*
|
|
|
|
static void
|
|
|
|
priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
|
|
|
|
{
|
|
|
|
recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog);
|
|
|
|
}
|
|
|
|
+*/
|
2011-11-04 23:54:00 +01:00
|
|
|
|
2008-11-28 12:18:20 +01:00
|
|
|
#ifdef _WIN32
|
|
|
|
static void
|
2014-08-14 00:18:19 +02:00
|
|
|
@@ -2074,9 +2076,10 @@ check_and_warn_user_startup(gchar *cf_na
|
2010-05-14 13:34:21 +02:00
|
|
|
#endif
|
|
|
|
{
|
2014-08-14 00:18:19 +02:00
|
|
|
gchar *cur_user, *cur_group;
|
|
|
|
- gpointer priv_warning_dialog;
|
|
|
|
+// gpointer priv_warning_dialog;
|
2008-11-28 12:18:20 +01:00
|
|
|
|
2014-08-14 00:18:19 +02:00
|
|
|
/* Tell the user not to run as root. */
|
2010-05-14 13:34:21 +02:00
|
|
|
+/*
|
2014-08-14 00:18:19 +02:00
|
|
|
if (running_with_special_privs() && recent.privs_warn_if_elevated) {
|
|
|
|
cur_user = get_cur_username();
|
|
|
|
cur_group = get_cur_groupname();
|
|
|
|
@@ -2091,6 +2094,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);
|
|
|
|
}
|
2010-05-14 13:34:21 +02:00
|
|
|
+*/
|
2011-11-04 23:54:00 +01:00
|
|
|
|
2008-11-28 12:18:20 +01:00
|
|
|
#ifdef _WIN32
|
2014-08-14 00:18:19 +02:00
|
|
|
/* Warn the user if npf.sys isn't loaded. */
|