rpms/lxpanel/devel lxpanel-0.3.8.1-nm-connection-editor.patch, NONE, 1.1 lxpanel-0.4.1-cpu-history.patch, NONE, 1.1 lxpanel.spec, 1.21, 1.22 lxpanel-0.3.8.1-system-config-network.patch, 1.1, NONE

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6932

Modified Files:
	lxpanel.spec 
Added Files:
	lxpanel-0.3.8.1-nm-connection-editor.patch 
	lxpanel-0.4.1-cpu-history.patch 
Removed Files:
	lxpanel-0.3.8.1-system-config-network.patch 
Log Message:
add patches

lxpanel-0.3.8.1-nm-connection-editor.patch:
 netstatus-dialog.c |    3 ++-
 netstatus.c        |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE lxpanel-0.3.8.1-nm-connection-editor.patch ---
diff -dur lxpanel-0.3.8.1.orig/src/plugins/netstatus/netstatus.c lxpanel-0.3.8.1/src/plugins/netstatus/netstatus.c
--- lxpanel-0.3.8.1.orig/src/plugins/netstatus/netstatus.c	2008-04-20 10:44:13.000000000 +0200
+++ lxpanel-0.3.8.1/src/plugins/netstatus/netstatus.c	2009-01-06 06:28:35.000000000 +0100
@@ -125,7 +125,7 @@
     else
     {
         ns->iface = g_strdup("eth0");
-        ns->config_tool = g_strdup("network-admin --configure %i");
+        ns->config_tool = g_strdup("nm-connection-editor");
     }
 
     iface = netstatus_iface_new(ns->iface);
diff -dur lxpanel-0.3.8.1.orig/src/plugins/netstatus/netstatus-dialog.c lxpanel-0.3.8.1/src/plugins/netstatus/netstatus-dialog.c
--- lxpanel-0.3.8.1.orig/src/plugins/netstatus/netstatus-dialog.c	2008-04-20 10:44:13.000000000 +0200
+++ lxpanel-0.3.8.1/src/plugins/netstatus/netstatus-dialog.c	2009-01-06 06:28:35.000000000 +0100
@@ -42,7 +42,8 @@
 
 #if 0 /* stripped-down version does nothing to configurators. */
 static const char *network_config_tools[] = {
-  "network-admin --configure %i",
+  "nm-connection-editor",
+  "system-config-network",
   "redhat-config-network",
   "system-control-network"
 };

lxpanel-0.4.1-cpu-history.patch:
 cpu.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE lxpanel-0.4.1-cpu-history.patch ---
--- a/src/plugins/cpu/cpu.c	2008-12-10 15:37:34.452819574 -0600
+++ b/src/plugins/cpu/cpu.c	2009-06-03 18:28:59.904598839 -0500
@@ -116,11 +116,17 @@
     ENTER;
     if (c->pixmap)
         g_object_unref(c->pixmap);
+tick *t0;
+t0=  g_new0( typeof(*c->stats_cpu), widget->allocation.width);
+unsigned int imax;
+imax=c->Wwg > widget->allocation.width? widget->allocation.width:c->Wwg;
+memcpy(t0,c->stats_cpu,imax*sizeof(tick));
+
     c->Wwg = widget->allocation.width;
     c->Hwg = widget->allocation.height;
     if (c->stats_cpu)
         g_free(c->stats_cpu);
-    c->stats_cpu = g_new0( typeof(*c->stats_cpu), c->Wwg);
+c->stats_cpu = t0;
     /* set pixmap size */
     c->pixmap = gdk_pixmap_new (widget->window,
           widget->allocation.width-BORDER_SIZE * 2,


Index: lxpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/lxpanel.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- lxpanel.spec	25 Jul 2009 02:09:07 -0000	1.21
+++ lxpanel.spec	25 Jul 2009 02:34:14 -0000	1.22
@@ -14,7 +14,7 @@ URL:            http://lxde.sourceforge.
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
 Patch1:         lxpanel-default.patch
 Patch2:         lxpanel-0.4.0-manpages.patch
-Patch3:         lxpanel-0.3.8.1-system-config-network.patch
+Patch3:         lxpanel-0.3.8.1-nm-connection-editor.patch
 # http://sourceforge.net/tracker/?func=detail&aid=2800828&group_id=180858&atid=894871
 Patch4:         lxpanel-0.4.1-cpu-history.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,6 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.4.1-2
 - Patch to fix CPU usage monitor history
+- Make netstatus plugin prefer nm-connetction-editor over system-config-network
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue May 05 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.4.1-1


--- lxpanel-0.3.8.1-system-config-network.patch DELETED ---