rpms/gnome-system-monitor/F-11 gnome-system-monitor-2.25.91-polkit.patch, 1.1, 1.2 gnome-system-monitor.spec, 1.140, 1.141

Thu Apr 23 18:52:14 UTC 2009

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6412

Modified Files:
	gnome-system-monitor-2.25.91-polkit.patch 
	gnome-system-monitor.spec 
Log Message:
fix sensitivity of menu items


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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- gnome-system-monitor-2.25.91-polkit.patch	19 Feb 2009 06:06:57 -0000	1.1
+++ gnome-system-monitor-2.25.91-polkit.patch	23 Apr 2009 18:52:14 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up gnome-system-monitor-2.25.91/configure.in.polkit gnome-system-monitor-2.25.91/configure.in
---- gnome-system-monitor-2.25.91/configure.in.polkit	2009-02-16 13:07:36.000000000 -0500
-+++ gnome-system-monitor-2.25.91/configure.in	2009-02-19 01:04:23.775985963 -0500
+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
 @@ -35,10 +35,41 @@ GIOMM_REQUIRED=2.16.0
  GLIBMM_REQUIRED=2.14
  LIBXML_REQUIRED=2.0
@@ -54,9 +54,9 @@
  	Maintainer mode:	${USER_MAINTAINER_MODE}
  	Languages:		${ALL_LINGUAS}
  "
-diff -up gnome-system-monitor-2.25.91/po/POTFILES.in.polkit gnome-system-monitor-2.25.91/po/POTFILES.in
---- gnome-system-monitor-2.25.91/po/POTFILES.in.polkit	2009-02-16 13:36:20.000000000 -0500
-+++ gnome-system-monitor-2.25.91/po/POTFILES.in	2009-02-19 01:04:23.777985747 -0500
+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
 @@ -8,6 +8,7 @@ src/callbacks.cpp
  src/defaulttable.h
  src/disks.cpp
@@ -65,9 +65,9 @@
  src/gnome-system-monitor.schemas.in
  src/gsm_color_button.c
  src/interface.cpp
-diff -up gnome-system-monitor-2.25.91/src/callbacks.cpp.polkit gnome-system-monitor-2.25.91/src/callbacks.cpp
---- gnome-system-monitor-2.25.91/src/callbacks.cpp.polkit	2009-01-20 16:00:27.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/callbacks.cpp	2009-02-19 01:04:23.779986089 -0500
+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
 @@ -210,11 +210,13 @@ cb_app_delete (GtkWidget *window, GdkEve
  
  
@@ -82,9 +82,17 @@
  
  
  static void change_gconf_color(GConfClient *client, const char *key,
-diff -up /dev/null gnome-system-monitor-2.25.91/src/gnome-system-monitor-mechanism.c
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/gnome-system-monitor-mechanism.c	2009-02-19 01:04:23.785987256 -0500
+@@ -286,6 +288,7 @@ cb_row_selected (GtkTreeSelection *selec
+ 	ProcData * const procdata = static_cast<ProcData*>(data);
+ 
+ 	procdata->selection = selection;
++	procdata->selected_process = NULL;
+ 
+ 	/* get the most recent selected process and determine if there are
+ 	** 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
 @@ -0,0 +1,640 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -726,9 +734,9 @@
 +out:
 +        return ret;
 +}
-diff -up /dev/null gnome-system-monitor-2.25.91/src/gnome-system-monitor-mechanism.xml
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/gnome-system-monitor-mechanism.xml	2009-02-19 01:04:23.788989062 -0500
+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
 @@ -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="/">
@@ -745,9 +753,9 @@
 +    </method>
 +  </interface>
 +</node>
-diff -up gnome-system-monitor-2.25.91/src/interface.cpp.polkit gnome-system-monitor-2.25.91/src/interface.cpp
---- gnome-system-monitor-2.25.91/src/interface.cpp.polkit	2009-01-24 05:37:45.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/interface.cpp	2009-02-19 01:04:23.792990166 -0500
+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
 @@ -30,6 +30,10 @@
  #include <gdk/gdkkeysyms.h>
  #include <math.h>
@@ -845,10 +853,11 @@
  	/* create the main notebook */
  	procdata->notebook = notebook = gtk_notebook_new ();
    	gtk_box_pack_start (GTK_BOX (main_box), 
-@@ -774,23 +822,53 @@ update_sensitivity(ProcData *data)
+@@ -774,11 +822,14 @@ 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
@@ -859,23 +868,18 @@
  
  	for (i = 0; i != G_N_ELEMENTS(processes_actions); ++i) {
  		action = gtk_action_group_get_action(data->action_group,
- 						     processes_actions[i]);
--		gtk_action_set_sensitive(action, processes_sensitivity);
-+		gtk_action_set_sensitive(action, selected_sensitivity);
- 	}
- 
+@@ -789,8 +840,36 @@ update_sensitivity(ProcData *data)
  	for (i = 0; i != G_N_ELEMENTS(selected_actions); ++i) {
  		action = gtk_action_group_get_action(data->action_group,
  						     selected_actions[i]);
--		gtk_action_set_sensitive(action, selected_sensitivity);
 +#ifdef HAVE_POLKIT
 +                if (POLKIT_GNOME_IS_ACTION (action)) {
-+                        polkit_gnome_action_set_sensitive (POLKIT_GNOME_ACTION (action), processes_sensitivity);
++                        polkit_gnome_action_set_sensitive (POLKIT_GNOME_ACTION (action), selected_sensitivity);
 +                } else {
-+                        gtk_action_set_sensitive(action, processes_sensitivity);
++                        gtk_action_set_sensitive(action, selected_sensitivity);
 +                }
 +#else
-+		gtk_action_set_sensitive(action, processes_sensitivity);
+ 		gtk_action_set_sensitive(action, selected_sensitivity);
 +#endif
  	}
 +
@@ -901,9 +905,9 @@
  }
  
  static void		
-diff -up gnome-system-monitor-2.25.91/src/Makefile.am.polkit gnome-system-monitor-2.25.91/src/Makefile.am
---- gnome-system-monitor-2.25.91/src/Makefile.am.polkit	2008-08-08 15:55:59.000000000 -0400
-+++ gnome-system-monitor-2.25.91/src/Makefile.am	2009-02-19 01:04:23.800988043 -0500
+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
 @@ -4,7 +4,9 @@ INCLUDES = \
  	-DPROCMAN_DATADIR=\""$(datadir)/procman/"\" \
  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
@@ -915,9 +919,13 @@
  
  bin_PROGRAMS = gnome-system-monitor
  
-@@ -35,8 +37,11 @@ gnome_system_monitor_SOURCES = \
+@@ -33,10 +35,14 @@ gnome_system_monitor_SOURCES = \
+ 	gconf-keys.cpp gconf-keys.h \
+ 	iconthemewrapper.cpp iconthemewrapper.h \
  	e_date.c e_date.h \
-         gsm_color_button.c gsm_color_button.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
  
 +if HAVE_POLKIT
 +gnome_system_monitor_SOURCES += gnome-system-monitor-mechanism-client-glue.h
@@ -928,7 +936,7 @@
  
  
  noinst_LTLIBRARIES = libbacon.la
-@@ -52,8 +57,44 @@ schema_ins  = gnome-system-monitor.schem
+@@ -52,8 +58,44 @@ schema_ins  = gnome-system-monitor.schem
  schema_DATA = $(schema_ins:.schemas.in=.schemas)
  @INTLTOOL_SCHEMAS_RULE@
  
@@ -974,9 +982,9 @@
  
  CLEANFILES = \
  	$(schema_DATA)
-diff -up /dev/null gnome-system-monitor-2.25.91/src/org.gnome.SystemMonitor.Mechanism.conf
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/org.gnome.SystemMonitor.Mechanism.conf	2009-02-19 01:04:23.801989995 -0500
+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
 @@ -0,0 +1,11 @@
 +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
 +
@@ -989,17 +997,17 @@
 +    <allow own="org.gnome.SystemMonitor.Mechanism"/>
 +  </policy>
 +</busconfig>
-diff -up /dev/null gnome-system-monitor-2.25.91/src/org.gnome.SystemMonitor.Mechanism.service.in
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/org.gnome.SystemMonitor.Mechanism.service.in	2009-02-19 01:04:23.802984823 -0500
+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
 @@ -0,0 +1,4 @@
 +[D-BUS Service]
 +Name=org.gnome.SystemMonitor.Mechanism
 +Exec=libexecdir/gnome-system-monitor-mechanism
 +User=root
-diff -up /dev/null gnome-system-monitor-2.25.91/src/org.gnome.system-monitor.policy.in
---- /dev/null	2009-02-18 21:36:54.364015287 -0500
-+++ gnome-system-monitor-2.25.91/src/org.gnome.system-monitor.policy.in	2009-02-19 01:04:23.803984610 -0500
+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
 @@ -0,0 +1,50 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +
@@ -1051,9 +1059,9 @@
 +  </action>
 +  
 +</policyconfig>
-diff -up gnome-system-monitor-2.25.91/src/procactions.cpp.polkit gnome-system-monitor-2.25.91/src/procactions.cpp
---- gnome-system-monitor-2.25.91/src/procactions.cpp.polkit	2007-01-02 17:15:36.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/procactions.cpp	2009-02-19 01:04:23.804984817 -0500
+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
 @@ -31,6 +31,10 @@
  #include "procdialogs.h"
  #include "callbacks.h"
@@ -1166,9 +1174,9 @@
  	proctable_update_all (procdata);
  }
 +
-diff -up gnome-system-monitor-2.25.91/src/procdialogs.cpp.polkit gnome-system-monitor-2.25.91/src/procdialogs.cpp
---- gnome-system-monitor-2.25.91/src/procdialogs.cpp.polkit	2008-05-23 17:44:00.000000000 -0400
-+++ gnome-system-monitor-2.25.91/src/procdialogs.cpp	2009-02-19 01:04:23.805984464 -0500
+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
 @@ -35,6 +35,11 @@
  #include "procman_gnomesu.h"
  #include "procman_gksu.h"
@@ -1362,9 +1370,9 @@
  }
  
  static void
-diff -up gnome-system-monitor-2.25.91/src/procman.cpp.polkit gnome-system-monitor-2.25.91/src/procman.cpp
---- gnome-system-monitor-2.25.91/src/procman.cpp.polkit	2009-01-03 07:06:10.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/procman.cpp	2009-02-19 01:04:23.807984667 -0500
+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
 @@ -36,6 +36,10 @@
  #include <glibtop/close.h>
  #include <glibtop/loadavg.h>
@@ -1412,9 +1420,9 @@
  
  
  ProcData* ProcData::get_instance()
-diff -up gnome-system-monitor-2.25.91/src/procman.h.polkit gnome-system-monitor-2.25.91/src/procman.h
---- gnome-system-monitor-2.25.91/src/procman.h.polkit	2009-01-20 15:53:35.000000000 -0500
-+++ gnome-system-monitor-2.25.91/src/procman.h	2009-02-19 01:04:23.808984593 -0500
+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
 @@ -33,6 +33,11 @@
  #include <map>
  #include <string>


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/F-11/gnome-system-monitor.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gnome-system-monitor.spec	14 Apr 2009 01:33:43 -0000	1.140
+++ gnome-system-monitor.spec	23 Apr 2009 18:52:14 -0000	1.141
@@ -13,7 +13,7 @@
 Summary: Process and resource monitor
 Name: gnome-system-monitor
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Thu Apr 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
+- Fix sensitivity of menu items (#496860)
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/gnome-system-monitor/2.26/gnome-system-monitor-2.26.1.news


