--- a/ChangeLog	Tue Dec 05 11:52:15 2006 +0000
+++ b/ChangeLog	Tue Dec 05 15:13:48 2006 +0000
@@ -1,3 +1,15 @@
+2006-12-05  Damien Carbery <[email protected]>
+
+	* gedit.spec: Remove upstream patch, 01-spellcheck-fallback-to-enus.
+	  Renumber remainder.
+	* patches/gedit-01-spellcheck-fallback-to-enus.diff: Removed, upstream.
+	* patches/gedit-01-gtksourceview-binding.diff,
+	  patches/gedit-02-no-zh_TW-help.diff, patches/gedit-03-menu-entry.diff:
+	  Added, renumbered.
+	* patches/libgtop-01-solaris.diff: Rework for new tarball.
+	* patches/control-center-04-remove-xkb-layout.diff,
+	  control-center-10-layout-deletion.diff: Rework for new tarball.
+
 2006-12-05  Damien Carbery <[email protected]>
 
 	* control-center.spec, gdm.spec, gnome-system-monitor.spec,

--- a/gedit.spec	Tue Dec 05 11:52:15 2006 +0000
+++ b/gedit.spec	Tue Dec 05 15:13:48 2006 +0000
@@ -18,7 +18,6 @@
 Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
 Source1:	gedit.1.gz
 Source2:	gnome-text-editor.1.gz
-Patch1:		gedit-01-spellcheck-fallback-to-enus.diff
 Patch2:		gedit-02-gtksourceview-binding.diff
 Patch3:         gedit-03-no-zh_TW-help.diff
 Patch4:         gedit-04-menu-entry.diff
@@ -68,7 +67,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %ifos linux
@@ -148,7 +146,8 @@
 
 %changelog
 * Tue Dec 05 2006 - [email protected]
-- Bump to 2.17.1.
+- Bump to 2.17.1. Remove upstream patch, 01-spellcheck-fallback-to-enus.
+  Renumber remainder.
 
 * Tue Oct 31 2006 - [email protected]
 - Bump to 2.16.2.

--- a/patches/control-center-04-remove-xkb-layout.diff	Tue Dec 05 11:52:15 2006 +0000
+++ b/patches/control-center-04-remove-xkb-layout.diff	Tue Dec 05 15:13:48 2006 +0000
@@ -10,16 +10,12 @@
  /* Define to 1 if you have the <locale.h> header file. */
  #undef HAVE_LOCALE_H
  
---- control-center-2.16.0/configure.in-orig	2006-09-05 14:23:13.639863000 -0500
-+++ control-center-2.16.0/configure.in	2006-09-05 14:56:41.467141000 -0500
-@@ -109,9 +109,19 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-d
- PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
+--- control-center-2.17.3/configure.in-orig	2006-09-05 14:23:13.639863000 -0500
++++ control-center-2.17.3/configure.in	2006-09-05 14:56:41.467141000 -0500
+@@ -111,6 +111,19 @@
  PKG_CHECK_MODULES(SOUND_CAPPLET, esound gstreamer-0.10)
  PKG_CHECK_MODULES(METACITY, libmetacity-private)
--PKG_CHECK_MODULES(LIBXKLAVIER, libxklavier >= 2.91,,
--    AC_MSG_ERROR([gnome-control-center depends on libxklavier >= 2.91.
--The latest release is available from http://prdownloads.sourceforge.net/gswitchit], 1))
-+
+ 
 +AC_ARG_ENABLE(libxklavier,
 +  AC_HELP_STRING([--disable-xklavier],
 +                 [Do not build with libxklavier support]),,
@@ -32,37 +28,37 @@
 +   AC_DEFINE([HAVE_LIBXKLAVIER], 1, [Defined when libxklavier is detected])
 +fi
 +AM_CONDITIONAL(HAVE_LIBXKLAVIER, [test $enable_libxklavier = yes])
- 
++
  dnl
  dnl Check for Xft version 2; we build in extra functionality to the font capplet
+ dnl when we have it.
 --- control-center-2.16.0/Makefile.am-orig	2006-09-05 14:27:01.521538000 -0500
 +++ control-center-2.16.0/Makefile.am	2006-09-05 14:42:22.605183000 -0500
-@@ -1,4 +1,11 @@
--SUBDIRS = po libsounds libbackground libwindow-settings libgswitchit libkbdraw gnome-settings-daemon capplets control-center help vfs-methods idl schemas $(TYPING_BREAK)
-+
+@@ -1,4 +1,10 @@
+-SUBDIRS = po libsounds libbackground libwindow-settings libslab gnome-settings-daemon capplets shell help vfs-methods idl schemas $(TYPING_BREAK)
 +SUBDIRS = po libsounds libbackground libwindow-settings 
 +
 +if HAVE_LIBXKLAVIER
 +SUBDIRS += libgswitchit
 +endif
 +
-+SUBDIRS += libkbdraw gnome-settings-daemon capplets control-center help vfs-methods idl schemas $(TYPING_BREAK)
++SUBDIRS += libslab gnome-settings-daemon capplets shell help vfs-methods idl schemas $(TYPING_BREAK)
  
  ACLOCAL_AMFLAGS = -I m4
  
 --- control-center-2.16.0/capplets/keyboard/Makefile.am-orig	2005-08-26 05:39:16.000000000 -0500
 +++ control-center-2.16.0/capplets/keyboard/Makefile.am	2006-09-05 16:23:02.519745000 -0500
-@@ -1,16 +1,23 @@
+@@ -1,15 +1,22 @@
  bin_PROGRAMS = gnome-keyboard-properties
  
 +if HAVE_LIBXKLAVIER
 +LIBXKLAVIER_FILES = \
-+		     gnome-keyboard-properties-xkb.c \
-+		     gnome-keyboard-properties-xkbmc.c \
-+		     gnome-keyboard-properties-xkblt.c \
-+		     gnome-keyboard-properties-xkbot.c \
-+		     gnome-keyboard-properties-xkbpv.c \
-+		     gnome-keyboard-properties-xkb.h
++	gnome-keyboard-properties-xkb.c \
++	gnome-keyboard-properties-xkbmc.c \
++	gnome-keyboard-properties-xkblt.c \
++	gnome-keyboard-properties-xkbot.c \
++	gnome-keyboard-properties-xkbpv.c \
++	gnome-keyboard-properties-xkb.h
 +SWITCHIT_LIB = ../../libgswitchit/libgswitchit.a
 +endif
 +
@@ -74,25 +70,24 @@
 -                                    gnome-keyboard-properties-xkbot.c \
 -                                    gnome-keyboard-properties-xkbpv.c \
 -                                    gnome-keyboard-properties-xkb.h
-+                                    $(LIBXKLAVIER_FILES)
++				    $(LIBXKLAVIER_FILES)
  gnome_keyboard_properties_LDADD =				\
  	../accessibility/keyboard/libaccessibility-keyboard.a 	\
- 	$(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) \
--	../../libgswitchit/libgswitchit.a \
-+	$(SWITCHIT_LIB) \
- 	../../libkbdraw/libkbdraw.a
+-	$(GNOMECC_CAPPLETS_LIBS) $(LIBGNOMEKBDUI_LIBS)
++	$(GNOMECC_CAPPLETS_LIBS) $(SWITCHIT_LIB) $(LIBGNOMEKBDUI_LIBS)
  
  @INTLTOOL_DESKTOP_RULE@
---- control-center-2.16.0/gnome-settings-daemon/Makefile.am-orig	2006-09-05 14:31:50.705975000 -0500
-+++ control-center-2.16.0/gnome-settings-daemon/Makefile.am	2006-09-05 15:03:27.781221000 -0500
-@@ -9,6 +9,14 @@ INCLUDES=$(DBUS_CFLAGS) $(LIBXKLAVIER_CF
+ 
+--- control-center-2.17.3/gnome-settings-daemon/Makefile.am-orig	2006-09-05 14:31:50.705975000 -0500
++++ control-center-2.17.3/gnome-settings-daemon/Makefile.am	2006-09-05 15:03:27.781221000 -0500
+@@ -8,6 +8,14 @@
  
  libexec_PROGRAMS=gnome-settings-daemon
  
 +if HAVE_LIBXKLAVIER
 +LIBXKLAVIER_FILES = \
-+        gnome-settings-keyboard-xkb.h   \
-+        gnome-settings-keyboard-xkb.c
++	gnome-settings-keyboard-xkb.h   \
++	gnome-settings-keyboard-xkb.c
 +SWITCHIT_LIB = \
 +	$(top_builddir)/libgswitchit/libgswitchit.a
 +endif
@@ -100,7 +95,7 @@
  gnome_settings_daemon_SOURCES =	\
  	factory.c			\
  	eggaccelerators.h		\
-@@ -21,8 +29,7 @@ gnome_settings_daemon_SOURCES =	\
+@@ -20,8 +28,7 @@
  	gnome-settings-mouse.c		\
  	gnome-settings-multimedia-keys.h \
  	gnome-settings-multimedia-keys.c \
@@ -110,11 +105,10 @@
  	gnome-settings-keyboard.h	\
  	gnome-settings-keyboard.c	\
  	gnome-settings-background.h	\
-@@ -71,7 +78,7 @@ gnome_settings_daemon_LDADD = \
- 	$(LIBXKLAVIER_LIBS)						\
+@@ -71,6 +78,7 @@
+ 	$(LIBGNOMEKBD_LIBS)						\
  	$(top_builddir)/libbackground/libbackground.la			\
  	$(top_builddir)/libsounds/libsounds.a				\
--	$(top_builddir)/libgswitchit/libgswitchit.a			\
 +	$(SWITCHIT_LIB)							\
  	$(top_builddir)/libwindow-settings/libgnome-window-settings.la 	\
  	$(top_builddir)/gnome-settings-daemon/actions/libacme.la	\

--- a/patches/control-center-10-layout-deletion.diff	Tue Dec 05 11:52:15 2006 +0000
+++ b/patches/control-center-10-layout-deletion.diff	Tue Dec 05 15:13:48 2006 +0000
@@ -1,13 +1,12 @@
---- control-center-2.10.1/capplets/keyboard/gnome-keyboard-properties-xkblt.c	2005-02-09 04:12:10.000000000 +0530
-+++ control-center-2.10.1-new/capplets/keyboard/gnome-keyboard-properties-xkblt.c	2005-08-04 21:28:23.665368800 +0530
-@@ -195,7 +195,9 @@ xkb_layouts_enable_disable_buttons (Glad
-   gtk_widget_set_sensitive (add_layout_btn,
- 			    (n_selected_layouts < max_selected_layouts ||
- 				max_selected_layouts == 0));
--  gtk_widget_set_sensitive (del_layout_btn, n_selected_selected_layouts > 0);
-+  gtk_widget_set_sensitive (del_layout_btn,
-+			    (n_selected_layouts > 1)
-+			    && (n_selected_selected_layouts > 0));
+--- control-center-2.17.3/capplets/keyboard/gnome-keyboard-properties-xkblt.c	2005-02-09 04:12:10.000000000 +0530
++++ control-center-2.17.3-new/capplets/keyboard/gnome-keyboard-properties-xkblt.c	2005-08-04 21:28:23.665368800 +0530
+@@ -234,7 +234,8 @@
+ 				   max_selected_layouts
+ 				   || max_selected_layouts == 0));
+ 	gtk_widget_set_sensitive (del_layout_btn,
+-				  n_selected_selected_layouts > 0);
++				  (n_selected_layouts > 1)
++				  && (n_selected_selected_layouts > 0));
  
-   if (gtk_tree_selection_get_selected (s_selection, NULL, &iter))
-     {
+ 	if (gtk_tree_selection_get_selected (s_selection, NULL, &iter)) {
+ 		GtkTreePath *path =

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gedit-01-gtksourceview-binding.diff	Tue Dec 05 15:13:48 2006 +0000
@@ -0,0 +1,10 @@
+--- gedit-2.14.0/bindings/python/Makefile.am.orig	2006-03-14 17:55:41.308666000 +0000
++++ gedit-2.14.0/bindings/python/Makefile.am	2006-03-14 17:55:50.082420000 +0000
+@@ -26,7 +26,6 @@
+ 		--register $(PYGTK_DEFSDIR)/pango-types.defs \
+ 		--register $(PYGTK_DEFSDIR)/gdk-types.defs \
+ 		--register $(PYGTK_DEFSDIR)/gtk-types.defs \
+-		--register $(PYGTK_DEFSDIR)/gtksourceview.defs \
+ 		--override $*.override \
+ 		--prefix py$* $(<F) ) > $@ 
+ 

--- a/patches/gedit-01-spellcheck-fallback-to-enus.diff	Tue Dec 05 11:52:15 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
---- gedit-2.16.1/plugins/spell/gedit-spell-checker.c.orig	2006-10-02 11:24:24.158793000 +0100
-+++ gedit-2.16.1/plugins/spell/gedit-spell-checker.c	2006-10-02 11:27:01.663561000 +0100
-@@ -433,6 +433,14 @@
- 		if (language_tag != NULL)
- 		{
- 			spell->active_lang = get_language_from_abrev (language_tag);
-+			if (spell->active_lang == NULL)
-+			{
-+				/* unknown language. fallback to en_us */
-+				language_tag = "en_us";
-+				pspell_config_replace (config, "language-tag", language_tag);
-+				spell->active_lang = get_language_from_abrev (language_tag);
-+			}
-+
- 		}
- 
- /*

--- a/patches/gedit-02-gtksourceview-binding.diff	Tue Dec 05 11:52:15 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- gedit-2.14.0/bindings/python/Makefile.am.orig	2006-03-14 17:55:41.308666000 +0000
-+++ gedit-2.14.0/bindings/python/Makefile.am	2006-03-14 17:55:50.082420000 +0000
-@@ -26,7 +26,6 @@
- 		--register $(PYGTK_DEFSDIR)/pango-types.defs \
- 		--register $(PYGTK_DEFSDIR)/gdk-types.defs \
- 		--register $(PYGTK_DEFSDIR)/gtk-types.defs \
--		--register $(PYGTK_DEFSDIR)/gtksourceview.defs \
- 		--override $*.override \
- 		--prefix py$* $(<F) ) > $@ 
- 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gedit-02-no-zh_TW-help.diff	Tue Dec 05 15:13:48 2006 +0000
@@ -0,0 +1,11 @@
+--- gedit-2.14.0/help/Makefile.am.orig	2006-03-14 18:15:05.124306000 +0000
++++ gedit-2.14.0/help/Makefile.am	2006-03-14 18:15:16.466729000 +0000
+@@ -12,7 +12,7 @@
+ 	figures/gedit_recent_files_menu_icon.png	\
+ 	figures/gedit_window.png	
+ 
+-DOC_LINGUAS = bg de es fr it ja ru sv zh_CN zh_HK zh_TW
++DOC_LINGUAS = bg de es fr it ja ru sv zh_CN zh_HK
+ 
+ # These languages aren't yet converted to gnome-doc-utils
+ SUBDIRS = eu ko ro

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gedit-03-menu-entry.diff	Tue Dec 05 15:13:48 2006 +0000
@@ -0,0 +1,12 @@
+diff -urN gedit-2.14.2/data/gedit.desktop.in.in gedit-2.14.2-hacked/data/gedit.desktop.in.in
+--- gedit-2.14.2/data/gedit.desktop.in.in	2006-01-22 07:03:52.000000000 +1300
++++ gedit-2.14.2-hacked/data/gedit.desktop.in.in	2006-06-02 12:04:50.327494000 +1200
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ _Name=Text Editor
+-_Comment=Edit text files
++_Comment=Edit text or source files, with syntax highlighting
+ Exec=gedit %U
+ Terminal=false
+ Type=Application

--- a/patches/gedit-03-no-zh_TW-help.diff	Tue Dec 05 11:52:15 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gedit-2.14.0/help/Makefile.am.orig	2006-03-14 18:15:05.124306000 +0000
-+++ gedit-2.14.0/help/Makefile.am	2006-03-14 18:15:16.466729000 +0000
-@@ -12,7 +12,7 @@
- 	figures/gedit_recent_files_menu_icon.png	\
- 	figures/gedit_window.png	
- 
--DOC_LINGUAS = bg de es fr it ja ru sv zh_CN zh_HK zh_TW
-+DOC_LINGUAS = bg de es fr it ja ru sv zh_CN zh_HK
- 
- # These languages aren't yet converted to gnome-doc-utils
- SUBDIRS = eu ko ro

--- a/patches/gedit-04-menu-entry.diff	Tue Dec 05 11:52:15 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -urN gedit-2.14.2/data/gedit.desktop.in.in gedit-2.14.2-hacked/data/gedit.desktop.in.in
---- gedit-2.14.2/data/gedit.desktop.in.in	2006-01-22 07:03:52.000000000 +1300
-+++ gedit-2.14.2-hacked/data/gedit.desktop.in.in	2006-06-02 12:04:50.327494000 +1200
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Encoding=UTF-8
- _Name=Text Editor
--_Comment=Edit text files
-+_Comment=Edit text or source files, with syntax highlighting
- Exec=gedit %U
- Terminal=false
- Type=Application

--- a/patches/libgtop-01-solaris.diff	Tue Dec 05 11:52:15 2006 +0000
+++ b/patches/libgtop-01-solaris.diff	Tue Dec 05 15:13:48 2006 +0000
@@ -140,11 +140,12 @@
 diff -Nrup libgtop-2.14.4/sysdeps/solaris/Makefile.am libgtop-2.14.4.mod/sysdeps/solaris/Makefile.am
 --- libgtop-2.14.4/sysdeps/solaris/Makefile.am	2004-11-13 08:53:20.000000000 +0800
 +++ libgtop-2.14.4.mod/sysdeps/solaris/Makefile.am	2006-11-13 20:28:00.177639000 +0800
-@@ -8,6 +8,7 @@ libgtop_sysdeps_2_0_la_SOURCES	= open.c 
+@@ -8,7 +8,7 @@
  				  proclist.c procstate.c procuid.c \
  				  proctime.c procmem.c procsignal.c \
  				  prockernel.c procsegment.c procargs.c \
-+                                  procopenfiles.c sysinfo.c fsusage.c \
+-				  procopenfiles.c \
++				  procopenfiles.c sysinfo.c fsusage.c \
  				  procmap.c netload.c ppp.c procdata.c netlist.c
  
  libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
@@ -929,140 +930,6 @@
 + 
  	buf->flags = _glibtop_sysdeps_proc_mem;
  }
-diff -Nrup libgtop-2.14.4/sysdeps/solaris/procopenfiles.c libgtop-2.14.4.mod/sysdeps/solaris/procopenfiles.c
---- libgtop-2.14.4/sysdeps/solaris/procopenfiles.c	1970-01-01 08:00:00.000000000 +0800
-+++ libgtop-2.14.4.mod/sysdeps/solaris/procopenfiles.c	2006-11-13 20:28:00.181183000 +0800
-@@ -0,0 +1,130 @@
-+/* $Id: procopenfiles.c,v 1.7 2005/12/12 09:38:12 jamesh Exp $ */
-+
-+/* Copyright (C) 2006 Henry Zhang
-+   This file is part of LibGTop 2.14.
-+
-+   Contributed by Henry Zhang <[email protected]>, July 2006.
-+
-+   LibGTop is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License,
-+   or (at your option) any later version.
-+
-+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+   for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with LibGTop; see the file COPYING. If not, write to the
-+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+*/
-+
-+#include <config.h>
-+#include <glibtop.h>
-+#include <glibtop/error.h>
-+#include <glibtop/procopenfiles.h>
-+#include <sys/types.h>
-+#include <fcntl.h>
-+#include <sys/stat.h>
-+#include <dirent.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+#include "glibtop_private.h"
-+
-+static const unsigned long _glibtop_sysdeps_proc_open_files =
-+(1L << GLIBTOP_PROC_OPEN_FILES_NUMBER)|
-+(1L << GLIBTOP_PROC_OPEN_FILES_TOTAL)|
-+(1L << GLIBTOP_PROC_OPEN_FILES_SIZE);
-+
-+/* Init function. */
-+
-+void
-+glibtop_init_proc_open_files_s (glibtop *server)
-+{
-+	server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files;
-+}
-+
-+
-+
-+/* Provides detailed information about a process' open files */
-+
-+glibtop_open_files_entry *
-+glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf,	pid_t pid)
-+{
-+	char filename [BUFSIZ];
-+	GArray *entries;
-+	struct dirent *direntry;
-+	DIR *dir;
-+	int errno;
-+
-+	glibtop_init_s (&server, GLIBTOP_SYSDEPS_PROC_OPEN_FILES, 0);
-+
-+	memset (buf, 0, sizeof (glibtop_proc_open_files));
-+
-+	sprintf (filename, "/proc/%d/fd", pid);
-+
-+	dir = opendir (filename);
-+	if (!dir) return NULL;
-+
-+	entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry));
-+
-+	while((direntry = readdir(dir))) {
-+		char tgt [BUFSIZ];
-+		int rv;
-+		glibtop_open_files_entry entry = {0};
-+		struct stat statbuf;
-+
-+		if(direntry->d_name[0] == '.')
-+			continue;
-+
-+		if ((entry.fd = (int) g_ascii_strtoull(direntry->d_name, NULL, 10)) == 0)
-+			continue;
-+					
-+		/* from /path get object name */
-+		g_snprintf(filename, sizeof filename, "/proc/%d/path/%s",
-+			   pid, direntry->d_name);
-+
-+		rv = readlink(filename, tgt, sizeof(tgt) - 1);
-+		/* read object, if not have, set it as NULL, but this fd still need to insert into the array */
-+		if(rv < 0) 
-+			rv = 0;
-+		tgt[rv] = '\0';
-+		
-+		/* from /fd get the stat data */
-+		g_snprintf(filename, sizeof filename, "/proc/%d/fd/%s",
-+			   pid, direntry->d_name);
-+
-+		if(stat (filename, &statbuf))
-+			statbuf.st_mode = 0;		
-+
-+		switch (statbuf.st_mode & S_IFMT) {
-+			case S_IFIFO:    /* pipe */
-+				entry.type = GLIBTOP_FILE_TYPE_PIPE;
-+				break;
-+			case S_IFSOCK:	/* socket */
-+			/* at solaris, now a little difficult to tell the Socket type, so here I 
-+			   give the type 0, it will not impact the existed code. Later will provide 
-+			   a patch to tell the type, and get the object name */
-+				entry.type = 0;
-+				break;
-+			default:
-+				entry.type = GLIBTOP_FILE_TYPE_FILE;
-+		}
-+				
-+		g_strlcpy(entry.info.file.name, tgt, sizeof entry.info.file.name);
-+
-+		g_array_append_val(entries, entry);
-+	}
-+
-+	closedir (dir);
-+
-+	buf->flags = _glibtop_sysdeps_proc_open_files;
-+	buf->number = entries->len;
-+	buf->size = sizeof(glibtop_open_files_entry);
-+	buf->total = buf->number * buf->size;
-+
-+	return (glibtop_open_files_entry*)g_array_free(entries, FALSE);
-+}
 diff -Nrup libgtop-2.14.4/sysdeps/solaris/proctime.c libgtop-2.14.4.mod/sysdeps/solaris/proctime.c
 --- libgtop-2.14.4/sysdeps/solaris/proctime.c	2006-06-25 01:47:34.000000000 +0800
 +++ libgtop-2.14.4.mod/sysdeps/solaris/proctime.c	2006-11-13 20:28:00.179929000 +0800