summaryrefslogtreecommitdiffstats
path: root/x11/gnomeapplets2
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2005-11-06 10:11:48 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2005-11-06 10:11:48 +0800
commit1f68255bfb77949cfc234be8c15a250877960c0c (patch)
tree44357a4ab1c70d0eba0a21ce4add873e8cd7adec /x11/gnomeapplets2
parent65f126edf2428b642053b6522f4649412f0084e4 (diff)
downloadmarcuscom-ports-1f68255bfb77949cfc234be8c15a250877960c0c.tar
marcuscom-ports-1f68255bfb77949cfc234be8c15a250877960c0c.tar.gz
marcuscom-ports-1f68255bfb77949cfc234be8c15a250877960c0c.tar.bz2
marcuscom-ports-1f68255bfb77949cfc234be8c15a250877960c0c.tar.lz
marcuscom-ports-1f68255bfb77949cfc234be8c15a250877960c0c.tar.xz
marcuscom-ports-1f68255bfb77949cfc234be8c15a250877960c0c.tar.zst
marcuscom-ports-1f68255bfb77949cfc234be8c15a250877960c0c.zip
- Clean out x11
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5031 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnomeapplets2')
-rw-r--r--x11/gnomeapplets2/Makefile66
-rw-r--r--x11/gnomeapplets2/distinfo2
-rw-r--r--x11/gnomeapplets2/files/patch-aa128
-rw-r--r--x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.c152
-rw-r--r--x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.h78
-rw-r--r--x11/gnomeapplets2/files/patch-battstat_battstat_applet.c21
-rw-r--r--x11/gnomeapplets2/files/patch-battstat_power-management.c123
-rw-r--r--x11/gnomeapplets2/files/patch-cpufreq-freebsd528
-rw-r--r--x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd373
-rw-r--r--x11/gnomeapplets2/files/patch-drivemount_drive-button.c48
-rw-r--r--x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c61
-rw-r--r--x11/gnomeapplets2/files/patch-gweather_weather-iwin.c9
-rw-r--r--x11/gnomeapplets2/files/patch-mixer_applet.c11
-rw-r--r--x11/gnomeapplets2/files/patch-modemlights_Makefile.in10
-rw-r--r--x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c18
-rw-r--r--x11/gnomeapplets2/pkg-descr3
-rw-r--r--x11/gnomeapplets2/pkg-plist803
17 files changed, 0 insertions, 2434 deletions
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
deleted file mode 100644
index e38f3b8be..000000000
--- a/x11/gnomeapplets2/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# New ports collection makefile for: gnomeapplets2
-# Date created: 26th May 2000
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.93 2005/10/04 04:57:48 marcus Exp $
-#
-
-PORTNAME= gnomeapplets2
-PORTVERSION= 2.12.1
-PORTREVISION= 1
-CATEGORIES= x11 gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-applets/2.12
-DISTNAME= gnome-applets-${PORTVERSION}
-DIST_SUBDIR= gnome2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Applets components for the Gnome 2 Desktop Environment
-
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-system-tools.pc:${PORTSDIR}/sysutils/gnomesystemtools
-LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2 \
- xklavier.10:${PORTSDIR}/x11/libxklavier \
- gucharmap.4:${PORTSDIR}/deskutils/gucharmap
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnomesystemtools
-
-USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_GMAKE= yes
-GNOME_DESKTOP_VERSION=2
-INSTALLS_OMF= yes
-INSTALLS_ICONS= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
- gail gnomedocutils
-USE_GSTREAMER= yes
-USE_AUTOTOOLS= libtool:15
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- FREEBSD_SYS=${FREEBSD_SYS}
-
-GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas \
- gswitchit.schemas gtik.schemas gweather.schemas \
- mini-commander-global.schemas mini-commander.schemas \
- mixer.schemas multiload.schemas \
- stickynotes.schemas
-
-FREEBSD_SYS?= /usr/src/sys
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386" && ${ARCH} != "amd64"
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
-PLIST_SUB= BATTERY="@comment "
-.else
-GCONF_SCHEMAS+= battstat.schemas
-PLIST_SUB= BATTERY=""
-.endif
-
-.if ${ARCH} != "i386" && ${ARCH} != "amd64"
-PLIST_SUB+= CPUFREQ="@comment "
-.else
-PLIST_SUB+= CPUFREQ=""
-GCONF_SCHEMAS+= cpufreq-applet.schemas
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
deleted file mode 100644
index ad6838c15..000000000
--- a/x11/gnomeapplets2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/gnome-applets-2.12.1.tar.bz2) = 06dd0b634d7092fa8af2ce302f68f912
-SIZE (gnome2/gnome-applets-2.12.1.tar.bz2) = 5369404
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
deleted file mode 100644
index 48b84e456..000000000
--- a/x11/gnomeapplets2/files/patch-aa
+++ /dev/null
@@ -1,128 +0,0 @@
---- configure.orig Sat Jul 16 12:55:48 2005
-+++ configure Sat Jul 16 13:04:33 2005
-@@ -23272,8 +23272,7 @@
-
- test "x$prefix" = xNONE && prefix="$ac_default_prefix"
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-- ac_define_dir=`eval echo $"${prefix}/share/locale"`
-- ac_define_dir=`eval echo $ac_define_dir`
-+ ac_define_dir=`eval echo "${prefix}/share/locale"`
- GNOMELOCALEDIR="$ac_define_dir"
-
-
-@@ -25126,7 +25125,7 @@
-
- ;;
- # list of supported OS cores that do not use libapm
-- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
-+ i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
- if -n "${OS_SYS}" ; then
- ACPIINC="-I${OS_SYS}"
- else
-@@ -25406,7 +25405,7 @@
- APPLET_MIXER_FALSE=
- fi
-
--if test x"$P_MIXER" == x"mixer"; then
-+if test x"$P_MIXER" = x"mixer"; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-@@ -25983,7 +25982,7 @@
- fi
-
-
--if test "x$SU_TOOL" == "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
-+if test "x$SU_TOOL" = "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
- { echo "$as_me:$LINENO: WARNING: *** \`modemlights' applet will not be built ***" >&5
- echo "$as_me: WARNING: *** \`modemlights' applet will not be built ***" >&2;}
- else
-@@ -26119,6 +26118,9 @@
- echo "${ECHO_T}yes" >&6
- build_cpufreq_applet=yes
- ;;
-+ i386-*-freebsd*|amd64-*-freebsd*)
-+ build_cpufreq_applet=yes
-+ ;;
- *)
- echo "warning: ${host} is not supported by cpufreq applet, not building" >&2
- build_cpufreq_applet=no
-@@ -26409,7 +26411,7 @@
- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-
-
--iconsdir="${datadir}/icons"
-+iconsdir="${prefix}/share/icons"
-
- pixmapsdir="${datadir}/pixmaps"
-
-@@ -26423,8 +26425,7 @@
-
- test "x$prefix" = xNONE && prefix="$ac_default_prefix"
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-- ac_define_dir=`eval echo $"${iconsdir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
-+ ac_define_dir=`eval echo "${iconsdir}"`
- GNOME_ICONDIR="$ac_define_dir"
-
-
-@@ -26436,8 +26437,7 @@
-
- test "x$prefix" = xNONE && prefix="$ac_default_prefix"
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-- ac_define_dir=`eval echo $"${pixmapsdir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
-+ ac_define_dir=`eval echo "${pixmapsdir}"`
- GNOME_PIXMAPSDIR="$ac_define_dir"
-
-
-@@ -26449,8 +26449,7 @@
-
- test "x$prefix" = xNONE && prefix="$ac_default_prefix"
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-- ac_define_dir=`eval echo $"${gladedir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
-+ ac_define_dir=`eval echo "${gladedir}"`
- GNOME_GLADEDIR="$ac_define_dir"
-
-
-@@ -26462,8 +26461,7 @@
-
- test "x$prefix" = xNONE && prefix="$ac_default_prefix"
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-- ac_define_dir=`eval echo $"${datadir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
-+ ac_define_dir=`eval echo "${datadir}"`
- DATADIR="$ac_define_dir"
-
-
-@@ -26475,8 +26473,7 @@
-
- test "x$prefix" = xNONE && prefix="$ac_default_prefix"
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-- ac_define_dir=`eval echo $"${sysconfdir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
-+ ac_define_dir=`eval echo "${sysconfdir}"`
- SYSCONFDIR="$ac_define_dir"
-
-
-@@ -26488,8 +26485,7 @@
-
- test "x$prefix" = xNONE && prefix="$ac_default_prefix"
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-- ac_define_dir=`eval echo $"${libdir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
-+ ac_define_dir=`eval echo "${libdir}"`
- LIBDIR="$ac_define_dir"
-
-
-@@ -26501,8 +26497,7 @@
-
- test "x$prefix" = xNONE && prefix="$ac_default_prefix"
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-- ac_define_dir=`eval echo $"$prefix"`
-- ac_define_dir=`eval echo $ac_define_dir`
-+ ac_define_dir=`eval echo "$prefix"`
- PREFIX="$ac_define_dir"
-
-
diff --git a/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.c b/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.c
deleted file mode 100644
index 48746fa03..000000000
--- a/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.c
+++ /dev/null
@@ -1,152 +0,0 @@
---- battstat/acpi-freebsd.c.orig Sun Jul 3 16:41:26 2005
-+++ battstat/acpi-freebsd.c Sun Jul 3 16:49:55 2005
-@@ -31,9 +31,13 @@
-
- #include <stdio.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- #include <sys/sysctl.h>
-+#include <sys/un.h>
- #include <sys/ioctl.h>
-+#if defined(__i386__)
- #include <machine/apm_bios.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <unistd.h>
-@@ -92,16 +96,36 @@ gboolean
- acpi_freebsd_init(struct acpi_info * acpiinfo)
- {
- int acpi_fd;
-+ int event_fd;
-
- g_assert(acpiinfo);
-
-- acpi_fd = open(ACPIDEV, O_RDONLY);
-- if (acpi_fd >= 0) {
-- acpiinfo->acpifd = acpi_fd;
-+ if (acpiinfo->acpifd == -1) {
-+ acpi_fd = open(ACPIDEV, O_RDONLY);
-+ if (acpi_fd >= 0) {
-+ acpiinfo->acpifd = acpi_fd;
-+ }
-+ else {
-+ acpiinfo->acpifd = -1;
-+ return FALSE;
-+ }
- }
-- else {
-- acpiinfo->acpifd = -1;
-- return FALSE;
-+
-+ event_fd = socket(PF_UNIX, SOCK_STREAM, 0);
-+ if (event_fd >= 0) {
-+ struct sockaddr_un addr;
-+ addr.sun_family = AF_UNIX;
-+ strcpy(addr.sun_path, "/var/run/devd.pipe");
-+ if (connect(event_fd, (struct sockaddr *) &addr, sizeof(addr)) == 0) {
-+ acpiinfo->event_fd = event_fd;
-+ acpiinfo->event_inited = TRUE;
-+ acpiinfo->channel = g_io_channel_unix_new(event_fd);
-+ }
-+ else {
-+ close(event_fd);
-+ acpiinfo->event_fd = -1;
-+ acpiinfo->event_inited = FALSE;
-+ }
- }
-
- update_battery_info(acpiinfo);
-@@ -110,6 +134,65 @@ acpi_freebsd_init(struct acpi_info * acp
- return TRUE;
- }
-
-+#define ACPI_EVENT_IGNORE 0
-+#define ACPI_EVENT_AC 1
-+#define ACPI_EVENT_BATTERY_INFO 2
-+
-+static int parse_acpi_event(GString *buffer)
-+{
-+ if (strstr(buffer->str, "system=ACPI")) {
-+ if (strstr(buffer->str, "subsystem=ACAD"))
-+ return ACPI_EVENT_AC;
-+ if (strstr(buffer->str, "subsystem=CMBAT"))
-+ return ACPI_EVENT_BATTERY_INFO;
-+ }
-+
-+ return ACPI_EVENT_IGNORE;
-+}
-+
-+void acpi_freebsd_update(struct acpi_info *acpiinfo)
-+{
-+ /* XXX This is needed for systems where devd does not have permissions
-+ * to allow for event-driven updates.
-+ */
-+ update_ac_info(acpiinfo);
-+ update_battery_info(acpiinfo);
-+}
-+
-+gboolean acpi_process_event(struct acpi_info *acpiinfo, gboolean *read_error)
-+{
-+ gsize i;
-+ int evt;
-+ gboolean result = FALSE;
-+ GString *buffer;
-+ GIOStatus stat;
-+ buffer = g_string_new(NULL);
-+
-+ *read_error = FALSE;
-+ stat = g_io_channel_read_line_string(acpiinfo->channel, buffer, &i, NULL);
-+
-+ if (stat == G_IO_STATUS_ERROR || stat == G_IO_STATUS_EOF) {
-+ *read_error = TRUE;
-+ g_string_free(buffer, TRUE);
-+ return FALSE;
-+ }
-+
-+ evt = parse_acpi_event(buffer);
-+ switch (evt) {
-+ case ACPI_EVENT_AC:
-+ update_ac_info(acpiinfo);
-+ result = TRUE;
-+ break;
-+ case ACPI_EVENT_BATTERY_INFO:
-+ update_battery_info(acpiinfo);
-+ result = TRUE;
-+ break;
-+ }
-+
-+ g_string_free(buffer, TRUE);
-+ return result;
-+}
-+
- void
- acpi_freebsd_cleanup(struct acpi_info * acpiinfo)
- {
-@@ -119,21 +202,12 @@ acpi_freebsd_cleanup(struct acpi_info *
- close(acpiinfo->acpifd);
- acpiinfo->acpifd = -1;
- }
--}
-
--/* XXX This is a hack since user-land applications can't get ACPI events yet.
-- * Devd provides this (or supposedly provides this), but you need to be
-- * root to access devd.
-- */
--gboolean
--acpi_process_event(struct acpi_info * acpiinfo)
--{
-- g_assert(acpiinfo);
--
-- update_ac_info(acpiinfo);
-- update_battery_info(acpiinfo);
--
-- return TRUE;
-+ if (acpiinfo->event_fd >= 0) {
-+ g_io_channel_unref(acpiinfo->channel);
-+ close(acpiinfo->event_fd);
-+ acpiinfo->event_fd = -1;
-+ }
- }
-
- gboolean
diff --git a/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.h b/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.h
deleted file mode 100644
index 918cd59eb..000000000
--- a/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.h
+++ /dev/null
@@ -1,78 +0,0 @@
---- battstat/acpi-freebsd.h.orig Sun Jul 3 16:50:22 2005
-+++ battstat/acpi-freebsd.h Sun Jul 3 16:54:14 2005
-@@ -29,61 +29,31 @@
- #define ACPI_LIFE "hw.acpi.battery.life"
- #define ACPI_STATE "hw.acpi.battery.state"
-
--struct acpi_info {
-- gboolean ac_online;
-- int acpifd;
-- int max_capacity;
-- int low_capacity;
-- int critical_capacity;
-+/* XXX: AMD64 does not have machine/apm_bios.h. */
-+#if !defined(__i386__)
-+struct apm_info {
-+ guint ai_acline;
-+ guint ai_batt_stat;
-+ guint ai_batt_life;
-+ int ai_batt_time;
-+ guint ai_status;
- };
--
--gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo);
--gboolean acpi_process_event(struct acpi_info * acpiinfo);
--gboolean acpi_freebsd_init(struct acpi_info * acpiinfo);
--void acpi_freebsd_cleanup(struct acpi_info * acpiinfo);
--
--#endif /* __ACPI_FREEBSD_H__ */
--/*
-- * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org>
-- *
-- * This program 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.
-- *
-- * This program 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 this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
-- */
--
--#ifndef __ACPI_FREEBSD_H__
--#define __ACPI_FREEBSD_H__
--
--#define ACPIDEV "/dev/acpi"
--
--#define BATT_MIN 0
--#define BATT_MAX 64
--
--#define ACPI_ACLINE "hw.acpi.acline"
--#define ACPI_TIME "hw.acpi.battery.time"
--#define ACPI_LIFE "hw.acpi.battery.life"
--#define ACPI_STATE "hw.acpi.battery.state"
-+#endif
-
- struct acpi_info {
- gboolean ac_online;
-+ gboolean event_inited;
- int acpifd;
-+ int event_fd;
- int max_capacity;
- int low_capacity;
- int critical_capacity;
-+ GIOChannel * channel;
- };
-
- gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo);
--gboolean acpi_process_event(struct acpi_info * acpiinfo);
-+void acpi_freebsd_update(struct acpi_info * acpiinfo);
-+gboolean acpi_process_event(struct acpi_info * acpiinfo, gboolean *read_error);
- gboolean acpi_freebsd_init(struct acpi_info * acpiinfo);
- void acpi_freebsd_cleanup(struct acpi_info * acpiinfo);
-
diff --git a/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c b/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c
deleted file mode 100644
index a95b7b569..000000000
--- a/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- battstat/battstat_applet.c.orig Fri Aug 19 22:13:49 2005
-+++ battstat/battstat_applet.c Tue Aug 23 20:37:13 2005
-@@ -430,14 +430,14 @@ battery_full_notify (GtkWidget *applet)
- static void
- battery_full_dialog (GtkWidget *applet)
- {
-- /* first attempt to use libnotify */
-- if (battery_full_notify (applet))
-- return;
--
- GtkWidget *dialog, *hbox, *image, *label;
- GdkPixbuf *pixbuf;
-
- gchar *new_label;
-+ /* first attempt to use libnotify */
-+ if (battery_full_notify (applet))
-+ return;
-+
- dialog = gtk_dialog_new_with_buttons (
- _("Battery Notice"),
- NULL,
diff --git a/x11/gnomeapplets2/files/patch-battstat_power-management.c b/x11/gnomeapplets2/files/patch-battstat_power-management.c
deleted file mode 100644
index 9cea2d65b..000000000
--- a/x11/gnomeapplets2/files/patch-battstat_power-management.c
+++ /dev/null
@@ -1,123 +0,0 @@
---- battstat/power-management.c.orig Thu Aug 25 23:45:47 2005
-+++ battstat/power-management.c Tue Aug 30 01:28:40 2005
-@@ -61,9 +61,7 @@
-
- static const char *apm_readinfo (BatteryStatus *status);
- static int pm_initialised;
--#ifdef HAVE_HAL
--static int using_hal;
--#endif
-+static int using_hal = FALSE;
-
- /*
- * What follows is a series of platform-specific apm_readinfo functions
-@@ -173,16 +171,40 @@ apm_readinfo (BatteryStatus *status)
-
- #elif __FreeBSD__
-
-+#if defined(__i386__)
- #include <machine/apm_bios.h>
-+#endif
- #include "acpi-freebsd.h"
-
- static struct acpi_info acpiinfo;
- static gboolean using_acpi;
- static int acpi_count;
-+static int acpiwatch;
- static struct apm_info apminfo;
-
-+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo);
-+
- #define APMDEVICE "/dev/apm"
-
-+static gboolean acpi_callback (GIOChannel * chan, GIOCondition cond, gpointer data)
-+{
-+ gboolean read_error;
-+ if (cond & (G_IO_ERR | G_IO_HUP)) {
-+ acpi_freebsd_cleanup(&acpiinfo);
-+ return FALSE;
-+ }
-+
-+ if (acpi_process_event(&acpiinfo, &read_error)) {
-+ acpi_freebsd_read(&apminfo, &acpiinfo);
-+ }
-+ else if (read_error) {
-+ acpi_freebsd_cleanup(&acpiinfo);
-+ return FALSE;
-+ }
-+
-+ return TRUE;
-+}
-+
- static const char *
- apm_readinfo (BatteryStatus *status)
- {
-@@ -190,21 +212,27 @@ apm_readinfo (BatteryStatus *status)
-
- if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n");
-
-- if (using_acpi) {
-+ if (using_acpi && (!acpiinfo.event_inited || acpiinfo.event_fd >= 0)) {
- if (acpi_count <= 0) {
- acpi_count = 30;
-- acpi_process_event(&acpiinfo);
-+ if (!acpiinfo.event_inited) {
-+ acpi_freebsd_update(&acpiinfo);
-+ }
- if (acpi_freebsd_read(&apminfo, &acpiinfo) == FALSE)
- return ERR_FREEBSD_ACPI;
- }
- acpi_count--;
- }
-- else
-- {
-- /* This is how I read the information from the APM subsystem under
-- FreeBSD. Each time this functions is called (once every second)
-- the APM device is opened, read from and then closed.
-- */
-+ else if (using_acpi && acpiinfo.event_inited) {
-+ if (acpi_freebsd_init(&acpiinfo)) {
-+ acpiwatch = g_io_add_watch (acpiinfo.channel,
-+ G_IO_IN | G_IO_ERR | G_IO_HUP,
-+ acpi_callback, NULL);
-+ acpi_freebsd_read(&apminfo, &acpiinfo);
-+ }
-+ }
-+ else {
-+#if defined(__i386__)
- fd = open(APMDEVICE, O_RDONLY);
- if (fd == -1) {
- return ERR_OPEN_APMDEV;
-@@ -217,6 +245,9 @@ apm_readinfo (BatteryStatus *status)
-
- if(apminfo.ai_status == 0)
- return ERR_APM_E;
-+#else
-+ return ERR_OPEN_APMDEV;
-+#endif
- }
-
- status->present = TRUE;
-@@ -480,6 +511,12 @@ power_management_initialise( int no_hal
- }
- else
- using_acpi = FALSE;
-+
-+ if (using_acpi && acpiinfo.event_fd >= 0) {
-+ acpiwatch = g_io_add_watch (acpiinfo.channel,
-+ G_IO_IN | G_IO_ERR | G_IO_HUP,
-+ acpi_callback, NULL);
-+ }
- #endif
- pm_initialised = 1;
-
-@@ -513,6 +550,9 @@ power_management_cleanup( void )
- }
- #elif defined(__FreeBSD__)
- if (using_acpi) {
-+ if (acpiwatch != 0)
-+ g_source_remove(acpiwatch);
-+ acpiwatch = 0;
- acpi_freebsd_cleanup(&acpiinfo);
- }
- #endif
diff --git a/x11/gnomeapplets2/files/patch-cpufreq-freebsd b/x11/gnomeapplets2/files/patch-cpufreq-freebsd
deleted file mode 100644
index 4bed0298d..000000000
--- a/x11/gnomeapplets2/files/patch-cpufreq-freebsd
+++ /dev/null
@@ -1,528 +0,0 @@
---- cpufreq/src/cpufreq-monitor-sysctl.h.orig Sun Feb 13 01:00:25 2005
-+++ cpufreq/src/cpufreq-monitor-sysctl.h Sat Feb 12 20:25:21 2005
-@@ -0,0 +1,48 @@
-+/*
-+ * Copyright (C) 2001, 2002 Free Software Foundation
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free
-+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org>
-+ */
-+
-+#ifndef __CPUFREQ_MONITOR_SYSCTL_H__
-+#define __CPUFREQ_MONITOR_SYSCTL_H__
-+
-+#include <glib-object.h>
-+#include "cpufreq-monitor.h"
-+
-+#define TYPE_CPUFREQ_MONITOR_SYSCTL (cpufreq_monitor_sysctl_get_type ())
-+#define CPUFREQ_MONITOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctl))
-+#define CPUFREQ_MONITOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctlClass))
-+#define IS_CPUFREQ_MONITOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL))
-+#define IS_CPUFREQ_MONITOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CPUFREQ_MONITOR_SYSCTL))
-+#define CPUFREQ_MONITOR_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctlClass))
-+
-+typedef struct _CPUFreqMonitorSysctl CPUFreqMonitorSysctl;
-+typedef struct _CPUFreqMonitorSysctlClass CPUFreqMonitorSysctlClass;
-+
-+struct _CPUFreqMonitorSysctl {
-+ CPUFreqMonitor parent;
-+};
-+
-+struct _CPUFreqMonitorSysctlClass {
-+ CPUFreqMonitorClass parent_class;
-+};
-+
-+GType cpufreq_monitor_sysctl_get_type ();
-+CPUFreqMonitor *cpufreq_monitor_sysctl_new (guint cpu);
-+
-+#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */
---- cpufreq/src/cpufreq-monitor-sysctl.c.orig Sun Feb 13 03:52:42 2005
-+++ cpufreq/src/cpufreq-monitor-sysctl.c Mon Feb 14 00:42:07 2005
-@@ -0,0 +1,269 @@
-+/*
-+ * Copyright (C) 2001, 2002 Free Software Foundation
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free
-+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org>
-+ */
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+
-+#include <string.h>
-+
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+
-+#include "cpufreq-monitor-sysctl.h"
-+#include "cpufreq-monitor-protected.h"
-+
-+#define PARENT_TYPE TYPE_CPUFREQ_MONITOR
-+
-+#define CPUFREQ_MONITOR_GET_PROTECTED(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PARENT_TYPE, CPUFreqMonitorProtected))
-+
-+static void cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass);
-+static void cpufreq_monitor_sysctl_finalize (GObject *object);
-+
-+static void cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor);
-+static GList *cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor);
-+
-+static gboolean cpufreq_monitor_sysctl_get (gpointer gdata);
-+
-+
-+static CPUFreqMonitorClass *parent_class = NULL;
-+
-+typedef struct _CPUFreqMonitorProtected CPUFreqMonitorProtected;
-+
-+GType cpufreq_monitor_sysctl_get_type ()
-+{
-+ static GType type = 0;
-+
-+ if (!type) {
-+ static const GTypeInfo info = {
-+ sizeof (CPUFreqMonitorSysctlClass),
-+ (GBaseInitFunc) NULL,
-+ (GBaseFinalizeFunc) NULL,
-+ (GClassInitFunc) cpufreq_monitor_sysctl_class_init,
-+ NULL,
-+ NULL,
-+ sizeof (CPUFreqMonitorSysctl),
-+ 0,
-+ NULL
-+ };
-+
-+ type = g_type_register_static (PARENT_TYPE, "CPUFreqMonitorSysctl",
-+ &info, 0);
-+ }
-+
-+ return type;
-+}
-+
-+static void
-+cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass)
-+{
-+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+ CPUFreqMonitorClass *monitor_class = CPUFREQ_MONITOR_CLASS (klass);
-+
-+ parent_class = g_type_class_peek_parent (klass);
-+
-+ monitor_class->run = cpufreq_monitor_sysctl_run;
-+ monitor_class->get_available_frequencies = cpufreq_monitor_sysctl_get_available_frequencies;
-+
-+ object_class->finalize = cpufreq_monitor_sysctl_finalize;
-+}
-+
-+static void
-+cpufreq_monitor_sysctl_finalize (GObject *object)
-+{
-+ g_return_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (object));
-+
-+ if (G_OBJECT_CLASS (parent_class)->finalize)
-+ (* G_OBJECT_CLASS (parent_class)->finalize) (object);
-+}
-+
-+CPUFreqMonitor *
-+cpufreq_monitor_sysctl_new (guint cpu)
-+{
-+ CPUFreqMonitorSysctl *monitor;
-+
-+ monitor = g_object_new (TYPE_CPUFREQ_MONITOR_SYSCTL, "cpu", cpu, NULL);
-+
-+ return CPUFREQ_MONITOR (monitor);
-+}
-+
-+static gboolean
-+cpufreq_monitor_sysctl_get (gpointer gdata)
-+{
-+ gint fmax, fmin, ifreq;
-+ gchar *freq, *perc, *unit, *governor;
-+ gboolean changed;
-+ size_t len;
-+ gchar *freq_oid;
-+ CPUFreqMonitorSysctl *monitor;
-+ CPUFreqMonitorProtected *private;
-+
-+ monitor = (CPUFreqMonitorSysctl *) gdata;
-+ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor));
-+
-+ if (private->available_freqs == NULL) {
-+ if (!cpufreq_monitor_sysctl_get_available_frequencies (CPUFREQ_MONITOR (monitor)))
-+ return FALSE;
-+ }
-+
-+ fmax = atoi ((gchar *) private->available_freqs->data);
-+ fmin = atoi ((gchar *) g_list_nth_data (private->available_freqs, (g_list_length (private->available_freqs) - 1)));
-+
-+ len = sizeof (ifreq);
-+ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", private->cpu);
-+
-+ if (sysctlbyname (freq_oid, &ifreq, &len, NULL, 0) == -1) {
-+ g_free (freq_oid);
-+ return FALSE;
-+ }
-+
-+ ifreq *= 1000;
-+
-+ if (ifreq == fmax)
-+ governor = g_strdup ("performance");
-+ else if (ifreq == fmin)
-+ governor = g_strdup ("economy");
-+ else
-+ governor = g_strdup ("other");
-+
-+ freq = parent_class->get_human_readable_freq (ifreq);
-+ perc = parent_class->get_human_readable_perc (fmax, ifreq);
-+ unit = parent_class->get_human_readable_unit (ifreq);
-+
-+ changed = FALSE;
-+
-+ if (!private->governor || (g_ascii_strcasecmp (governor, private->governor) != 0)) {
-+ changed = TRUE;
-+ }
-+
-+ if (!private->freq || (g_ascii_strcasecmp (freq, private->freq) != 0)) {
-+ changed = TRUE;
-+ }
-+
-+ if (!private->perc || (g_ascii_strcasecmp (perc, private->perc) != 0)) {
-+ changed = TRUE;
-+ }
-+
-+ if (!private->unit || (g_ascii_strcasecmp (unit, private->unit) != 0)) {
-+ changed = TRUE;
-+ }
-+
-+ parent_class->free_data (CPUFREQ_MONITOR (monitor));
-+
-+ private->governor = governor;
-+ private->freq = freq;
-+ private->perc = perc;
-+ private->unit = unit;
-+
-+ if (private->governor == NULL)
-+ return FALSE;
-+ if (private->freq == NULL)
-+ return FALSE;
-+ if (private->perc == NULL)
-+ return FALSE;
-+ if (private->unit == NULL)
-+ return FALSE;
-+
-+ if (changed)
-+ g_signal_emit (CPUFREQ_MONITOR (monitor), parent_class->signals[CHANGED], 0);
-+
-+ return TRUE;
-+}
-+
-+static void
-+cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor)
-+{
-+ CPUFreqMonitorProtected *private;
-+
-+ g_return_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (monitor));
-+
-+ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor));
-+
-+ if (private->timeout_handler > 0)
-+ g_source_remove (private->timeout_handler);
-+
-+ private->timeout_handler = g_timeout_add (1000, cpufreq_monitor_sysctl_get, (gpointer) monitor);
-+}
-+
-+static void
-+free_string (gpointer str, gpointer gdata)
-+{
-+ if (str) g_free (str);
-+}
-+
-+static GList *
-+cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor)
-+{
-+ CPUFreqMonitorProtected *private;
-+ gchar *levels_oid, *levels;
-+ gchar **levelsp, **l;
-+ gint mib[4];
-+ size_t len;
-+
-+ g_return_val_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (monitor), NULL);
-+
-+ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor));
-+
-+ if (private->available_freqs) {
-+ g_list_foreach (private->available_freqs,
-+ free_string, NULL);
-+ g_list_free (private->available_freqs);
-+ private->available_freqs = NULL;
-+ }
-+
-+ levels_oid = g_strdup_printf ("dev.cpu.%d.freq_levels",
-+ private->cpu);
-+ len = 4;
-+ sysctlnametomib (levels_oid, mib, &len);
-+ len = sizeof (levels);
-+ g_free (levels_oid);
-+
-+ if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1)
-+ return NULL;
-+
-+ levels = g_malloc (len);
-+ if (sysctl (mib, 4, levels, &len, NULL, 0) == -1)
-+ return NULL;
-+
-+ levelsp = g_strsplit (levels, " ", 0);
-+ g_free (levels);
-+
-+ for (l = levelsp; l && *l; l++) {
-+ gchar **frpr;
-+
-+ frpr = g_strsplit (*l, "/", 0);
-+ if (frpr && frpr[0] != NULL) {
-+ /* sysctl format is %d/%d where the
-+ * first %d is the frequency, and
-+ * the second is the power used in
-+ * mW.
-+ */
-+ int freq = atoi (frpr[0]);
-+ private->available_freqs =
-+ g_list_append (private->available_freqs, g_strdup_printf ("%d", freq * 1000));
-+ }
-+ g_strfreev (frpr);
-+ }
-+
-+ g_strfreev (levelsp);
-+
-+ return private->available_freqs;
-+}
-+#endif /* __FreeBSD__ */
---- cpufreq/src/cpufreq-monitor-factory.c.orig Thu Apr 14 12:11:06 2005
-+++ cpufreq/src/cpufreq-monitor-factory.c Sun Jul 3 17:09:15 2005
-@@ -17,13 +17,21 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Authors : Carlos García Campos <carlosgc@gnome.org>
-+ * Joe Marcus Clarke <marcus@FreeBSD.org>
- */
-
- #include <glib.h>
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif /* __FreeBSD__ */
-
- #include "cpufreq-applet.h"
- #include "cpufreq-monitor-sysfs.h"
- #include "cpufreq-monitor-procfs.h"
-+#ifdef __FreeBSD__
-+#include "cpufreq-monitor-sysctl.h"
-+#endif /* __FreeBSD__ */
- #include "cpufreq-monitor-cpuinfo.h"
- #include "cpufreq-monitor-factory.h"
-
-@@ -31,6 +39,7 @@ CPUFreqMonitor *
- cpufreq_monitor_factory_create_monitor (guint cpu)
- {
- CPUFreqMonitor *monitor = NULL;
-+#ifndef __FreeBSD__
-
- if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
- monitor = cpufreq_monitor_sysfs_new (cpu);
-@@ -49,6 +58,20 @@ cpufreq_monitor_factory_create_monitor (
-
- monitor = cpufreq_monitor_cpuinfo_new (cpu);
- }
-+#else
-+ size_t len;
-+
-+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
-+ monitor = cpufreq_monitor_sysctl_new (cpu);
-+ } else {
-+ cpufreq_applet_display_error (_("CPU frequency scaling unsupported"),
-+ _("You will not be able to modify the frequency of your machine. "
-+ "Your machine may be misconfigured or not have hardware support "
-+ "for CPU frequency scaling."));
-+
-+ monitor = cpufreq_monitor_cpuinfo_new (cpu);
-+ }
-+#endif /* __FreeBSD__ */
-
- return monitor;
- }
---- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Thu Apr 14 12:11:06 2005
-+++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sun Jul 3 17:07:16 2005
-@@ -23,6 +23,10 @@
- #include <glib/gi18n.h>
- #include <libgnomevfs/gnome-vfs.h>
-
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif /* __FreeBSD__ */
- #include <string.h>
- #include <stdio.h>
-
-@@ -104,6 +108,7 @@ cpufreq_monitor_cpuinfo_new (guint cpu)
- static gboolean
- cpufreq_monitor_cpuinfo_get (gpointer gdata)
- {
-+#ifndef __FreeBSD__
- GnomeVFSHandle *handle;
- GnomeVFSFileSize bytes_read;
- GnomeVFSResult result;
-@@ -111,6 +116,9 @@ cpufreq_monitor_cpuinfo_get (gpointer gd
- gchar **lines;
- gchar buffer[256];
- gchar *p;
-+#else
-+ size_t len;
-+#endif /* __FreeBSD__ */
- gchar *freq, *perc, *unit, *governor;
- gint cpu, i;
- CPUFreqMonitorCPUInfo *monitor;
-@@ -120,6 +128,7 @@ cpufreq_monitor_cpuinfo_get (gpointer gd
-
- private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor));
-
-+#ifndef __FreeBSD__
- uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo");
-
- result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
-@@ -180,6 +189,12 @@ cpufreq_monitor_cpuinfo_get (gpointer gd
-
- g_strfreev (lines);
- g_free (file);
-+#else
-+ len = sizeof (cpu);
-+
-+ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1)
-+ return FALSE;
-+#endif /* __FreeBSD__ */
-
- governor = g_strdup (_("Frequency Scaling Unsupported"));
- freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/
---- cpufreq/src/cpufreq-applet.c.orig Thu Apr 14 12:11:06 2005
-+++ cpufreq/src/cpufreq-applet.c Sun Jul 3 17:28:43 2005
-@@ -17,6 +17,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Authors : Carlos García Campos <carlosgc@gnome.org>
-+ * Joe Marcus Clarke <marcus@FreeBSD.org>
- */
-
- #include <config.h>
-@@ -26,6 +27,10 @@
- #include <panel-applet-gconf.h>
- #include <glade/glade.h>
- #include <glib/gi18n.h>
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif /* __FreeBSD__ */
- #include <string.h>
-
- #include "cpufreq-applet.h"
-@@ -193,6 +198,7 @@ cpufreq_applet_about_cb (BonoboUICompone
- {
- static const gchar *authors[] = {
- "Carlos Garcia Campos <carlosgc@gnome.org>",
-+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)",
- NULL
- };
- static const gchar *documenters[] = {
-@@ -233,6 +239,7 @@ static gint
- cpufreq_applet_get_max_cpu (void)
- {
- gint mcpu = -1;
-+#ifndef __FreeBSD__
- gchar *file = NULL;
-
- do {
-@@ -242,11 +249,20 @@ cpufreq_applet_get_max_cpu (void)
- } while (g_file_test (file, G_FILE_TEST_EXISTS));
- g_free (file);
- mcpu --;
-+#else
-+ size_t len;
-+
-+ len = sizeof (mcpu);
-+
-+ sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0);
-+ mcpu --;
-+#endif /* __FreeBSD__ */
-
- if (mcpu >= 0)
- return mcpu;
-
- mcpu = -1;
-+#ifndef __FreeBSD__
- file = NULL;
- do {
- if (file) g_free (file);
-@@ -255,6 +271,7 @@ cpufreq_applet_get_max_cpu (void)
- } while (g_file_test (file, G_FILE_TEST_EXISTS));
- g_free (file);
- mcpu --;
-+#endif
-
- if (mcpu >= 0)
- return mcpu;
---- cpufreq/src/Makefile.in.orig Tue Oct 4 00:11:26 2005
-+++ cpufreq/src/Makefile.in Tue Oct 4 00:20:37 2005
-@@ -57,6 +57,7 @@
- cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \
- cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \
- cpufreq-monitor-procfs.$(OBJEXT) \
-+ cpufreq-monitor-sysctl.$(OBJEXT) \
- cpufreq-monitor-sysfs.$(OBJEXT) \
- cpufreq-monitor-cpuinfo.$(OBJEXT)
- cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
-@@ -71,6 +72,7 @@
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-factory.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
-+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-prefs.Po
-@@ -358,6 +360,7 @@
- cpufreq-monitor-protected.h \
- cpufreq-monitor-factory.c cpufreq-monitor-factory.h \
- cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \
-+ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \
- cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \
- cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h
-
-@@ -441,6 +444,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@
diff --git a/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd b/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd
deleted file mode 100644
index d25df35e2..000000000
--- a/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd
+++ /dev/null
@@ -1,373 +0,0 @@
---- cpufreq/src/cpufreq-selector/cpufreq-sysctl.h.orig Mon Feb 14 00:38:57 2005
-+++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.h Mon Feb 14 00:21:39 2005
-@@ -0,0 +1,51 @@
-+/*
-+ * Copyright (C) 2001, 2002 Free Software Foundation
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free
-+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org>
-+ */
-+
-+#ifndef __CPUFREQ_SYSCTL_H__
-+#define __CPUFREQ_SYSCTL_H__
-+
-+#include <glib-object.h>
-+
-+#include "cpufreq.h"
-+
-+#define TYPE_CPUFREQ_SYSCTL (cpufreq_sysctl_get_type ())
-+#define CPUFREQ_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctl))
-+#define CPUFREQ_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlClass))
-+#define IS_CPUFREQ_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CPUFREQ_SYSCTL))
-+#define IS_CPUFREQ_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CPUFREQ_SYSCTL))
-+#define CPUFREQ_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlClass))
-+
-+typedef struct _CPUFreqSysctl CPUFreqSysctl;
-+typedef struct _CPUFreqSysctlClass CPUFreqSysctlClass;
-+typedef struct _CPUFreqSysctlPriv CPUFreqSysctlPriv;
-+
-+struct _CPUFreqSysctl {
-+ CPUFreq parent;
-+};
-+
-+struct _CPUFreqSysctlClass {
-+ CPUFreqClass parent_class;
-+};
-+
-+
-+GType cpufreq_sysctl_get_type ();
-+CPUFreqSysctl *cpufreq_sysctl_new ();
-+
-+#endif /* __CPUFREQ_SYSCTL_H__ */
---- cpufreq/src/cpufreq-selector/cpufreq-sysctl.c.orig Mon Feb 14 00:38:52 2005
-+++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.c Mon Feb 14 00:44:43 2005
-@@ -0,0 +1,235 @@
-+/*
-+ * Copyright (C) 2001, 2002 Free Software Foundation
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free
-+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org>
-+ */
-+
-+#include <glib.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif /* __FreeBSD__ */
-+
-+#include "cpufreq-sysctl.h"
-+
-+#define PARENT_TYPE TYPE_CPUFREQ
-+
-+#define CPUFREQ_SYSCTL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlPrivate))
-+
-+static void cpufreq_sysctl_init (CPUFreqSysctl *cfq);
-+static void cpufreq_sysctl_class_init (CPUFreqSysctlClass *klass);
-+static void cpufreq_sysctl_finalize (GObject *object);
-+
-+static void cpufreq_sysctl_set_governor (CPUFreq *cfq, const gchar *governor);
-+static void cpufreq_sysctl_set_frequency (CPUFreq *cfq, gint frequency);
-+
-+static void cpufreq_sysctl_setup (CPUFreqSysctl *cfq);
-+
-+static GObjectClass *parent_class = NULL;
-+
-+typedef struct _CPUFreqSysctlPrivate CPUFreqSysctlPrivate;
-+
-+struct _CPUFreqSysctlPrivate
-+{
-+ gint pmax;
-+};
-+
-+GType cpufreq_sysctl_get_type ()
-+{
-+ static GType type = 0;
-+
-+ if (!type) {
-+ static const GTypeInfo info = {
-+ sizeof (CPUFreqSysctlClass),
-+ (GBaseInitFunc) NULL,
-+ (GBaseFinalizeFunc) NULL,
-+ (GClassInitFunc) cpufreq_sysctl_class_init,
-+ NULL,
-+ NULL,
-+ sizeof (CPUFreqSysctl),
-+ 0,
-+ (GInstanceInitFunc) cpufreq_sysctl_init
-+ };
-+
-+ type = g_type_register_static (PARENT_TYPE, "CPUFreqSysctl",
-+ &info, 0);
-+ }
-+
-+ return type;
-+}
-+
-+static void
-+cpufreq_sysctl_init (CPUFreqSysctl *cfq)
-+{
-+ CPUFreqSysctlPrivate *private;
-+
-+ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq));
-+
-+ private = CPUFREQ_SYSCTL_GET_PRIVATE (cfq);
-+}
-+
-+static void
-+cpufreq_sysctl_class_init (CPUFreqSysctlClass *klass)
-+{
-+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+ CPUFreqClass *cfq_class = CPUFREQ_CLASS (klass);
-+
-+ parent_class = g_type_class_peek_parent (klass);
-+
-+ g_type_class_add_private (klass, sizeof (CPUFreqSysctlPrivate));
-+
-+ cfq_class->set_governor = cpufreq_sysctl_set_governor;
-+ cfq_class->set_frequency = cpufreq_sysctl_set_frequency;
-+
-+ object_class->finalize = cpufreq_sysctl_finalize;
-+}
-+
-+static void
-+cpufreq_sysctl_finalize (GObject *object)
-+{
-+ if (G_OBJECT_CLASS (parent_class)->finalize)
-+ (* G_OBJECT_CLASS (parent_class)->finalize) (object);
-+}
-+
-+CPUFreqSysctl *
-+cpufreq_sysctl_new ()
-+{
-+ CPUFreqSysctl *cfq;
-+
-+ cfq = g_object_new (TYPE_CPUFREQ_SYSCTL, NULL);
-+
-+ cpufreq_sysctl_setup (cfq);
-+
-+ return cfq;
-+}
-+
-+static void
-+cpufreq_sysctl_set_governor (CPUFreq *cfq, const gchar *governor)
-+{
-+ /* Not implemented. */
-+}
-+
-+static void
-+cpufreq_sysctl_set_frequency (CPUFreq *cfq, gint frequency)
-+{
-+ gint cpu, i;
-+ size_t len;
-+ gchar *freq_oid;
-+
-+ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq));
-+
-+ g_object_get (G_OBJECT (cfq), "n_cpu", &cpu, NULL);
-+
-+ frequency = (gint) ((gdouble) frequency / 1000); /* Convert back to MHz*/
-+
-+ for (i = 0; i < cpu; i++) {
-+ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", i);
-+
-+ sysctlbyname (freq_oid, NULL, &len, &frequency, sizeof (frequency));
-+ g_free (freq_oid);
-+ }
-+}
-+
-+
-+static void
-+cpufreq_sysctl_setup (CPUFreqSysctl *cfq)
-+{
-+ guint cpu;
-+ gint fmax, fmin;
-+ gint pmax;
-+ gint ifreq;
-+ gint mib[4];
-+ gchar *governor, *levels;
-+ gchar **levelsp, **frpr, **l;
-+ size_t len;
-+ CPUFreqSysctlPrivate *private;
-+
-+ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq));
-+
-+ private = CPUFREQ_SYSCTL_GET_PRIVATE (cfq);
-+
-+ pmax = 100;
-+ fmax = 0;
-+ fmin = 0;
-+ ifreq = 0;
-+
-+ private->pmax = pmax;
-+
-+ len = sizeof (cpu);
-+
-+ if (sysctlbyname ("hw.ncpu", &cpu, &len, NULL, 0) == -1)
-+ cpu = 1;
-+
-+ len = 4;
-+ sysctlnametomib ("dev.cpu.0.freq_levels", mib, &len);
-+ len = sizeof (levels);
-+
-+ if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1) {
-+ g_warning ("Failed to fetch dev.cpu.0.freq_levels");
-+ return;
-+ }
-+
-+ levels = g_malloc (len);
-+ if (sysctl (mib, 4, levels, &len, NULL, 0) == -1) {
-+ g_warning ("Failed to fetch data for dev.cpu.0.freq_levels");
-+ return;
-+ }
-+
-+ levelsp = g_strsplit (levels, " ", 0);
-+ g_free (levels);
-+
-+ frpr = g_strsplit (levelsp[0], "/", 0); /* MAX */
-+ if (frpr && frpr[0] != NULL)
-+ fmax = atoi (frpr[0]);
-+ g_strfreev (frpr);
-+
-+ for (l = levelsp; l && *l; l++) /* Walk to the last frequency */
-+ ;
-+
-+ l --;
-+ frpr = g_strsplit (*l, "/", 0);
-+ if (frpr && frpr[0] != NULL)
-+ fmin = atoi (frpr[0]);
-+
-+ g_strfreev (frpr);
-+ g_strfreev (levelsp);
-+
-+ len = sizeof (ifreq);
-+ if (sysctlbyname ("dev.cpu.0.freq", &ifreq, &len, NULL, 0) == -1) {
-+ g_warning ("Failed to fetch data for dev.cpu.0.freq");
-+ return;
-+ }
-+
-+ if (ifreq == fmax)
-+ governor = g_strdup ("performance");
-+ else if (ifreq == fmin)
-+ governor = g_strdup ("economy");
-+ else
-+ governor = g_strdup ("other");
-+
-+ fmax *= 1000;
-+ fmin *= 1000;
-+
-+ g_object_set (G_OBJECT (cfq), "n_cpu", cpu,
-+ "sc_max", fmax, "sc_min", fmin,
-+ "governor", governor, NULL);
-+
-+ g_free (governor);
-+}
---- cpufreq/src/cpufreq-selector/main.c.orig Sun Apr 3 12:03:13 2005
-+++ cpufreq/src/cpufreq-selector/main.c Sun Jul 3 17:16:19 2005
-@@ -17,6 +17,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Authors : Carlos García Campos <carlosgc@gnome.org>
-+ * Joe Marcus Clarke <marcus@FreeBSD.org>
- */
-
- #include <glib-object.h>
-@@ -26,6 +27,9 @@
- #include "cpufreq.h"
- #include "cpufreq-sysfs.h"
- #include "cpufreq-procfs.h"
-+#ifdef __FreeBSD__
-+#include "cpufreq-sysctl.h"
-+#endif /* __FreeBSD__ */
-
- gint
- main (gint argc, gchar **argv)
-@@ -34,6 +38,9 @@ main (gint argc, gchar **argv)
- static gint cpu = 0;
- static gchar *governor = NULL;
- static gulong frequency = 0;
-+#ifdef __FreeBSD__
-+ size_t len;
-+#endif /* __FreeBSD__ */
- GError *error = NULL;
- CPUFreq *cfq;
-
-@@ -71,10 +78,15 @@ main (gint argc, gchar **argv)
-
- g_option_context_free (context);
-
-+#ifndef __FreeBSD__
- if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
- cfq = CPUFREQ (cpufreq_sysfs_new ());
- } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
- cfq = CPUFREQ (cpufreq_procfs_new ());
-+#else
-+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
-+ cfq = CPUFREQ (cpufreq_sysctl_new ());
-+#endif /* __FreeBSD__ */
- } else {
- g_print ("No cpufreq support\n");
- return 1;
---- cpufreq/src/cpufreq-selector/Makefile.in.orig Tue Oct 4 00:21:25 2005
-+++ cpufreq/src/cpufreq-selector/Makefile.in Tue Oct 4 00:27:54 2005
-@@ -55,7 +55,7 @@
- PROGRAMS = $(bin_PROGRAMS)
- am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \
- cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \
-- main.$(OBJEXT)
-+ cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT)
- cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
- am__DEPENDENCIES_1 =
- cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1)
-@@ -64,6 +64,7 @@
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysfs.Po \
-+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysctl.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -332,6 +333,7 @@
- cpufreq.c cpufreq.h \
- cpufreq-sysfs.c cpufreq-sysfs.h \
- cpufreq-procfs.c cpufreq-procfs.h \
-+ cpufreq-sysctl.c cpufreq-sysctl.h \
- main.c
-
- cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt
-@@ -407,6 +409,7 @@
- -rm -f *.tab.c
-
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
diff --git a/x11/gnomeapplets2/files/patch-drivemount_drive-button.c b/x11/gnomeapplets2/files/patch-drivemount_drive-button.c
deleted file mode 100644
index f26e3121e..000000000
--- a/x11/gnomeapplets2/files/patch-drivemount_drive-button.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- drivemount/drive-button.c.orig Tue Aug 23 05:16:27 2005
-+++ drivemount/drive-button.c Tue Aug 23 20:37:43 2005
-@@ -24,6 +24,7 @@
- # include <config.h>
- #endif
-
-+#include <string.h>
- #include "drive-button.h"
- #include <glib/gi18n.h>
- #include <gdk/gdkkeysyms.h>
-@@ -710,11 +711,13 @@ run_command (DriveButton *self, const ch
-
- GList *volumes;
- GnomeVFSVolume *volume;
-+ char *uri;
-+ char *mount_path;
-
- volumes = gnome_vfs_drive_get_mounted_volumes (self->drive);
- volume = GNOME_VFS_VOLUME (volumes->data);
-- char *uri = gnome_vfs_volume_get_activation_uri (volume);
-- char *mount_path = gnome_vfs_get_local_path_from_uri (uri);
-+ uri = gnome_vfs_volume_get_activation_uri (volume);
-+ mount_path = gnome_vfs_get_local_path_from_uri (uri);
- g_free (uri);
-
- gnome_vfs_drive_get_display_name (self->drive);
-@@ -794,6 +797,11 @@ drive_button_ensure_popup (DriveButton *
- char *display_name, *tmp, *label;
- int action;
- GtkWidget *item;
-+ GList *volumes;
-+ GnomeVFSVolume *volume = NULL;
-+ GnomeVFSDeviceType volume_type;
-+ GCallback callback;
-+ const char *action_icon = GTK_STOCK_OPEN;
-
- if (self->popup_menu) return;
-
-@@ -869,8 +877,7 @@ drive_button_ensure_popup (DriveButton *
- g_free (display_name);
- display_name = tmp;
-
-- GCallback callback = G_CALLBACK (open_drive);
-- const char *action_icon = GTK_STOCK_OPEN;
-+ callback = G_CALLBACK (open_drive);
-
- switch (device_type) {
- case GNOME_VFS_DEVICE_TYPE_VIDEO_DVD:
diff --git a/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c b/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c
deleted file mode 100644
index 5abf18032..000000000
--- a/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- gswitchit/gswitchit-applet.c.orig Sun Aug 7 18:07:33 2005
-+++ gswitchit/gswitchit-applet.c Sun Aug 7 18:10:07 2005
-@@ -331,6 +331,10 @@ GSwitchItAppletPrepareDrawing (GSwitchIt
- XklConfigItem configItem;
- GtkWidget *align, *label;
- static GHashTable *shortDescrs = NULL;
-+ gpointer pcounter = NULL;
-+ char *prevLayoutName = NULL;
-+ char *labelTitle = NULL;
-+ int counter = 0;
- if (group == 0)
- shortDescrs = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, NULL);
-@@ -363,10 +367,6 @@ GSwitchItAppletPrepareDrawing (GSwitchIt
- if (layoutName == NULL)
- layoutName = g_strdup ("?");
-
-- gpointer pcounter = NULL;
-- char *prevLayoutName = NULL;
-- char *labelTitle = NULL;
-- int counter = 0;
- if (g_hash_table_lookup_extended (shortDescrs, layoutName,
- (gpointer*)&prevLayoutName, &pcounter))
- {
-@@ -599,6 +599,13 @@ GSwitchItAppletCmdPreview (BonoboUICompo
- groupsLevels, groupsLevels + 1, groupsLevels + 2, groupsLevels + 3 };
- XklState *xklState = XklGetCurrentState ();
- gpointer p = g_hash_table_lookup (globals.previewDialogs, GINT_TO_POINTER (xklState->group));
-+#ifdef HAVE_XKB
-+ GladeXML *gladeData;
-+ GtkWidget *dialog;
-+ GtkWidget *kbdraw;
-+ XkbComponentNamesRec componentNames;
-+ XklConfigRec xklData;
-+#endif
- if (p != NULL)
- {
- /* existing window */
-@@ -606,11 +613,10 @@ GSwitchItAppletCmdPreview (BonoboUICompo
- return;
- }
- #ifdef HAVE_XKB
-- GladeXML *gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL);
-- GtkWidget *dialog =
-+ gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL);
-+ dialog =
- glade_xml_get_widget (gladeData, "gswitchit_layout_view");
-- GtkWidget *kbdraw = keyboard_drawing_new ();
-- XkbComponentNamesRec componentNames;
-+ kbdraw = keyboard_drawing_new ();
-
- if (xklState->group >= 0 &&
- xklState->group < g_slist_length (globals.groupNames))
-@@ -624,7 +630,6 @@ GSwitchItAppletCmdPreview (BonoboUICompo
-
- keyboard_drawing_set_groups_levels (KEYBOARD_DRAWING (kbdraw), pGroupsLevels);
-
-- XklConfigRec xklData;
- XklConfigRecInit (&xklData);
- if (XklConfigGetFromServer (&xklData))
- {
diff --git a/x11/gnomeapplets2/files/patch-gweather_weather-iwin.c b/x11/gnomeapplets2/files/patch-gweather_weather-iwin.c
deleted file mode 100644
index e43dacef4..000000000
--- a/x11/gnomeapplets2/files/patch-gweather_weather-iwin.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- gweather/weather-iwin.c.orig Tue Dec 21 18:42:38 2004
-+++ gweather/weather-iwin.c Tue Dec 21 18:42:47 2004
-@@ -1,5 +1,6 @@
- /* $Id: patch-gweather_weather-iwin.c,v 1.3 2005-07-03 21:35:31 marcus Exp $ */
-
-+#include <sys/types.h>
- #include <regex.h>
- #include <gnome.h>
- #include "weather.h"
diff --git a/x11/gnomeapplets2/files/patch-mixer_applet.c b/x11/gnomeapplets2/files/patch-mixer_applet.c
deleted file mode 100644
index 178c7d5a3..000000000
--- a/x11/gnomeapplets2/files/patch-mixer_applet.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mixer/applet.c.orig Tue Oct 4 00:15:40 2005
-+++ mixer/applet.c Tue Oct 4 00:16:09 2005
-@@ -953,7 +953,7 @@ gnome_volume_applet_adjust_volume (GstMi
-
- volumes = g_new (gint, track->num_channels);
- for (n = 0; n < track->num_channels; n++)
-- volumes[n] = lrintf (volume);
-+ volumes[n] = (int)rint (volume);
- gst_mixer_set_volume (mixer, track, volumes);
- g_free (volumes);
- }
diff --git a/x11/gnomeapplets2/files/patch-modemlights_Makefile.in b/x11/gnomeapplets2/files/patch-modemlights_Makefile.in
deleted file mode 100644
index 874884722..000000000
--- a/x11/gnomeapplets2/files/patch-modemlights_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- modemlights/Makefile.in.orig Fri Jan 14 00:08:52 2005
-+++ modemlights/Makefile.in Fri Jan 14 00:09:20 2005
-@@ -319,6 +319,7 @@
- modem_applet_LDADD = \
- $(GNOME_APPLETS_LIBS) \
- $(LIBGLADE_LIBS) \
-+ -lutil \
- $(MODEMLIGHTS_LIBS)
-
- uidir = $(datadir)/gnome-2.0/ui
diff --git a/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c b/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c
deleted file mode 100644
index 718f52a0d..000000000
--- a/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- stickynotes/stickynotes_applet_callbacks.c.orig Wed Jul 13 18:57:03 2005
-+++ stickynotes/stickynotes_applet_callbacks.c Wed Jul 13 18:57:13 2005
-@@ -153,6 +153,7 @@ gboolean applet_check_click_on_desktop_c
- {
- static Window desktop_window = 0;
- static Display *dpy;
-+ XEvent event;
-
- if (desktop_window == 0) {
- desktop_window = get_desktop_window ();
-@@ -162,7 +163,6 @@ gboolean applet_check_click_on_desktop_c
- * at every click on the desktop */
- XSelectInput(dpy, desktop_window, PropertyChangeMask);
- }
-- XEvent event;
-
- if (XCheckWindowEvent(dpy, desktop_window, PropertyChangeMask, &event) == True) {
- stickynote_show_notes (FALSE);
diff --git a/x11/gnomeapplets2/pkg-descr b/x11/gnomeapplets2/pkg-descr
deleted file mode 100644
index 5f715cf9a..000000000
--- a/x11/gnomeapplets2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Panel applets for the Gnome 2.0 Desktop Environment.
-
-WWW: http://www.gnome.org/
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
deleted file mode 100644
index cc8600d5d..000000000
--- a/x11/gnomeapplets2/pkg-plist
+++ /dev/null
@@ -1,803 +0,0 @@
-%%CPUFREQ%%bin/cpufreq-selector
-bin/gswitchit-plugins-capplet
-%%BATTERY%%etc/sound/events/battstat_applet.soundlist
-include/libgswitchit/gswitchit_config.h
-include/libgswitchit/gswitchit_plugin.h
-libdata/bonobo/servers/GNOME_AccessxStatusApplet.server
-%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server
-libdata/bonobo/servers/GNOME_CDPlayerApplet.server
-%%CPUFREQ%%libdata/bonobo/servers/GNOME_CPUFreqApplet.server
-libdata/bonobo/servers/GNOME_CharpickerApplet.server
-libdata/bonobo/servers/GNOME_DriveMountApplet.server
-libdata/bonobo/servers/GNOME_GWeatherApplet_Factory.server
-libdata/bonobo/servers/GNOME_GeyesApplet.server
-libdata/bonobo/servers/GNOME_GtikApplet.server
-libdata/bonobo/servers/GNOME_KeyboardApplet.server
-libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server
-libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
-libdata/bonobo/servers/GNOME_MixerApplet.server
-libdata/bonobo/servers/GNOME_ModemLights.server
-libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
-libdata/bonobo/servers/GNOME_NullApplet_Factory.server
-libdata/bonobo/servers/GNOME_Panel_TrashApplet.server
-libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
-libdata/bonobo/servers/GNOME_StickyNotesApplet.server
-libdata/pkgconfig/gswitchit.pc
-libexec/accessx-status-applet
-%%BATTERY%%libexec/battstat-applet-2
-libexec/charpick_applet2
-%%CPUFREQ%%libexec/cpufreq-applet
-libexec/drivemount_applet2
-libexec/geyes_applet2
-libexec/gnome-applets/mc-install-default-macros
-libexec/gnome-keyboard-applet
-libexec/gtik2_applet2
-libexec/gweather-applet-2
-libexec/mini_commander_applet
-libexec/mixer_applet2
-libexec/modem_applet
-libexec/multiload-applet-2
-libexec/null_applet
-libexec/stickynotes_applet
-libexec/trashapplet
-share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml
-%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
-%%CPUFREQ%%share/gnome/gnome-2.0/ui/GNOME_CPUFreqApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml
-share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
-share/gnome/gnome-applets/geyes/Bizarre/Bizarre-eye.png
-share/gnome/gnome-applets/geyes/Bizarre/Bizarre-pupil.png
-share/gnome/gnome-applets/geyes/Bizarre/config
-share/gnome/gnome-applets/geyes/Bloodshot/Bloodshot-eye.png
-share/gnome/gnome-applets/geyes/Bloodshot/Bloodshot-pupil.png
-share/gnome/gnome-applets/geyes/Bloodshot/config
-share/gnome/gnome-applets/geyes/Default-tiny/Default-tiny-eye.png
-share/gnome/gnome-applets/geyes/Default-tiny/Default-tiny-pupil.png
-share/gnome/gnome-applets/geyes/Default-tiny/config
-share/gnome/gnome-applets/geyes/Default/Default-eye.png
-share/gnome/gnome-applets/geyes/Default/Default-pupil.png
-share/gnome/gnome-applets/geyes/Default/config
-share/gnome/gnome-applets/geyes/Horrid/config
-share/gnome/gnome-applets/geyes/Horrid/horrid_eye.png
-share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png
-%%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade
-%%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade
-share/gnome/gnome-applets/glade/gswitchit-plugins.glade
-share/gnome/gnome-applets/glade/gswitchit.glade
-share/gnome/gnome-applets/glade/mini-commander.glade
-share/gnome/gnome-applets/glade/modemlights.glade
-share/gnome/gnome-applets/glade/stickynotes.glade
-share/gnome/gnome-applets/glade/trashapplet.glade
-share/gnome/gnome-applets/gweather/Locations.xml
-share/gnome/gnome-applets/gweather/locations.dtd
-share/gnome/help/accessx-status/C/accessx-status.xml
-share/gnome/help/accessx-status/C/figures/accessx-status-applet.png
-share/gnome/help/accessx-status/C/figures/accessx-status-disabled.png
-share/gnome/help/accessx-status/C/figures/accessx_bounce-keys.png
-share/gnome/help/accessx-status/C/figures/accessx_mouse-keys.png
-share/gnome/help/accessx-status/C/figures/accessx_slow-keys.png
-share/gnome/help/accessx-status/C/figures/accessx_sticky-altGr-key.png
-share/gnome/help/accessx-status/C/figures/accessx_sticky-ctrl-key.png
-share/gnome/help/accessx-status/C/figures/accessx_sticky-keys.png
-share/gnome/help/accessx-status/C/figures/accessx_sticky-meta-key.png
-share/gnome/help/accessx-status/C/figures/accessx_sticky-shift-key.png
-share/gnome/help/accessx-status/C/figures/accessx_sticky-windows-key.png
-share/gnome/help/accessx-status/C/legal.xml
-share/gnome/help/accessx-status/es/accessx-status.xml
-share/gnome/help/accessx-status/es/figures/accessx-status-applet.png
-share/gnome/help/accessx-status/es/figures/accessx-status-disabled.png
-share/gnome/help/accessx-status/es/figures/accessx_bounce-keys.png
-share/gnome/help/accessx-status/es/figures/accessx_mouse-keys.png
-share/gnome/help/accessx-status/es/figures/accessx_slow-keys.png
-share/gnome/help/accessx-status/es/figures/accessx_sticky-altGr-key.png
-share/gnome/help/accessx-status/es/figures/accessx_sticky-ctrl-key.png
-share/gnome/help/accessx-status/es/figures/accessx_sticky-keys.png
-share/gnome/help/accessx-status/es/figures/accessx_sticky-meta-key.png
-share/gnome/help/accessx-status/es/figures/accessx_sticky-shift-key.png
-share/gnome/help/accessx-status/es/figures/accessx_sticky-windows-key.png
-share/gnome/help/accessx-status/fr/accessx-status.xml
-share/gnome/help/accessx-status/fr/figures/accessx-status-applet.png
-share/gnome/help/accessx-status/fr/figures/accessx-status-disabled.png
-share/gnome/help/accessx-status/fr/figures/accessx_bounce-keys.png
-share/gnome/help/accessx-status/fr/figures/accessx_mouse-keys.png
-share/gnome/help/accessx-status/fr/figures/accessx_slow-keys.png
-share/gnome/help/accessx-status/fr/figures/accessx_sticky-altGr-key.png
-share/gnome/help/accessx-status/fr/figures/accessx_sticky-ctrl-key.png
-share/gnome/help/accessx-status/fr/figures/accessx_sticky-keys.png
-share/gnome/help/accessx-status/fr/figures/accessx_sticky-meta-key.png
-share/gnome/help/accessx-status/fr/figures/accessx_sticky-shift-key.png
-share/gnome/help/accessx-status/fr/figures/accessx_sticky-windows-key.png
-share/gnome/help/accessx-status/uk/accessx-status.xml
-share/gnome/help/accessx-status/uk/figures/accessx-status-applet.png
-share/gnome/help/accessx-status/uk/figures/accessx-status-disabled.png
-share/gnome/help/accessx-status/uk/figures/accessx_bounce-keys.png
-share/gnome/help/accessx-status/uk/figures/accessx_mouse-keys.png
-share/gnome/help/accessx-status/uk/figures/accessx_slow-keys.png
-share/gnome/help/accessx-status/uk/figures/accessx_sticky-altGr-key.png
-share/gnome/help/accessx-status/uk/figures/accessx_sticky-ctrl-key.png
-share/gnome/help/accessx-status/uk/figures/accessx_sticky-keys.png
-share/gnome/help/accessx-status/uk/figures/accessx_sticky-meta-key.png
-share/gnome/help/accessx-status/uk/figures/accessx_sticky-shift-key.png
-share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
-%%BATTERY%%share/gnome/help/battstat/C/battstat.xml
-%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet-expanded.png
-%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png
-%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-credits-hal.png
-%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png
-%%BATTERY%%share/gnome/help/battstat/C/figures/context-menu.png
-%%BATTERY%%share/gnome/help/battstat/C/legal.xml
-%%BATTERY%%share/gnome/help/battstat/es/battstat.xml
-%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet-expanded.png
-%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png
-%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-credits-hal.png
-%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-preferences.png
-%%BATTERY%%share/gnome/help/battstat/es/figures/context-menu.png
-%%BATTERY%%share/gnome/help/battstat/uk/battstat.xml
-%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png
-%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet.png
-%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-credits-hal.png
-%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-preferences.png
-%%BATTERY%%share/gnome/help/battstat/uk/figures/context-menu.png
-share/gnome/help/char-palette/C/char-palette.xml
-share/gnome/help/char-palette/C/figures/charpalette_applet.png
-share/gnome/help/char-palette/C/figures/charpalette_chargroup.png
-share/gnome/help/char-palette/C/figures/charpick-preferences.png
-share/gnome/help/char-palette/C/figures/charpick_characters.png
-share/gnome/help/char-palette/C/legal.xml
-share/gnome/help/char-palette/es/char-palette.xml
-share/gnome/help/char-palette/es/figures/charpalette_applet.png
-share/gnome/help/char-palette/es/figures/charpalette_chargroup.png
-share/gnome/help/char-palette/es/figures/charpick-preferences.png
-share/gnome/help/char-palette/es/figures/charpick_characters.png
-share/gnome/help/char-palette/it/char-palette.xml
-share/gnome/help/char-palette/it/figures/charpalette_applet.png
-share/gnome/help/char-palette/it/figures/charpalette_chargroup.png
-share/gnome/help/char-palette/it/figures/charpick-preferences.png
-share/gnome/help/char-palette/it/figures/charpick_characters.png
-share/gnome/help/char-palette/nl/char-palette.xml
-share/gnome/help/char-palette/nl/figures/charpalette_applet.png
-share/gnome/help/char-palette/nl/figures/charpalette_chargroup.png
-share/gnome/help/char-palette/nl/figures/charpick-preferences.png
-share/gnome/help/char-palette/nl/figures/charpick_characters.png
-share/gnome/help/char-palette/pt_BR/char-palette.xml
-share/gnome/help/char-palette/pt_BR/figures/charpalette_applet.png
-share/gnome/help/char-palette/pt_BR/figures/charpalette_chargroup.png
-share/gnome/help/char-palette/pt_BR/figures/charpick-preferences.png
-share/gnome/help/char-palette/pt_BR/figures/charpick_characters.png
-share/gnome/help/char-palette/uk/char-palette.xml
-share/gnome/help/char-palette/uk/figures/charpalette_applet.png
-share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png
-share/gnome/help/char-palette/uk/figures/charpick-preferences.png
-share/gnome/help/char-palette/uk/figures/charpick_characters.png
-share/gnome/help/command-line/C/command-line.xml
-share/gnome/help/command-line/C/figures/command-line.png
-share/gnome/help/command-line/C/figures/prefs-macros.png
-share/gnome/help/command-line/C/figures/prefs.png
-share/gnome/help/command-line/C/legal.xml
-share/gnome/help/command-line/es/command-line.xml
-share/gnome/help/command-line/es/figures/command-line.png
-share/gnome/help/command-line/es/figures/prefs-macros.png
-share/gnome/help/command-line/es/figures/prefs.png
-share/gnome/help/command-line/pt_BR/command-line.xml
-share/gnome/help/command-line/pt_BR/figures/command-line.png
-share/gnome/help/command-line/pt_BR/figures/prefs-macros.png
-share/gnome/help/command-line/pt_BR/figures/prefs.png
-share/gnome/help/command-line/uk/command-line.xml
-share/gnome/help/command-line/uk/figures/command-line.png
-share/gnome/help/command-line/uk/figures/prefs-macros.png
-share/gnome/help/command-line/uk/figures/prefs.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-50.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-75.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences-smp.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector-both.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/cpufreq-applet.xml
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-100.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-25.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-50.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-75.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-preferences-smp.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-preferences.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector-both.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/cpufreq-applet.xml
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-100.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-25.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-50.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-75.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-preferences-smp.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-preferences.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector-both.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet.png
-share/gnome/help/drivemount/C/drivemount.xml
-share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png
-share/gnome/help/drivemount/C/figures/drivemount-applet_example.png
-share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png
-share/gnome/help/drivemount/C/figures/drivemount-applet_open.png
-share/gnome/help/drivemount/C/figures/drivemount-applet_status.png
-share/gnome/help/drivemount/C/legal.xml
-share/gnome/help/drivemount/es/drivemount.xml
-share/gnome/help/drivemount/es/figures/drivemount-applet_eject.png
-share/gnome/help/drivemount/es/figures/drivemount-applet_example.png
-share/gnome/help/drivemount/es/figures/drivemount-applet_mount.png
-share/gnome/help/drivemount/es/figures/drivemount-applet_open.png
-share/gnome/help/drivemount/es/figures/drivemount-applet_status.png
-share/gnome/help/drivemount/it/drivemount.xml
-share/gnome/help/drivemount/it/figures/drivemount-applet_eject.png
-share/gnome/help/drivemount/it/figures/drivemount-applet_example.png
-share/gnome/help/drivemount/it/figures/drivemount-applet_mount.png
-share/gnome/help/drivemount/it/figures/drivemount-applet_open.png
-share/gnome/help/drivemount/it/figures/drivemount-applet_status.png
-share/gnome/help/drivemount/pa/drivemount.xml
-share/gnome/help/drivemount/pa/figures/drivemount-applet_eject.png
-share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png
-share/gnome/help/drivemount/pa/figures/drivemount-applet_mount.png
-share/gnome/help/drivemount/pa/figures/drivemount-applet_open.png
-share/gnome/help/drivemount/pa/figures/drivemount-applet_status.png
-share/gnome/help/drivemount/uk/drivemount.xml
-share/gnome/help/drivemount/uk/figures/drivemount-applet_eject.png
-share/gnome/help/drivemount/uk/figures/drivemount-applet_example.png
-share/gnome/help/drivemount/uk/figures/drivemount-applet_mount.png
-share/gnome/help/drivemount/uk/figures/drivemount-applet_open.png
-share/gnome/help/drivemount/uk/figures/drivemount-applet_status.png
-share/gnome/help/geyes/C/figures/geyes_applet.png
-share/gnome/help/geyes/C/geyes.xml
-share/gnome/help/geyes/C/legal.xml
-share/gnome/help/geyes/es/figures/geyes_applet.png
-share/gnome/help/geyes/es/geyes.xml
-share/gnome/help/geyes/it/figures/geyes_applet.png
-share/gnome/help/geyes/it/geyes.xml
-share/gnome/help/geyes/uk/figures/geyes_applet.png
-share/gnome/help/geyes/uk/geyes.xml
-share/gnome/help/gswitchit/C/gswitchit.xml
-share/gnome/help/gswitchit/C/legal.xml
-share/gnome/help/gswitchit/es/gswitchit.xml
-share/gnome/help/gswitchit/fr/gswitchit.xml
-share/gnome/help/gswitchit/uk/gswitchit.xml
-share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png
-share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
-share/gnome/help/gtik2_applet2/C/legal.xml
-share/gnome/help/gtik2_applet2/es/figures/gtik_applet.png
-share/gnome/help/gtik2_applet2/es/gtik2_applet2.xml
-share/gnome/help/gtik2_applet2/uk/figures/gtik_applet.png
-share/gnome/help/gtik2_applet2/uk/gtik2_applet2.xml
-share/gnome/help/gweather/C/figures/gweather-details.png
-share/gnome/help/gweather/C/figures/gweather-menu-prefs.png
-share/gnome/help/gweather/C/figures/gweather-prefs-general.png
-share/gnome/help/gweather/C/figures/gweather-prefs-locations.png
-share/gnome/help/gweather/C/figures/gweather_applet.png
-share/gnome/help/gweather/C/figures/stock_weather-cloudy.png
-share/gnome/help/gweather/C/figures/stock_weather-few-clouds.png
-share/gnome/help/gweather/C/figures/stock_weather-fog.png
-share/gnome/help/gweather/C/figures/stock_weather-night-clear.png
-share/gnome/help/gweather/C/figures/stock_weather-night-few-clouds.png
-share/gnome/help/gweather/C/figures/stock_weather-showers.png
-share/gnome/help/gweather/C/figures/stock_weather-snow.png
-share/gnome/help/gweather/C/figures/stock_weather-storm.png
-share/gnome/help/gweather/C/figures/stock_weather-sunny.png
-share/gnome/help/gweather/C/gweather.xml
-share/gnome/help/gweather/C/legal.xml
-share/gnome/help/gweather/es/figures/gweather-details.png
-share/gnome/help/gweather/es/figures/gweather-menu-prefs.png
-share/gnome/help/gweather/es/figures/gweather-prefs-general.png
-share/gnome/help/gweather/es/figures/gweather-prefs-locations.png
-share/gnome/help/gweather/es/figures/gweather_applet.png
-share/gnome/help/gweather/es/figures/stock_weather-cloudy.png
-share/gnome/help/gweather/es/figures/stock_weather-few-clouds.png
-share/gnome/help/gweather/es/figures/stock_weather-fog.png
-share/gnome/help/gweather/es/figures/stock_weather-night-clear.png
-share/gnome/help/gweather/es/figures/stock_weather-night-few-clouds.png
-share/gnome/help/gweather/es/figures/stock_weather-showers.png
-share/gnome/help/gweather/es/figures/stock_weather-snow.png
-share/gnome/help/gweather/es/figures/stock_weather-storm.png
-share/gnome/help/gweather/es/figures/stock_weather-sunny.png
-share/gnome/help/gweather/es/gweather.xml
-share/gnome/help/gweather/uk/figures/gweather-details.png
-share/gnome/help/gweather/uk/figures/gweather-menu-prefs.png
-share/gnome/help/gweather/uk/figures/gweather-prefs-general.png
-share/gnome/help/gweather/uk/figures/gweather-prefs-locations.png
-share/gnome/help/gweather/uk/figures/gweather_applet.png
-share/gnome/help/gweather/uk/figures/stock_weather-cloudy.png
-share/gnome/help/gweather/uk/figures/stock_weather-few-clouds.png
-share/gnome/help/gweather/uk/figures/stock_weather-fog.png
-share/gnome/help/gweather/uk/figures/stock_weather-night-clear.png
-share/gnome/help/gweather/uk/figures/stock_weather-night-few-clouds.png
-share/gnome/help/gweather/uk/figures/stock_weather-showers.png
-share/gnome/help/gweather/uk/figures/stock_weather-snow.png
-share/gnome/help/gweather/uk/figures/stock_weather-storm.png
-share/gnome/help/gweather/uk/figures/stock_weather-sunny.png
-share/gnome/help/gweather/uk/gweather.xml
-share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
-share/gnome/help/mixer_applet2/C/legal.xml
-share/gnome/help/mixer_applet2/C/mixer_applet2.xml
-share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png
-share/gnome/help/mixer_applet2/es/mixer_applet2.xml
-share/gnome/help/mixer_applet2/uk/figures/volumecontrol_applet.png
-share/gnome/help/mixer_applet2/uk/mixer_applet2.xml
-share/gnome/help/multiload/C/figures/multiload-preferences.png
-share/gnome/help/multiload/C/figures/system-monitor-applet_window.png
-share/gnome/help/multiload/C/figures/system_monitor.png
-share/gnome/help/multiload/C/legal.xml
-share/gnome/help/multiload/C/multiload.xml
-share/gnome/help/multiload/es/figures/multiload-preferences.png
-share/gnome/help/multiload/es/figures/system-monitor-applet_window.png
-share/gnome/help/multiload/es/figures/system_monitor.png
-share/gnome/help/multiload/es/multiload.xml
-share/gnome/help/multiload/uk/figures/multiload-preferences.png
-share/gnome/help/multiload/uk/figures/system-monitor-applet_window.png
-share/gnome/help/multiload/uk/figures/system_monitor.png
-share/gnome/help/multiload/uk/multiload.xml
-share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu-lock.png
-share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu-new.png
-share/gnome/help/stickynotes_applet/C/figures/stickynotes-note-prefs.png
-share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png
-share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png
-share/gnome/help/stickynotes_applet/C/legal.xml
-share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
-share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-lock.png
-share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-new.png
-share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png
-share/gnome/help/stickynotes_applet/es/figures/stickynotes-prefs.png
-share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png
-share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml
-share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-lock.png
-share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-new.png
-share/gnome/help/stickynotes_applet/uk/figures/stickynotes-note-prefs.png
-share/gnome/help/stickynotes_applet/uk/figures/stickynotes-prefs.png
-share/gnome/help/stickynotes_applet/uk/figures/stickynotes_applet.png
-share/gnome/help/stickynotes_applet/uk/stickynotes_applet.xml
-share/gnome/help/trashapplet/C/figures/trash-applet.png
-share/gnome/help/trashapplet/C/legal.xml
-share/gnome/help/trashapplet/C/trashapplet.xml
-share/gnome/help/trashapplet/es/figures/trash-applet.png
-share/gnome/help/trashapplet/es/trashapplet.xml
-share/gnome/help/trashapplet/fr/figures/trash-applet.png
-share/gnome/help/trashapplet/fr/trashapplet.xml
-share/gnome/help/trashapplet/it/figures/trash-applet.png
-share/gnome/help/trashapplet/it/trashapplet.xml
-share/gnome/help/trashapplet/pa/figures/trash-applet.png
-share/gnome/help/trashapplet/pa/trashapplet.xml
-share/gnome/help/trashapplet/uk/figures/trash-applet.png
-share/gnome/help/trashapplet/uk/trashapplet.xml
-share/gnome/omf/accessx-status/accessx-status-C.omf
-share/gnome/omf/accessx-status/accessx-status-es.omf
-share/gnome/omf/accessx-status/accessx-status-fr.omf
-share/gnome/omf/accessx-status/accessx-status-uk.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-C.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-es.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf
-share/gnome/omf/char-palette/char-palette-C.omf
-share/gnome/omf/char-palette/char-palette-es.omf
-share/gnome/omf/char-palette/char-palette-it.omf
-share/gnome/omf/char-palette/char-palette-nl.omf
-share/gnome/omf/char-palette/char-palette-pt_BR.omf
-share/gnome/omf/char-palette/char-palette-uk.omf
-share/gnome/omf/command-line/command-line-C.omf
-share/gnome/omf/command-line/command-line-es.omf
-share/gnome/omf/command-line/command-line-pt_BR.omf
-share/gnome/omf/command-line/command-line-uk.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf
-share/gnome/omf/drivemount/drivemount-C.omf
-share/gnome/omf/drivemount/drivemount-es.omf
-share/gnome/omf/drivemount/drivemount-it.omf
-share/gnome/omf/drivemount/drivemount-pa.omf
-share/gnome/omf/drivemount/drivemount-uk.omf
-share/gnome/omf/geyes/geyes-C.omf
-share/gnome/omf/geyes/geyes-es.omf
-share/gnome/omf/geyes/geyes-it.omf
-share/gnome/omf/geyes/geyes-uk.omf
-share/gnome/omf/gswitchit/gswitchit-C.omf
-share/gnome/omf/gswitchit/gswitchit-es.omf
-share/gnome/omf/gswitchit/gswitchit-fr.omf
-share/gnome/omf/gswitchit/gswitchit-uk.omf
-share/gnome/omf/gtik2_applet2/gtik2_applet2-C.omf
-share/gnome/omf/gtik2_applet2/gtik2_applet2-es.omf
-share/gnome/omf/gtik2_applet2/gtik2_applet2-uk.omf
-share/gnome/omf/gweather/gweather-C.omf
-share/gnome/omf/gweather/gweather-es.omf
-share/gnome/omf/gweather/gweather-uk.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-C.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-es.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf
-share/gnome/omf/multiload/multiload-C.omf
-share/gnome/omf/multiload/multiload-es.omf
-share/gnome/omf/multiload/multiload-uk.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf
-share/gnome/omf/trashapplet/trashapplet-C.omf
-share/gnome/omf/trashapplet/trashapplet-es.omf
-share/gnome/omf/trashapplet/trashapplet-fr.omf
-share/gnome/omf/trashapplet/trashapplet-it.omf
-share/gnome/omf/trashapplet/trashapplet-pa.omf
-share/gnome/omf/trashapplet/trashapplet-uk.omf
-share/gnome/pixmaps/accessx-status-applet/ax-applet.png
-share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-base.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-inverse.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-no.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-none.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-yes.png
-share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-no.png
-share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-pending.png
-share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-yes.png
-share/gnome/pixmaps/accessx-status-applet/ax-slowkeys.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-base.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-default-left.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-default-middle.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-default-right.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-left.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-middle.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-right.png
-share/gnome/pixmaps/accessx-status-applet/sticky-alt-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-alt-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-alt-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-hyper-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-hyper-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-hyper-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-meta-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-meta-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-meta-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-shift-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-shift-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-shift-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-super-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-super-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-super-none.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-100.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-25.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-50.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-75.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-applet.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-na.png
-share/gnome/pixmaps/stickynotes/close.png
-share/gnome/pixmaps/stickynotes/locked.png
-share/gnome/pixmaps/stickynotes/resize_se.png
-share/gnome/pixmaps/stickynotes/resize_sw.png
-share/gnome/pixmaps/stickynotes/stickynotes.png
-share/gnome/pixmaps/stickynotes/stickynotes_prelight.png
-share/gnome/pixmaps/stickynotes/unlocked.png
-share/gnome/xmodmap/base.xml
-share/gnome/xmodmap/xmodmap.am
-share/gnome/xmodmap/xmodmap.ar
-share/gnome/xmodmap/xmodmap.be
-share/gnome/xmodmap/xmodmap.bg
-share/gnome/xmodmap/xmodmap.br
-share/gnome/xmodmap/xmodmap.ch
-share/gnome/xmodmap/xmodmap.ch_de
-share/gnome/xmodmap/xmodmap.ch_fr
-share/gnome/xmodmap/xmodmap.cz
-share/gnome/xmodmap/xmodmap.de
-share/gnome/xmodmap/xmodmap.de-apple
-share/gnome/xmodmap/xmodmap.dk
-share/gnome/xmodmap/xmodmap.dvorak
-share/gnome/xmodmap/xmodmap.ee
-share/gnome/xmodmap/xmodmap.es
-share/gnome/xmodmap/xmodmap.es_x86
-share/gnome/xmodmap/xmodmap.fi
-share/gnome/xmodmap/xmodmap.fr
-share/gnome/xmodmap/xmodmap.fr-2
-share/gnome/xmodmap/xmodmap.fr_x86
-share/gnome/xmodmap/xmodmap.gb
-share/gnome/xmodmap/xmodmap.gb-102
-share/gnome/xmodmap/xmodmap.gb-105
-share/gnome/xmodmap/xmodmap.ge_la
-share/gnome/xmodmap/xmodmap.ge_ru
-share/gnome/xmodmap/xmodmap.gr
-share/gnome/xmodmap/xmodmap.hu
-share/gnome/xmodmap/xmodmap.hu-101-lat1
-share/gnome/xmodmap/xmodmap.hu-101-lat2
-share/gnome/xmodmap/xmodmap.hu-ibm
-share/gnome/xmodmap/xmodmap.hu-lat1
-share/gnome/xmodmap/xmodmap.hu-sun-lat2
-share/gnome/xmodmap/xmodmap.hu.old
-share/gnome/xmodmap/xmodmap.hu_latin1
-share/gnome/xmodmap/xmodmap.hu_x86
-share/gnome/xmodmap/xmodmap.il
-share/gnome/xmodmap/xmodmap.il_phonetic
-share/gnome/xmodmap/xmodmap.is
-share/gnome/xmodmap/xmodmap.it
-share/gnome/xmodmap/xmodmap.jp
-share/gnome/xmodmap/xmodmap.kr
-share/gnome/xmodmap/xmodmap.la
-share/gnome/xmodmap/xmodmap.lt
-share/gnome/xmodmap/xmodmap.lt_b
-share/gnome/xmodmap/xmodmap.lt_p
-share/gnome/xmodmap/xmodmap.mk
-share/gnome/xmodmap/xmodmap.mn
-share/gnome/xmodmap/xmodmap.mn-phonet
-share/gnome/xmodmap/xmodmap.mn-rev
-share/gnome/xmodmap/xmodmap.mn-uni
-share/gnome/xmodmap/xmodmap.nl
-share/gnome/xmodmap/xmodmap.no
-share/gnome/xmodmap/xmodmap.pl
-share/gnome/xmodmap/xmodmap.pl2
-share/gnome/xmodmap/xmodmap.pt
-share/gnome/xmodmap/xmodmap.pt-dead
-share/gnome/xmodmap/xmodmap.qc
-share/gnome/xmodmap/xmodmap.qc-2
-share/gnome/xmodmap/xmodmap.ro
-share/gnome/xmodmap/xmodmap.ru
-share/gnome/xmodmap/xmodmap.ru-rev
-share/gnome/xmodmap/xmodmap.ru_yawerty
-share/gnome/xmodmap/xmodmap.se
-share/gnome/xmodmap/xmodmap.sf
-share/gnome/xmodmap/xmodmap.sg
-share/gnome/xmodmap/xmodmap.si
-share/gnome/xmodmap/xmodmap.sk
-share/gnome/xmodmap/xmodmap.th
-share/gnome/xmodmap/xmodmap.tr_f
-share/gnome/xmodmap/xmodmap.tr_q
-share/gnome/xmodmap/xmodmap.uk
-share/gnome/xmodmap/xmodmap.uk_x86
-share/gnome/xmodmap/xmodmap.us
-share/gnome/xmodmap/xmodmap.us-101
-share/gnome/xmodmap/xmodmap.us-84
-share/gnome/xmodmap/xmodmap.us-dec
-share/gnome/xmodmap/xmodmap.us-ibm
-share/gnome/xmodmap/xmodmap.us-int
-share/gnome/xmodmap/xmodmap.us-mac
-share/gnome/xmodmap/xmodmap.us-sgi-101
-share/gnome/xmodmap/xmodmap.us-sun
-share/gnome/xmodmap/xmodmap.us.old
-share/gnome/xmodmap/xmodmap.us101A_x86
-share/gnome/xmodmap/xmodmap.us_intl
-share/gnome/xmodmap/xmodmap.yu
-share/icons/hicolor/48x48/apps/ax-applet.png
-share/icons/hicolor/48x48/apps/charpick.png
-share/icons/hicolor/48x48/apps/gnome-cpu.png
-share/icons/hicolor/48x48/apps/gnome-eyes.png
-share/icons/hicolor/48x48/apps/gnome-mini-commander.png
-share/icons/hicolor/48x48/apps/gnome-modem.png
-share/icons/hicolor/48x48/apps/gnome-money.png
-share/icons/hicolor/48x48/apps/gswitchit-applet.png
-share/icons/hicolor/48x48/apps/gswitchit-properties-capplet.png
-share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/bs/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/da/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/de/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/et/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/eu/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/fa/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/fi/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/fr/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/ga/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/gu/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/hy/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/id/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/ne/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/no/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/pa/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/pl/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/pt/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/ro/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/ru/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/rw/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/sk/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/sl/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/sq/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/te/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
-@unexec /bin/rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/xh 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/te 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true
-@dirrm share/gnome/pixmaps/stickynotes
-%%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet
-@dirrm share/gnome/pixmaps/accessx-status-applet
-@dirrm share/gnome/omf/trashapplet
-@dirrm share/gnome/omf/stickynotes_applet
-@dirrm share/gnome/omf/multiload
-@dirrm share/gnome/omf/mixer_applet2
-@dirrm share/gnome/omf/gweather
-@dirrm share/gnome/omf/gtik2_applet2
-@dirrm share/gnome/omf/gswitchit
-@dirrm share/gnome/omf/geyes
-@dirrm share/gnome/omf/drivemount
-%%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet
-@dirrm share/gnome/omf/command-line
-@dirrm share/gnome/omf/char-palette
-%%BATTERY%%@dirrm share/gnome/omf/battstat
-@dirrm share/gnome/omf/accessx-status
-@dirrm share/gnome/help/trashapplet/uk/figures
-@dirrm share/gnome/help/trashapplet/uk
-@dirrm share/gnome/help/trashapplet/pa/figures
-@dirrm share/gnome/help/trashapplet/pa
-@dirrm share/gnome/help/trashapplet/fr/figures
-@dirrm share/gnome/help/trashapplet/fr
-@dirrm share/gnome/help/trashapplet/it/figures
-@dirrm share/gnome/help/trashapplet/it
-@dirrm share/gnome/help/trashapplet/es/figures
-@dirrm share/gnome/help/trashapplet/es
-@dirrm share/gnome/help/trashapplet/C/figures
-@dirrm share/gnome/help/trashapplet/C
-@dirrm share/gnome/help/trashapplet
-@dirrm share/gnome/help/stickynotes_applet/uk/figures
-@dirrm share/gnome/help/stickynotes_applet/uk
-@dirrm share/gnome/help/stickynotes_applet/es/figures
-@dirrm share/gnome/help/stickynotes_applet/es
-@dirrm share/gnome/help/stickynotes_applet/C/figures
-@dirrm share/gnome/help/stickynotes_applet/C
-@dirrm share/gnome/help/stickynotes_applet
-@dirrm share/gnome/help/multiload/uk/figures
-@dirrm share/gnome/help/multiload/uk
-@dirrm share/gnome/help/multiload/es/figures
-@dirrm share/gnome/help/multiload/es
-@dirrm share/gnome/help/multiload/C/figures
-@dirrm share/gnome/help/multiload/C
-@dirrm share/gnome/help/multiload
-@dirrm share/gnome/help/mixer_applet2/uk/figures
-@dirrm share/gnome/help/mixer_applet2/uk
-@dirrm share/gnome/help/mixer_applet2/es/figures
-@dirrm share/gnome/help/mixer_applet2/es
-@dirrm share/gnome/help/mixer_applet2/C/figures
-@dirrm share/gnome/help/mixer_applet2/C
-@dirrm share/gnome/help/mixer_applet2
-@dirrm share/gnome/help/gweather/uk/figures
-@dirrm share/gnome/help/gweather/uk
-@dirrm share/gnome/help/gweather/es/figures
-@dirrm share/gnome/help/gweather/es
-@dirrm share/gnome/help/gweather/C/figures
-@dirrm share/gnome/help/gweather/C
-@dirrm share/gnome/help/gweather
-@dirrm share/gnome/help/gtik2_applet2/uk/figures
-@dirrm share/gnome/help/gtik2_applet2/uk
-@dirrm share/gnome/help/gtik2_applet2/es/figures
-@dirrm share/gnome/help/gtik2_applet2/es
-@dirrm share/gnome/help/gtik2_applet2/C/figures
-@dirrm share/gnome/help/gtik2_applet2/C
-@dirrm share/gnome/help/gtik2_applet2
-@dirrm share/gnome/help/gswitchit/uk
-@dirrm share/gnome/help/gswitchit/fr
-@dirrm share/gnome/help/gswitchit/es
-@dirrm share/gnome/help/gswitchit/C
-@dirrm share/gnome/help/gswitchit
-@dirrm share/gnome/help/geyes/uk/figures
-@dirrm share/gnome/help/geyes/uk
-@dirrm share/gnome/help/geyes/it/figures
-@dirrm share/gnome/help/geyes/it
-@dirrm share/gnome/help/geyes/es/figures
-@dirrm share/gnome/help/geyes/es
-@dirrm share/gnome/help/geyes/C/figures
-@dirrm share/gnome/help/geyes/C
-@dirrm share/gnome/help/geyes
-@dirrm share/gnome/help/drivemount/uk/figures
-@dirrm share/gnome/help/drivemount/uk
-@dirrm share/gnome/help/drivemount/pa/figures
-@dirrm share/gnome/help/drivemount/pa
-@dirrm share/gnome/help/drivemount/it/figures
-@dirrm share/gnome/help/drivemount/it
-@dirrm share/gnome/help/drivemount/es/figures
-@dirrm share/gnome/help/drivemount/es
-@dirrm share/gnome/help/drivemount/C/figures
-@dirrm share/gnome/help/drivemount/C
-@dirrm share/gnome/help/drivemount
-%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures
-%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk
-%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es/figures
-%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es
-%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures
-%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C
-%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
-@dirrm share/gnome/help/command-line/uk/figures
-@dirrm share/gnome/help/command-line/uk
-@dirrm share/gnome/help/command-line/pt_BR/figures
-@dirrm share/gnome/help/command-line/pt_BR
-@dirrm share/gnome/help/command-line/es/figures
-@dirrm share/gnome/help/command-line/es
-@dirrm share/gnome/help/command-line/C/figures
-@dirrm share/gnome/help/command-line/C
-@dirrm share/gnome/help/command-line
-@dirrm share/gnome/help/char-palette/uk/figures
-@dirrm share/gnome/help/char-palette/uk
-@dirrm share/gnome/help/char-palette/pt_BR/figures
-@dirrm share/gnome/help/char-palette/pt_BR
-@dirrm share/gnome/help/char-palette/nl/figures
-@dirrm share/gnome/help/char-palette/nl
-@dirrm share/gnome/help/char-palette/it/figures
-@dirrm share/gnome/help/char-palette/it
-@dirrm share/gnome/help/char-palette/es/figures
-@dirrm share/gnome/help/char-palette/es
-@dirrm share/gnome/help/char-palette/C/figures
-@dirrm share/gnome/help/char-palette/C
-@dirrm share/gnome/help/char-palette
-%%BATTERY%%@dirrm share/gnome/help/battstat/uk/figures
-%%BATTERY%%@dirrm share/gnome/help/battstat/uk
-%%BATTERY%%@dirrm share/gnome/help/battstat/es/figures
-%%BATTERY%%@dirrm share/gnome/help/battstat/es
-%%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
-%%BATTERY%%@dirrm share/gnome/help/battstat/C
-%%BATTERY%%@dirrm share/gnome/help/battstat
-@dirrm share/gnome/help/accessx-status/uk/figures
-@dirrm share/gnome/help/accessx-status/uk
-@dirrm share/gnome/help/accessx-status/fr/figures
-@dirrm share/gnome/help/accessx-status/fr
-@dirrm share/gnome/help/accessx-status/es/figures
-@dirrm share/gnome/help/accessx-status/es
-@dirrm share/gnome/help/accessx-status/C/figures
-@dirrm share/gnome/help/accessx-status/C
-@dirrm share/gnome/help/accessx-status
-@dirrm share/gnome/gnome-applets/gweather
-@dirrm share/gnome/gnome-applets/glade
-@dirrm share/gnome/gnome-applets/geyes/Horrid
-@dirrm share/gnome/gnome-applets/geyes/Default-tiny
-@dirrm share/gnome/gnome-applets/geyes/Default
-@dirrm share/gnome/gnome-applets/geyes/Bloodshot
-@dirrm share/gnome/gnome-applets/geyes/Bizarre
-@dirrm share/gnome/gnome-applets/geyes
-@dirrm share/gnome/gnome-applets
-@dirrm libexec/gnome-applets
-@dirrm include/libgswitchit