Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

6 files changed, 57 insertions, 477 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index a28b5926035f..db2138760fbb 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.0.11
+PORTVERSION=	2.2.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-panel/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-panel/2.2
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck \
-		gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
+LIB_DEPENDS=	wnck-1.9:${PORTSDIR}/x11-toolkits/libwnck \
+		gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
+USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 66c1e6cb333f..e6e3514326ed 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.0.11.tar.bz2) = 27345e392e336df85ca4fe44af90a3f4
+MD5 (gnome2/gnome-panel-2.2.0.1.tar.bz2) = cd8a74425cadadc8d10ab1fe5e9e3fe8
diff --git a/x11/gnome-panel/files/patch-config.h.in b/x11/gnome-panel/files/patch-config.h.in
index cb37ef76389a..8a59166a57b7 100644
--- a/x11/gnome-panel/files/patch-config.h.in
+++ b/x11/gnome-panel/files/patch-config.h.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- config.h.in	2002/05/14 14:15:00	1.1
-+++ config.h.in	2002/05/14 14:15:35
-@@ -148,6 +148,8 @@
- /* Define if you have the `strdup' function. */
- #undef HAVE_STRDUP
+--- config.h.in.orig	Thu Jan  2 19:50:41 2003
++++ config.h.in	Mon Jan  6 13:11:12 2003
+@@ -96,6 +96,8 @@
+ /* Define to 1 if you have the <stdlib.h> header file. */
+ #undef HAVE_STDLIB_H
  
 +#undef HAVE_LANGINFO_H
 +
- /* Define if you have the <strings.h> header file. */
+ /* Define to 1 if you have the <strings.h> header file. */
  #undef HAVE_STRINGS_H
  
diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure
index 89007e07bc69..a94d4761c395 100644
--- a/x11/gnome-panel/files/patch-configure
+++ b/x11/gnome-panel/files/patch-configure
@@ -1,22 +1,19 @@
-
-$FreeBSD$
-
---- configure.orig	Tue May 14 17:16:32 2002
-+++ configure	Tue May 14 17:17:03 2002
-@@ -7232,6 +7232,7 @@
+--- configure.orig	Mon Jan  6 01:04:20 2003
++++ configure	Mon Jan  6 13:12:56 2003
+@@ -4254,7 +4254,7 @@
  
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9288,7 +9289,7 @@
- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
  
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 -                  inttypes.h stdint.h unistd.h
 +                  inttypes.h stdint.h unistd.h langinfo.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:9294: checking for $ac_header" >&5
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+@@ -7878,6 +7878,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnome-panel/files/patch-temp b/x11/gnome-panel/files/patch-temp
deleted file mode 100644
index a863cbbc8bd9..000000000000
--- a/x11/gnome-panel/files/patch-temp
+++ /dev/null
@@ -1,441 +0,0 @@
-This patch reverts fully rev.1.50 of xstuff.c and rev.1.22 of xstuff.h, as
-well as partially rev.1.302 of session.c and rev.1.176 of basep-widget.c.
-The goal is to make Nautilus recognizing presence of the panel on screen,
-so that it doesn't put its icons under the panel(s). For some reason,
-advertized in ChangeLog _NET_WM_WORKAREA isn't recognised by Nautilus-2.0.0
-available at this time.
-
---- gnome-panel/xstuff.c.orig	Sun Aug  4 18:30:21 2002
-+++ gnome-panel/xstuff.c	Thu Aug  8 22:19:15 2002
-@@ -8,46 +8,97 @@
-  *          Mark McLoughlin <mark@skynet.ie>
-  */
- #include <config.h>
--#include <string.h>
--
--#include <gdk/gdk.h>
- #include <gdk/gdkx.h>
-+#include <string.h>
- 
-+#include <X11/Xmd.h>
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
- 
--#include "xstuff.h"
-+/* Yes, yes I know, now bugger off ... */
-+#define WNCK_I_KNOW_THIS_IS_UNSTABLE
-+#include <libwnck/libwnck.h>
- 
-+#include "xstuff.h"
-+#include "multiscreen-stuff.h"
-+#include "basep-widget.h"
-+#include "foobar-widget.h"
- #include "global-keys.h"
- 
--static Atom
--panel_atom_get (Display    *display,
--		const char *atom_name)
-+/*list of all panel widgets created*/
-+extern GSList *panel_list;
-+
-+static void xstuff_setup_global_desktop_area (int left, int right,
-+					int top, int bottom);
-+
-+#define ATOM(name) xstuff_atom_intern(GDK_DISPLAY(),name)
-+/* Once we have multiple display support we need to only use
-+ * the below ones */
-+
-+#define ATOMD(display,name) xstuff_atom_intern(display,name)
-+#define ATOMEV(event,name) xstuff_atom_intern(((XAnyEvent *)event)->display,name)
-+#define ATOMGDK(win,name) xstuff_atom_intern(GDK_WINDOW_XDISPLAY(win),name)
-+
-+Atom
-+xstuff_atom_intern (Display *display, const char *name)
- {
--	static GHashTable *atom_hash;
--	Atom               retval;
-+	static GHashTable *cache = NULL;
-+	char *key;
-+	Atom atom;
- 
- 	g_return_val_if_fail (display != NULL, None);
--	g_return_val_if_fail (atom_name != NULL, None);
-+	g_return_val_if_fail (name != NULL, None);
-+
-+	if (cache == 0)
-+	    cache = g_hash_table_new (g_str_hash, g_str_equal);
- 
--	if (!atom_hash)
--		atom_hash = g_hash_table_new_full (
--				g_str_hash, g_str_equal, g_free, NULL);
--
--	retval = GPOINTER_TO_UINT (g_hash_table_lookup (atom_hash, atom_name));
--	if (!retval) {
--		retval = XInternAtom (display, atom_name, FALSE);
--
--		if (retval != None)
--			g_hash_table_insert (atom_hash, g_strdup (atom_name),
--					     GUINT_TO_POINTER (retval));
-+	key = g_strdup_printf ("%p %s", display, name);
-+
-+	atom = (Atom)g_hash_table_lookup (cache, key);
-+	if (atom == 0) {
-+	    	atom = XInternAtom (display, name, False);
-+		g_hash_table_insert (cache, key, (gpointer)atom);
-+	} else {
-+	   	g_free (key);
- 	}
- 
--	return retval;
-+    	return atom;
-+}
-+
-+void
-+xstuff_init (void)
-+{
-+       /* setup the keys filter */
-+       gdk_window_add_filter (gdk_get_default_root_window (),
-+                              panel_global_keys_filter,
-+                              NULL);
-+
-+       gdk_error_trap_push ();
-+
-+       xstuff_setup_global_desktop_area (0, 0, 0, 0);
-+
-+       gdk_error_trap_pop ();
-+}
-+
-+void
-+xstuff_set_simple_hint (GdkWindow *w, const char *name, long val)
-+{
-+       Atom atom = ATOMGDK (w, name);
-+
-+       gdk_error_trap_push ();
-+
-+       XChangeProperty (GDK_DISPLAY (),
-+                        GDK_WINDOW_XWINDOW (w),
-+                        atom, atom,
-+                        32, PropModeReplace,
-+                        (unsigned char*)&val, 1);
-+
-+       gdk_flush ();
-+       gdk_error_trap_pop ();
- }
- 
- /* Stolen from deskguide */
--static gpointer
-+gpointer
- get_typed_property_data (Display *xdisplay,
- 			 Window   xwindow,
- 			 Atom     property,
-@@ -156,7 +207,7 @@
-         
- 	data = get_typed_property_data (GDK_DISPLAY (),
- 					GDK_ROOT_WINDOW (),
--					panel_atom_get (GDK_DISPLAY (), "_NET_SUPPORTED"),
-+					ATOM ("_NET_SUPPORTED"),
- 					XA_ATOM,
- 					&size, 32);
- 	if (data != NULL) {
-@@ -176,11 +227,9 @@
- 
- 	XDeleteProperty (GDK_WINDOW_XDISPLAY (win),
- 			 GDK_WINDOW_XWINDOW (win),
--			 panel_atom_get (GDK_WINDOW_XDISPLAY (win),
--					 "WM_CLIENT_LEADER"));
-+			 ATOMGDK (win, "WM_CLIENT_LEADER"));
- 
--	old_wmhints = XGetWMHints (GDK_WINDOW_XDISPLAY (win),
--				   GDK_WINDOW_XWINDOW (win));
-+	old_wmhints = XGetWMHints (GDK_DISPLAY (), GDK_WINDOW_XWINDOW (win));
- 	/* General paranoia */
- 	if (old_wmhints != NULL) {
- 		memcpy (&wmhints, old_wmhints, sizeof (XWMHints));
-@@ -197,16 +246,124 @@
- 		wmhints.input = False;
- 		wmhints.initial_state = NormalState;
- 	}
--
--	XSetWMHints (GDK_WINDOW_XDISPLAY (win),
-+	XSetWMHints (GDK_DISPLAY (),
- 		     GDK_WINDOW_XWINDOW (win),
- 		     &wmhints);
- }
- 
-+
-+static void
-+xstuff_setup_global_desktop_area (int left, int right, int top, int bottom)
-+{
-+       long vals[4];
-+       static int old_left = -1, old_right = -1, old_top = -1, old_bottom = -1;+
-+       left = left >= 0 ? left : old_left;
-+       right = right >= 0 ? right : old_right;
-+       top = top >= 0 ? top : old_top;
-+       bottom = bottom >= 0 ? bottom : old_bottom;
-+
-+      if (old_left == left &&
-+           old_right == right &&
-+           old_top == top &&
-+           old_bottom == bottom)
-+               return;
-+
-+       vals[0] = left;
-+       vals[1] = right;
-+       vals[2] = top;
-+       vals[3] = bottom;
-+
-+       XChangeProperty (GDK_DISPLAY (),
-+                        GDK_ROOT_WINDOW (),
-+                        ATOM ("GNOME_PANEL_DESKTOP_AREA"),
-+                        XA_CARDINAL,
-+                        32, PropModeReplace,
-+                        (unsigned char *)vals, 4);
-+
-+       old_left = left;
-+       old_right = right;
-+       old_top = top;
-+       old_bottom = bottom;
-+}
-+
-+void
-+xstuff_setup_desktop_area (int screen, int left, int right, int top, int bottom)
-+{
-+       char *screen_atom;
-+       long vals[4];
-+       static int screen_width = -1, screen_height = -1;
-+
-+       if (screen_width < 0)
-+               screen_width = gdk_screen_width ();
-+       if (screen_height < 0)
-+               screen_height = gdk_screen_height ();
-+
-+       vals[0] = left;
-+       vals[1] = right;
-+       vals[2] = top;
-+       vals[3] = bottom;
-+
-+       gdk_error_trap_push ();
-+
-+       /* Note, when we do standard multihead and we have per screen
-+        * root window, this should just set the GNOME_PANEL_DESKTOP_AREA */
-+       screen_atom = g_strdup_printf ("GNOME_PANEL_DESKTOP_AREA_%d",
-+                                      screen);
-+       XChangeProperty (GDK_DISPLAY (),
-+                        GDK_ROOT_WINDOW (),
-+                        ATOM (screen_atom),
-+                        XA_CARDINAL,
-+                        32, PropModeReplace,
-+                        (unsigned char *)vals, 4);
-+
-+       g_free (screen_atom);
-+
-+       xstuff_setup_global_desktop_area
-+               ((multiscreen_x (screen)      == 0)             ? left   : -1,
-+                (multiscreen_x (screen) +
-+                 multiscreen_width (screen)  == screen_width)  ? right  : -1,
-+                (multiscreen_y (screen)      == 0)             ? top    : -1,
-+                (multiscreen_y (screen) +
-+                 multiscreen_height (screen) == screen_height) ? bottom : -1);
-+
-+       gdk_flush ();
-+       gdk_error_trap_pop ();
-+}
-+
-+void
-+xstuff_unsetup_desktop_area (void)
-+{
-+       int i;
-+       char *screen_atom;
-+
-+       gdk_error_trap_push ();
-+
-+       XDeleteProperty (GDK_DISPLAY (),
-+                        GDK_ROOT_WINDOW (),
-+                        ATOM ("GNOME_PANEL_DESKTOP_AREA"));
-+
-+       for (i = 0; i < multiscreen_screens (); i++) {
-+               screen_atom =
-+                       g_strdup_printf ("GNOME_PANEL_DESKTOP_AREA_%d", i);
-+
-+               XDeleteProperty (GDK_DISPLAY (),
-+                                GDK_ROOT_WINDOW (),
-+                                ATOM (screen_atom));
-+
-+               g_free (screen_atom);
-+       }
-+
-+       gdk_flush ();
-+       gdk_error_trap_pop ();
-+}
-+
-+
-+
- /* This is such a broken stupid function. */   
- void
- xstuff_set_pos_size (GdkWindow *window, int x, int y, int w, int h)
- {
-+	Window win = GDK_WINDOW_XWINDOW (window);
- 	XSizeHints size_hints;
- 	int old_x, old_y, old_w, old_h;
- 
-@@ -231,9 +388,7 @@
-   
- 	gdk_error_trap_push ();
- 
--	XSetWMNormalHints (GDK_WINDOW_XDISPLAY (window),
--			   GDK_WINDOW_XWINDOW (window),
--			   &size_hints);
-+	XSetWMNormalHints (GDK_DISPLAY (), win, &size_hints);
- 
- 	gdk_window_move_resize (window, x, y, w, h);
- 
-@@ -250,33 +405,29 @@
- xstuff_set_wmspec_dock_hints (GdkWindow *window,
- 			      gboolean autohide)
- {
--        Atom atoms [2] = { None, None };
-+	Atom atoms[2] = { None, None };
-         
--	if (!autohide)
--		atoms [0] = panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					    "_NET_WM_WINDOW_TYPE_DOCK");
--	else {
--		atoms [0] = panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					    "_GNOME_WINDOW_TYPE_AUTOHIDE_PANEL");
--		atoms [1] = panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					    "_NET_WM_WINDOW_TYPE_DOCK");
-+	if (autohide) {
-+		atoms[0] = ATOMGDK (window, "_GNOME_WINDOW_TYPE_AUTOHIDE_PANEL");
-+		atoms[1] = ATOMGDK (window, "_NET_WM_WINDOW_TYPE_DOCK");
-+	} else {
-+		atoms[0] = ATOMGDK (window, "_NET_WM_WINDOW_TYPE_DOCK");
- 	}
- 
-         XChangeProperty (GDK_WINDOW_XDISPLAY (window),
-                          GDK_WINDOW_XWINDOW (window),
--			 panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					 "_NET_WM_WINDOW_TYPE"),
-+			 ATOMGDK (window, "_NET_WM_WINDOW_TYPE"),
-                          XA_ATOM, 32, PropModeReplace,
--                         (unsigned char *) atoms, 
-+			 (guchar *)atoms,
- 			 autohide ? 2 : 1);
- }
- 
- void
- xstuff_set_wmspec_strut (GdkWindow *window,
--			 int        left,
--			 int        right,
--			 int        top,
--			 int        bottom)
-+			int left,
-+			int right,
-+			int top,
-+			int bottom)
- {
- 	long vals [4];
-         
-@@ -287,25 +438,15 @@
- 
-         XChangeProperty (GDK_WINDOW_XDISPLAY (window),
-                          GDK_WINDOW_XWINDOW (window),
--			 panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					 "_NET_WM_STRUT"),
-+			 ATOMGDK (window, "_NET_WM_STRUT"),
-                          XA_CARDINAL, 32, PropModeReplace,
--                         (unsigned char *) vals, 4);
-+			 (guchar *)vals, 4);
- }
- 
- void
- xstuff_delete_property (GdkWindow *window, const char *name)
- {
--	Display *xdisplay = GDK_WINDOW_XDISPLAY (window);
--	Window   xwindow  = GDK_WINDOW_XWINDOW (window);
--
--        XDeleteProperty (xdisplay, xwindow,
--			 panel_atom_get (xdisplay, name));
--}
--
--void
--xstuff_init (void)
--{
--	gdk_window_add_filter (gdk_get_default_root_window (),
--			       panel_global_keys_filter, NULL);
-+	XDeleteProperty (GDK_WINDOW_XDISPLAY (window),
-+			GDK_WINDOW_XWINDOW (window),
-+			ATOMGDK (window, name));
- }
---- gnome-panel/xstuff.h.orig	Fri Jun 21 02:07:59 2002
-+++ gnome-panel/xstuff.h	Thu Aug  8 22:11:31 2002
-@@ -1,15 +1,36 @@
--#ifndef __XSTUFF_H__
--#define __XSTUFF_H__
-+#ifndef XSTUFF_H
- 
--#include <gdk/gdk.h>
-+#include <gdk/gdkx.h>
-+
-+#include <X11/Xmd.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
- 
- void xstuff_init			(void);
-+Atom xstuff_atom_intern                        (Display *display,
-+					const char *name);
-+void xstuff_set_simple_hint            (GdkWindow *w,
-+					const char *name,
-+					long val);
- void xstuff_delete_property		(GdkWindow *window,
- 					 const char *name);
- gboolean xstuff_is_compliant_wm		(void);
- 
-+gpointer get_typed_property_data       (Display *xdisplay,
-+					Window   xwindow,
-+					Atom     property,
-+					Atom     requested_type,
-+					gint    *size_p,
-+					guint    expected_format);
-+
- void xstuff_set_no_group_and_no_input	(GdkWindow *win);
- 
-+void xstuff_setup_desktop_area         (int screen,
-+					int left,
-+					int right,
-+					int top,
-+					int bottom);
-+
- void xstuff_unsetup_desktop_area	(void);
- void xstuff_set_pos_size		(GdkWindow *window,
- 					 int x, int y,
-@@ -22,4 +43,4 @@
- 					 int top,
- 					 int bottom);
- 
--#endif /* __XSTUFF_H__ */
-+#endif
---- gnome-panel/basep-widget.c.orig	Sun Aug  4 18:29:17 2002
-+++ gnome-panel/basep-widget.c	Thu Aug  8 22:11:37 2002
-@@ -2508,6 +2508,11 @@
- 		    BASEP_WIDGET (panel)->screen == screen)
- 			gtk_widget_queue_resize (panel);
- 	}
-+	xstuff_setup_desktop_area (screen,
-+				   sb->left,
-+				   sb->right,
-+				   sb->top,
-+				   sb->bottom);
- }
- 
- static guint  queue_recalc_id = 0;
---- gnome-panel/session.c.orig	Wed Jul 31 20:02:15 2002
-+++ gnome-panel/session.c	Thu Aug  8 22:11:41 2002
-@@ -242,6 +242,8 @@
- 
- 	gnome_config_sync ();
- 
-+	xstuff_unsetup_desktop_area ();
-+
- 	panel_shell_unregister ();
- 	
- 	gtk_main_quit();
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 62253efbfd8e..a8c6fcc9d5dc 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -3,12 +3,14 @@ bin/gnome-panel
 bin/gnome-panel-preferences
 bin/gnome-panel-screenshot
 bin/panel-test-applets
+etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml
@@ -26,6 +28,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001/%gconf.xml
@@ -42,6 +45,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs/%gconf.xml
 etc/gconf/schemas/clock.schemas
 etc/gconf/schemas/fish.schemas
+etc/gconf/schemas/gnome-panel-screenshot.schemas
 etc/gconf/schemas/mailcheck.schemas
 etc/gconf/schemas/pager.schemas
 etc/gconf/schemas/panel-global-config.schemas
@@ -57,17 +61,21 @@ lib/libpanel-applet-2.so
 lib/libpanel-applet-2.so.0
 libdata/bonobo/servers/GNOME_FishApplet_Factory.server
 libdata/bonobo/servers/GNOME_GenUtilApplet_Factory.server
+libdata/bonobo/servers/GNOME_NotificationAreaApplet.server
 libdata/bonobo/servers/GNOME_Panel.server
 libdata/pkgconfig/libpanelapplet-2.0.pc
 libexec/fish-applet-2
+libexec/notification-area-applet
 share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop
 share/gnome/gen_util/pager.glade
 share/gnome/gen_util/tasklist.glade
 share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_PagerApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml
+share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_TasklistApplet.xml
 share/gnome/gnome-panelrc
 share/doc/panel-applet/applet-popups.html
@@ -81,35 +89,40 @@ share/doc/panel-applet/panel-signals.html
 share/doc/panel-applet/panelapplet.html
 share/doc/panel-applet/server-files.html
 share/doc/panel-applet/session-saving.html
+share/gnome/fish/fish.glade
 share/gnome/gnome-panel/glade/panel-test-applets.glade
 share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
 share/gnome/help/clock/C/legal.xml
 share/gnome/help/fish-applet-2/C/figures/fish_applet.png
-share/gnome/help/fish-applet-2/C/figures/fish_settings.png
 share/gnome/help/fish-applet-2/C/fish-applet-2.xml
 share/gnome/help/fish-applet-2/C/legal.xml
-share/gnome/help/mailcheck/C/figures/mailcheck-applet.png
-share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailcheck.png
 share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/C/legal.xml
 share/gnome/help/mailcheck/C/mailcheck.xml
+share/gnome/help/notification-area/C/figures/notification-area.png
+share/gnome/help/notification-area/C/legal.xml
+share/gnome/help/notification-area/C/notification-area.xml
 share/gnome/help/window-list/C/figures/window_list_applet.png
-share/gnome/help/window-list/C/figures/window_list_group.png
 share/gnome/help/window-list/C/figures/window_list_group_applet.png
 share/gnome/help/window-list/C/legal.xml
 share/gnome/help/window-list/C/window-list.xml
-share/gnome/help/workspace-switcher/C/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/C/legal.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
 share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
 share/gnome/omf/gnome-panel/clock-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/fish-applet-2-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/mailcheck-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/notification-area-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/window-list-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/workspace-switcher-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/panel/gnome-panel-preferences.glade
 share/gnome/panel/gnome-panel-screenshot.glade
 share/gnome/pixmaps/fish/fishanim.png
@@ -123,6 +136,7 @@ share/gnome/pixmaps/mailcheck/email-eclouds.png
 share/gnome/pixmaps/mailcheck/email-tiny.png
 share/gnome/pixmaps/mailcheck/email.png
 share/gnome/pixmaps/mailcheck/tux-anim.png
+share/gnome/pixmaps/gnome-show-desktop.png
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
@@ -141,6 +155,7 @@ share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
@@ -148,6 +163,7 @@ share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
@@ -160,6 +176,7 @@ share/locale/ru/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sp/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo
@@ -189,6 +206,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/gen_util
 @dirrm share/gnome/gnome-panel/glade
 @dirrm share/gnome/gnome-panel
+@dirrm share/gnome/fish
 @dirrm share/doc/panel-applet
 @dirrm include/panel-2.0
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs
@@ -205,6 +223,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002
@@ -222,9 +241,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel/global
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true