rpms/gnome-system-monitor/F-11 gnome-system-monitor-2.25.91-polkit.patch, 1.2, 1.3
Matthias Clasen
mclasen at fedoraproject.org
Thu Apr 23 19:03:37 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-system-monitor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7868
Modified Files:
gnome-system-monitor-2.25.91-polkit.patch
Log Message:
fix patch mixup
gnome-system-monitor-2.25.91-polkit.patch:
Index: gnome-system-monitor-2.25.91-polkit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/F-11/gnome-system-monitor-2.25.91-polkit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-system-monitor-2.25.91-polkit.patch 23 Apr 2009 18:52:14 -0000 1.2
+++ gnome-system-monitor-2.25.91-polkit.patch 23 Apr 2009 19:03:07 -0000 1.3
@@ -1,6 +1,6 @@
diff -up gnome-system-monitor-2.26.1/configure.in.polkit gnome-system-monitor-2.26.1/configure.in
--- gnome-system-monitor-2.26.1/configure.in.polkit 2009-04-10 18:33:14.000000000 -0400
-+++ gnome-system-monitor-2.26.1/configure.in 2009-04-23 14:37:53.528524725 -0400
++++ gnome-system-monitor-2.26.1/configure.in 2009-04-23 15:01:02.779508852 -0400
@@ -35,10 +35,41 @@ GIOMM_REQUIRED=2.16.0
GLIBMM_REQUIRED=2.14
LIBXML_REQUIRED=2.0
@@ -56,7 +56,7 @@
"
diff -up gnome-system-monitor-2.26.1/po/POTFILES.in.polkit gnome-system-monitor-2.26.1/po/POTFILES.in
--- gnome-system-monitor-2.26.1/po/POTFILES.in.polkit 2009-04-13 15:36:22.000000000 -0400
-+++ gnome-system-monitor-2.26.1/po/POTFILES.in 2009-04-23 14:37:53.528524725 -0400
++++ gnome-system-monitor-2.26.1/po/POTFILES.in 2009-04-23 15:01:02.779508852 -0400
@@ -8,6 +8,7 @@ src/callbacks.cpp
src/defaulttable.h
src/disks.cpp
@@ -67,7 +67,7 @@
src/interface.cpp
diff -up gnome-system-monitor-2.26.1/src/callbacks.cpp.polkit gnome-system-monitor-2.26.1/src/callbacks.cpp
--- gnome-system-monitor-2.26.1/src/callbacks.cpp.polkit 2009-01-20 16:00:27.000000000 -0500
-+++ gnome-system-monitor-2.26.1/src/callbacks.cpp 2009-04-23 14:47:33.698496775 -0400
++++ gnome-system-monitor-2.26.1/src/callbacks.cpp 2009-04-23 15:01:24.243745907 -0400
@@ -210,11 +210,13 @@ cb_app_delete (GtkWidget *window, GdkEve
@@ -92,7 +92,7 @@
** no selected processes
diff -up /dev/null gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.c
--- /dev/null 2009-04-23 10:50:49.279044520 -0400
-+++ gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.c 2009-04-23 14:37:53.530531638 -0400
++++ gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.c 2009-04-23 15:01:02.782492856 -0400
@@ -0,0 +1,640 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -736,7 +736,7 @@
+}
diff -up /dev/null gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.xml
--- /dev/null 2009-04-23 10:50:49.279044520 -0400
-+++ gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.xml 2009-04-23 14:37:53.531498182 -0400
++++ gnome-system-monitor-2.26.1/src/gnome-system-monitor-mechanism.xml 2009-04-23 15:01:02.782492856 -0400
@@ -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">
+<node name="/">
@@ -755,7 +755,7 @@
+</node>
diff -up gnome-system-monitor-2.26.1/src/interface.cpp.polkit gnome-system-monitor-2.26.1/src/interface.cpp
--- gnome-system-monitor-2.26.1/src/interface.cpp.polkit 2009-04-10 18:33:14.000000000 -0400
-+++ gnome-system-monitor-2.26.1/src/interface.cpp 2009-04-23 14:45:39.237496203 -0400
++++ gnome-system-monitor-2.26.1/src/interface.cpp 2009-04-23 15:02:01.567746154 -0400
@@ -30,6 +30,10 @@
#include <gdk/gdkkeysyms.h>
#include <math.h>
@@ -853,11 +853,10 @@
/* create the main notebook */
procdata->notebook = notebook = gtk_notebook_new ();
gtk_box_pack_start (GTK_BOX (main_box),
-@@ -774,11 +822,14 @@ update_sensitivity(ProcData *data)
+@@ -774,23 +822,53 @@ update_sensitivity(ProcData *data)
processes_sensitivity = (data->config.current_tab == PROCMAN_TAB_PROCESSES);
selected_sensitivity = (processes_sensitivity && data->selected_process != NULL);
-+ g_print ("update sensitivity: processes %d selected %d\n", processes_sensitivity, selected_sensitivity);
+#ifndef HAVE_POLKIT
if(data->endprocessbutton) {
/* avoid error on startup if endprocessbutton
@@ -868,7 +867,11 @@
for (i = 0; i != G_N_ELEMENTS(processes_actions); ++i) {
action = gtk_action_group_get_action(data->action_group,
-@@ -789,8 +840,36 @@ update_sensitivity(ProcData *data)
+ processes_actions[i]);
+- gtk_action_set_sensitive(action, processes_sensitivity);
++ gtk_action_set_sensitive(action, selected_sensitivity);
+ }
+
for (i = 0; i != G_N_ELEMENTS(selected_actions); ++i) {
action = gtk_action_group_get_action(data->action_group,
selected_actions[i]);
@@ -907,7 +910,7 @@
static void
diff -up gnome-system-monitor-2.26.1/src/Makefile.am.polkit gnome-system-monitor-2.26.1/src/Makefile.am
--- gnome-system-monitor-2.26.1/src/Makefile.am.polkit 2008-08-08 15:55:59.000000000 -0400
-+++ gnome-system-monitor-2.26.1/src/Makefile.am 2009-04-23 14:37:53.545493980 -0400
++++ gnome-system-monitor-2.26.1/src/Makefile.am 2009-04-23 15:01:02.784504169 -0400
@@ -4,7 +4,9 @@ INCLUDES = \
-DPROCMAN_DATADIR=\""$(datadir)/procman/"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
@@ -919,13 +922,9 @@
bin_PROGRAMS = gnome-system-monitor
-@@ -33,10 +35,14 @@ gnome_system_monitor_SOURCES = \
- gconf-keys.cpp gconf-keys.h \
- iconthemewrapper.cpp iconthemewrapper.h \
+@@ -35,8 +37,11 @@ gnome_system_monitor_SOURCES = \
e_date.c e_date.h \
-- gsm_color_button.c gsm_color_button.h
-+ gsm_color_button.c gsm_color_button.h \
-+ gsm-session-manager.c gsm-session-manager.h
+ gsm_color_button.c gsm_color_button.h
+if HAVE_POLKIT
+gnome_system_monitor_SOURCES += gnome-system-monitor-mechanism-client-glue.h
@@ -936,7 +935,7 @@
noinst_LTLIBRARIES = libbacon.la
-@@ -52,8 +58,44 @@ schema_ins = gnome-system-monitor.schem
+@@ -52,8 +57,44 @@ schema_ins = gnome-system-monitor.schem
schema_DATA = $(schema_ins:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
@@ -984,7 +983,7 @@
$(schema_DATA)
diff -up /dev/null gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.conf
--- /dev/null 2009-04-23 10:50:49.279044520 -0400
-+++ gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.conf 2009-04-23 14:37:53.534493361 -0400
++++ gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.conf 2009-04-23 15:01:02.786494180 -0400
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
@@ -999,7 +998,7 @@
+</busconfig>
diff -up /dev/null gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.service.in
--- /dev/null 2009-04-23 10:50:49.279044520 -0400
-+++ gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.service.in 2009-04-23 14:37:53.534493361 -0400
++++ gnome-system-monitor-2.26.1/src/org.gnome.SystemMonitor.Mechanism.service.in 2009-04-23 15:01:02.786494180 -0400
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.gnome.SystemMonitor.Mechanism
@@ -1007,7 +1006,7 @@
+User=root
diff -up /dev/null gnome-system-monitor-2.26.1/src/org.gnome.system-monitor.policy.in
--- /dev/null 2009-04-23 10:50:49.279044520 -0400
-+++ gnome-system-monitor-2.26.1/src/org.gnome.system-monitor.policy.in 2009-04-23 14:37:53.535525627 -0400
++++ gnome-system-monitor-2.26.1/src/org.gnome.system-monitor.policy.in 2009-04-23 15:01:02.787520999 -0400
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+
@@ -1061,7 +1060,7 @@
+</policyconfig>
diff -up gnome-system-monitor-2.26.1/src/procactions.cpp.polkit gnome-system-monitor-2.26.1/src/procactions.cpp
--- gnome-system-monitor-2.26.1/src/procactions.cpp.polkit 2007-01-02 17:15:36.000000000 -0500
-+++ gnome-system-monitor-2.26.1/src/procactions.cpp 2009-04-23 14:37:53.536494477 -0400
++++ gnome-system-monitor-2.26.1/src/procactions.cpp 2009-04-23 15:01:02.788493760 -0400
@@ -31,6 +31,10 @@
#include "procdialogs.h"
#include "callbacks.h"
@@ -1176,7 +1175,7 @@
+
diff -up gnome-system-monitor-2.26.1/src/procdialogs.cpp.polkit gnome-system-monitor-2.26.1/src/procdialogs.cpp
--- gnome-system-monitor-2.26.1/src/procdialogs.cpp.polkit 2008-05-23 17:44:00.000000000 -0400
-+++ gnome-system-monitor-2.26.1/src/procdialogs.cpp 2009-04-23 14:37:53.537493707 -0400
++++ gnome-system-monitor-2.26.1/src/procdialogs.cpp 2009-04-23 15:01:02.789493899 -0400
@@ -35,6 +35,11 @@
#include "procman_gnomesu.h"
#include "procman_gksu.h"
@@ -1372,7 +1371,7 @@
static void
diff -up gnome-system-monitor-2.26.1/src/procman.cpp.polkit gnome-system-monitor-2.26.1/src/procman.cpp
--- gnome-system-monitor-2.26.1/src/procman.cpp.polkit 2009-03-31 17:57:18.000000000 -0400
-+++ gnome-system-monitor-2.26.1/src/procman.cpp 2009-04-23 14:37:53.538493287 -0400
++++ gnome-system-monitor-2.26.1/src/procman.cpp 2009-04-23 15:01:02.790494038 -0400
@@ -36,6 +36,10 @@
#include <glibtop/close.h>
#include <glibtop/loadavg.h>
@@ -1422,7 +1421,7 @@
ProcData* ProcData::get_instance()
diff -up gnome-system-monitor-2.26.1/src/procman.h.polkit gnome-system-monitor-2.26.1/src/procman.h
--- gnome-system-monitor-2.26.1/src/procman.h.polkit 2009-01-20 15:53:35.000000000 -0500
-+++ gnome-system-monitor-2.26.1/src/procman.h 2009-04-23 14:37:53.538493287 -0400
++++ gnome-system-monitor-2.26.1/src/procman.h 2009-04-23 15:01:02.791493688 -0400
@@ -33,6 +33,11 @@
#include <map>
#include <string>
More information about the fedora-extras-commits
mailing list