diff --git a/gnome-system-monitor-2.23.2-polkit.patch b/gnome-system-monitor-2.23.2-polkit.patch index 80af1a3..98f6f50 100644 --- a/gnome-system-monitor-2.23.2-polkit.patch +++ b/gnome-system-monitor-2.23.2-polkit.patch @@ -1,6 +1,6 @@ diff -up gnome-system-monitor-2.23.2/configure.in.polkit gnome-system-monitor-2.23.2/configure.in --- gnome-system-monitor-2.23.2/configure.in.polkit 2008-05-24 19:13:03.000000000 -0400 -+++ gnome-system-monitor-2.23.2/configure.in 2008-05-27 23:35:46.000000000 -0400 ++++ gnome-system-monitor-2.23.2/configure.in 2008-05-27 23:41:26.000000000 -0400 @@ -33,10 +33,42 @@ GTKMM_REQUIRED=2.8 GIOMM_REQUIRED=2.16.0 GLIBMM_REQUIRED=2.14 @@ -54,7 +54,7 @@ diff -up gnome-system-monitor-2.23.2/configure.in.polkit gnome-system-monitor-2. " diff -up gnome-system-monitor-2.23.2/po/POTFILES.in.polkit gnome-system-monitor-2.23.2/po/POTFILES.in --- gnome-system-monitor-2.23.2/po/POTFILES.in.polkit 2008-05-24 19:20:25.000000000 -0400 -+++ gnome-system-monitor-2.23.2/po/POTFILES.in 2008-05-27 23:29:00.000000000 -0400 ++++ gnome-system-monitor-2.23.2/po/POTFILES.in 2008-05-27 23:41:26.000000000 -0400 @@ -8,6 +8,7 @@ src/callbacks.cpp src/defaulttable.h src/disks.cpp @@ -65,7 +65,7 @@ diff -up gnome-system-monitor-2.23.2/po/POTFILES.in.polkit gnome-system-monitor- src/interface.cpp diff -up gnome-system-monitor-2.23.2/src/callbacks.cpp.polkit gnome-system-monitor-2.23.2/src/callbacks.cpp --- gnome-system-monitor-2.23.2/src/callbacks.cpp.polkit 2008-04-22 17:55:31.000000000 -0400 -+++ gnome-system-monitor-2.23.2/src/callbacks.cpp 2008-05-27 23:29:00.000000000 -0400 ++++ gnome-system-monitor-2.23.2/src/callbacks.cpp 2008-05-27 23:41:26.000000000 -0400 @@ -37,25 +37,21 @@ #include "disks.h" #include "lsof.h" @@ -110,7 +110,7 @@ diff -up gnome-system-monitor-2.23.2/src/callbacks.cpp.polkit gnome-system-monit static void change_gconf_color(GConfClient *client, const char *key, diff -up /dev/null gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanism.c --- /dev/null 2008-05-27 15:05:00.929008040 -0400 -+++ gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanism.c 2008-05-27 23:29:00.000000000 -0400 ++++ gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanism.c 2008-05-27 23:41:26.000000000 -0400 @@ -0,0 +1,640 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -754,7 +754,7 @@ diff -up /dev/null gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanis +} diff -up /dev/null gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanism.xml --- /dev/null 2008-05-27 15:05:00.929008040 -0400 -+++ gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanism.xml 2008-05-27 23:29:00.000000000 -0400 ++++ gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanism.xml 2008-05-27 23:41:26.000000000 -0400 @@ -0,0 +1,15 @@ + + @@ -773,7 +773,7 @@ diff -up /dev/null gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanis + diff -up gnome-system-monitor-2.23.2/src/interface.cpp.polkit gnome-system-monitor-2.23.2/src/interface.cpp --- gnome-system-monitor-2.23.2/src/interface.cpp.polkit 2008-02-25 14:30:29.000000000 -0500 -+++ gnome-system-monitor-2.23.2/src/interface.cpp 2008-05-27 23:29:00.000000000 -0400 ++++ gnome-system-monitor-2.23.2/src/interface.cpp 2008-05-27 23:41:26.000000000 -0400 @@ -30,6 +30,10 @@ #include #include @@ -929,7 +929,7 @@ diff -up gnome-system-monitor-2.23.2/src/interface.cpp.polkit gnome-system-monit static void diff -up gnome-system-monitor-2.23.2/src/Makefile.am.polkit gnome-system-monitor-2.23.2/src/Makefile.am --- gnome-system-monitor-2.23.2/src/Makefile.am.polkit 2008-03-18 17:37:00.000000000 -0400 -+++ gnome-system-monitor-2.23.2/src/Makefile.am 2008-05-27 23:29:00.000000000 -0400 ++++ gnome-system-monitor-2.23.2/src/Makefile.am 2008-05-27 23:41:26.000000000 -0400 @@ -4,7 +4,9 @@ INCLUDES = \ -DPROCMAN_DATADIR=\""$(datadir)/procman/"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ @@ -1002,7 +1002,7 @@ diff -up gnome-system-monitor-2.23.2/src/Makefile.am.polkit gnome-system-monitor $(schema_DATA) diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mechanism.conf --- /dev/null 2008-05-27 15:05:00.929008040 -0400 -+++ gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mechanism.conf 2008-05-27 23:29:00.000000000 -0400 ++++ gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mechanism.conf 2008-05-27 23:41:26.000000000 -0400 @@ -0,0 +1,11 @@ + + @@ -1017,7 +1017,7 @@ diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mecha + diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mechanism.service.in --- /dev/null 2008-05-27 15:05:00.929008040 -0400 -+++ gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mechanism.service.in 2008-05-27 23:29:00.000000000 -0400 ++++ gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mechanism.service.in 2008-05-27 23:41:26.000000000 -0400 @@ -0,0 +1,4 @@ +[D-BUS Service] +Name=org.gnome.SystemMonitor.Mechanism @@ -1025,7 +1025,7 @@ diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mecha +User=root diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.system-monitor.policy.in --- /dev/null 2008-05-27 15:05:00.929008040 -0400 -+++ gnome-system-monitor-2.23.2/src/org.gnome.system-monitor.policy.in 2008-05-27 23:29:00.000000000 -0400 ++++ gnome-system-monitor-2.23.2/src/org.gnome.system-monitor.policy.in 2008-05-27 23:41:26.000000000 -0400 @@ -0,0 +1,50 @@ + + @@ -1079,7 +1079,7 @@ diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.system-monitor.poli + diff -up gnome-system-monitor-2.23.2/src/procactions.cpp.polkit gnome-system-monitor-2.23.2/src/procactions.cpp --- gnome-system-monitor-2.23.2/src/procactions.cpp.polkit 2007-01-02 17:15:36.000000000 -0500 -+++ gnome-system-monitor-2.23.2/src/procactions.cpp 2008-05-27 23:29:00.000000000 -0400 ++++ gnome-system-monitor-2.23.2/src/procactions.cpp 2008-05-27 23:41:26.000000000 -0400 @@ -31,6 +31,10 @@ #include "procdialogs.h" #include "callbacks.h" @@ -1194,7 +1194,7 @@ diff -up gnome-system-monitor-2.23.2/src/procactions.cpp.polkit gnome-system-mon + diff -up gnome-system-monitor-2.23.2/src/procdialogs.cpp.polkit gnome-system-monitor-2.23.2/src/procdialogs.cpp --- gnome-system-monitor-2.23.2/src/procdialogs.cpp.polkit 2008-05-23 17:44:00.000000000 -0400 -+++ gnome-system-monitor-2.23.2/src/procdialogs.cpp 2008-05-27 23:29:00.000000000 -0400 ++++ gnome-system-monitor-2.23.2/src/procdialogs.cpp 2008-05-27 23:41:26.000000000 -0400 @@ -35,6 +35,11 @@ #include "procman_gnomesu.h" #include "procman_gksu.h" @@ -1390,7 +1390,7 @@ diff -up gnome-system-monitor-2.23.2/src/procdialogs.cpp.polkit gnome-system-mon static void diff -up gnome-system-monitor-2.23.2/src/procman.cpp.polkit gnome-system-monitor-2.23.2/src/procman.cpp --- gnome-system-monitor-2.23.2/src/procman.cpp.polkit 2008-05-23 17:44:00.000000000 -0400 -+++ gnome-system-monitor-2.23.2/src/procman.cpp 2008-05-27 23:29:00.000000000 -0400 ++++ gnome-system-monitor-2.23.2/src/procman.cpp 2008-05-27 23:41:26.000000000 -0400 @@ -34,6 +34,10 @@ #include #include @@ -1440,7 +1440,7 @@ diff -up gnome-system-monitor-2.23.2/src/procman.cpp.polkit gnome-system-monitor ProcData* ProcData::get_instance() diff -up gnome-system-monitor-2.23.2/src/procman.h.polkit gnome-system-monitor-2.23.2/src/procman.h --- gnome-system-monitor-2.23.2/src/procman.h.polkit 2008-05-24 17:58:27.000000000 -0400 -+++ gnome-system-monitor-2.23.2/src/procman.h 2008-05-27 23:33:45.000000000 -0400 ++++ gnome-system-monitor-2.23.2/src/procman.h 2008-05-28 00:08:43.000000000 -0400 @@ -33,6 +33,11 @@ #include #include @@ -1453,9 +1453,9 @@ diff -up gnome-system-monitor-2.23.2/src/procman.h.polkit gnome-system-monitor-2 struct ProcInfo; struct ProcData; struct LoadGraph; -@@ -228,6 +233,18 @@ void procman_save_config (ProcData *dat - void procman_save_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix); - gboolean procman_get_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix); +@@ -211,6 +216,19 @@ struct ProcData + GtkWidget *app; + GtkUIManager *menu; +#ifdef HAVE_POLKIT + DBusGProxy *mechanism_proxy; @@ -1469,6 +1469,15 @@ diff -up gnome-system-monitor-2.23.2/src/procman.h.polkit gnome-system-monitor-2 + PolKitGnomeAction *sigterm_action; + PolKitGnomeAction *sigkill_action; +#endif ++ + unsigned frequency; + + SmoothRefresh *smooth_refresh; +@@ -231,7 +249,6 @@ gboolean procman_get_tree_state (GConfCl +- + struct ReniceArgs + { + ProcData *procdata;