rpms/gnome-system-monitor
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix patch

Browse Source
This commit is contained in:
Matthias Clasen 2008-05-28 04:09:34 +00:00
parent d66b2c336c
commit 579cc436c1
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gnome-system-monitor-2.23.2-polkit.patch
View File

@ -1,6 +1,6 @@
diff -up gnome-system-monitor-2.23.2/configure.in.polkit gnome-system-monitor-2.23.2/configure.in 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.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 @@ -33,10 +33,42 @@ GTKMM_REQUIRED=2.8
GIOMM_REQUIRED=2.16.0 GIOMM_REQUIRED=2.16.0
GLIBMM_REQUIRED=2.14 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 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.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 @@ -8,6 +8,7 @@ src/callbacks.cpp
src/defaulttable.h src/defaulttable.h
src/disks.cpp 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 src/interface.cpp
diff -up gnome-system-monitor-2.23.2/src/callbacks.cpp.polkit gnome-system-monitor-2.23.2/src/callbacks.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.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 @@ @@ -37,25 +37,21 @@
#include "disks.h" #include "disks.h"
#include "lsof.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, 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 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 --- /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 @@ @@ -0,0 +1,640 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +/* -*- 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 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 --- /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 @@ @@ -0,0 +1,15 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/"> +<node name="/">
@ -773,7 +773,7 @@ diff -up /dev/null gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanis
+</node> +</node>
diff -up gnome-system-monitor-2.23.2/src/interface.cpp.polkit gnome-system-monitor-2.23.2/src/interface.cpp 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.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 @@ @@ -30,6 +30,10 @@
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <math.h> #include <math.h>
@ -929,7 +929,7 @@ diff -up gnome-system-monitor-2.23.2/src/interface.cpp.polkit gnome-system-monit
static void static void
diff -up gnome-system-monitor-2.23.2/src/Makefile.am.polkit gnome-system-monitor-2.23.2/src/Makefile.am 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.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 = \ @@ -4,7 +4,9 @@ INCLUDES = \
-DPROCMAN_DATADIR=\""$(datadir)/procman/"\" \ -DPROCMAN_DATADIR=\""$(datadir)/procman/"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
@ -1002,7 +1002,7 @@ diff -up gnome-system-monitor-2.23.2/src/Makefile.am.polkit gnome-system-monitor
$(schema_DATA) $(schema_DATA)
diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mechanism.conf 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 --- /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 @@ @@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- --> +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+ +
@ -1017,7 +1017,7 @@ diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mecha
+</busconfig> +</busconfig>
diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mechanism.service.in 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 --- /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 @@ @@ -0,0 +1,4 @@
+[D-BUS Service] +[D-BUS Service]
+Name=org.gnome.SystemMonitor.Mechanism +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 +User=root
diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.system-monitor.policy.in 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 --- /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 @@ @@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?>
+ +
@ -1079,7 +1079,7 @@ diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.system-monitor.poli
+</policyconfig> +</policyconfig>
diff -up gnome-system-monitor-2.23.2/src/procactions.cpp.polkit gnome-system-monitor-2.23.2/src/procactions.cpp 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.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 @@ @@ -31,6 +31,10 @@
#include "procdialogs.h" #include "procdialogs.h"
#include "callbacks.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 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.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 @@ @@ -35,6 +35,11 @@
#include "procman_gnomesu.h" #include "procman_gnomesu.h"
#include "procman_gksu.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 static void
diff -up gnome-system-monitor-2.23.2/src/procman.cpp.polkit gnome-system-monitor-2.23.2/src/procman.cpp 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.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 @@ @@ -34,6 +34,10 @@
#include <glibtop/close.h> #include <glibtop/close.h>
#include <glibtop/loadavg.h> #include <glibtop/loadavg.h>
@ -1440,7 +1440,7 @@ diff -up gnome-system-monitor-2.23.2/src/procman.cpp.polkit gnome-system-monitor
ProcData* ProcData::get_instance() 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 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.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 @@ @@ -33,6 +33,11 @@
#include <map> #include <map>
#include <string> #include <string>
@ -1453,9 +1453,9 @@ diff -up gnome-system-monitor-2.23.2/src/procman.h.polkit gnome-system-monitor-2
struct ProcInfo; struct ProcInfo;
struct ProcData; struct ProcData;
struct LoadGraph; struct LoadGraph;
@@ -228,6 +233,18 @@ void procman_save_config (ProcData *dat @@ -211,6 +216,19 @@ struct ProcData
void procman_save_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix); GtkWidget *app;
gboolean procman_get_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix); GtkUIManager *menu;
+#ifdef HAVE_POLKIT +#ifdef HAVE_POLKIT
+ DBusGProxy *mechanism_proxy; + 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 *sigterm_action;
+ PolKitGnomeAction *sigkill_action; + PolKitGnomeAction *sigkill_action;
+#endif +#endif
+
unsigned frequency;
SmoothRefresh *smooth_refresh;
@@ -231,7 +249,6 @@ gboolean procman_get_tree_state (GConfCl
-
struct ReniceArgs
{
ProcData *procdata;