2010-02-01 14:32:49 +01:00
|
|
|
Index: gtk/main.c
|
|
|
|
===================================================================
|
|
|
|
--- gtk/main.c.orig
|
2008-11-28 12:18:20 +01:00
|
|
|
+++ gtk/main.c
|
2010-11-10 16:42:35 +01:00
|
|
|
@@ -1417,13 +1417,13 @@ set_display_filename(capture_file *cf)
|
2010-05-14 13:34:21 +02:00
|
|
|
}
|
2008-11-28 12:18:20 +01:00
|
|
|
|
|
|
|
GtkWidget *close_dlg = NULL;
|
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);
|
|
|
|
}
|
|
|
|
-
|
|
|
|
+*/
|
2008-11-28 12:18:20 +01:00
|
|
|
#ifdef _WIN32
|
|
|
|
static void
|
2010-05-14 13:34:21 +02:00
|
|
|
npf_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
|
2010-12-08 18:31:25 +01:00
|
|
|
@@ -1993,9 +1993,10 @@ check_and_warn_user_startup(gchar *cf_na
|
2010-05-14 13:34:21 +02:00
|
|
|
#endif
|
|
|
|
{
|
|
|
|
gchar *cur_user, *cur_group;
|
2009-06-17 15:51:24 +02:00
|
|
|
- gpointer priv_warning_dialog;
|
|
|
|
+// gpointer priv_warning_dialog;
|
2008-11-28 12:18:20 +01:00
|
|
|
|
|
|
|
/* Tell the user not to run as root. */
|
2010-05-14 13:34:21 +02:00
|
|
|
+/*
|
|
|
|
if (running_with_special_privs() && recent.privs_warn_if_elevated) {
|
|
|
|
cur_user = get_cur_username();
|
|
|
|
cur_group = get_cur_groupname();
|
2010-12-08 18:31:25 +01:00
|
|
|
@@ -2007,7 +2008,7 @@ check_and_warn_user_startup(gchar *cf_na
|
2010-05-14 13:34:21 +02:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
-
|
|
|
|
+*/
|
2008-11-28 12:18:20 +01:00
|
|
|
#ifdef _WIN32
|
|
|
|
/* Warn the user if npf.sys isn't loaded. */
|
2010-05-14 13:34:21 +02:00
|
|
|
if (!stdin_capture && !cf_name && !npf_sys_is_running() && recent.privs_warn_if_no_npf && get_os_major_version() >= 6) {
|