Erwann,
can you send the full patch out for review. This diff of your new
version to the old one in svn doesn't really give anyone anything useful
to look through. :/
Thanks,
Stephen.
On Thu, 2006-11-02 at 15:31, Erwann Chenede wrote:
> Hi Guys,
>
> Here is a patch to include the metacity trusted solaris patch back
> into the build.
> This was commented out because of patch apply problem.
> Not this patch only modify the behaviour of metacity if it is ran in
> a trusted solaris
> environment. All the dependencies are dynamically loaded.
>
> If you have any comments, let me know.
>
> Thanks,
>
> Erwann
>
>
> ______________________________________________________________________
> Index: metacity.spec
> ===================================================================
> --- metacity.spec (revision 9632)
> +++ metacity.spec (working copy)
> @@ -27,6 +27,7 @@
> Patch7: metacity-07-window-title.diff
> Patch8: metacity-08-pretty-function.diff
> Patch9: metacity-09-branding-hack.diff
> +#owner:erwannc date:2006-11-02 type:feature bugster:6393724
> Patch10: metacity-10-trusted-extensions.diff
> Patch11: metacity-11-empty-struct.diff
> Patch12: metacity-12-composite.diff
> @@ -63,7 +64,7 @@
> %patch7 -p1
> %patch8 -p1
> %patch9 -p1
> -##FIXME: Needs engineer rework: %patch10 -p1
> +%patch10 -p1
> %patch11 -p1
> %patch12 -p1
> %patch13 -p1
> Index: patches/metacity-10-trusted-extensions.diff
> ===================================================================
> --- patches/metacity-10-trusted-extensions.diff (revision 9632)
> +++ patches/metacity-10-trusted-extensions.diff (working copy)
> @@ -1,6 +1,6 @@
> -diff -Nrup metacity-2.14.3/config.h.in
> ../metacity-2.14.3-compiled/config.h.in
> ---- metacity-2.14.3/config.h.in 2006-04-15 02:09:38.000000000 +0200
> -+++ ../metacity-2.14.3-compiled/config.h.in 2006-06-22 18:07:49.588109000
> +0200
> +diff -Nrup metacity-2.16.3/config.h.in
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/config.h.in
> +--- metacity-2.16.3/config.h.in 2006-11-02 13:18:51.283813000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/config.h.in 2006-11-02
> 13:21:03.744380000 +0100
> @@ -78,12 +78,18 @@
> /* Define to 1 if you have the <sys/stat.h> header file. */
> #undef HAVE_SYS_STAT_H
> @@ -30,10 +30,10 @@
> /* Name of package */
> #undef PACKAGE
>
> -diff -Nrup metacity-2.14.3/configure.in
> ../metacity-2.14.3-compiled/configure.in
> ---- metacity-2.14.3/configure.in 2006-04-10 22:07:25.000000000 +0200
> -+++ ../metacity-2.14.3-compiled/configure.in 2006-06-22 18:07:49.465874000
> +0200
> -@@ -334,6 +334,19 @@ if test "${try_xinerama}" != no; then
> +diff -Nrup metacity-2.16.3/configure.in
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/configure.in
> +--- metacity-2.16.3/configure.in 2006-11-02 13:18:51.279604000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/configure.in 2006-11-02
> 13:21:03.746104000 +0100
> +@@ -339,6 +339,19 @@ if test "${try_xinerama}" != no; then
> fi
>
> CPPFLAGS="$metacity_save_cppflags"
> @@ -53,19 +53,19 @@
>
> SHAPE_LIBS=
> found_shape=no
> -diff -Nrup metacity-2.14.3/src/Makefile.am
> ../metacity-2.14.3-clean/src/Makefile.am
> ---- metacity-2.14.3/src/Makefile.am 2006-03-03 19:34:14.000000000 +0100
> -+++ ../metacity-2.14.3-clean/src/Makefile.am 2006-06-20 17:31:42.493763000
> +0200
> -@@ -8,7 +8,7 @@ EGGFILES= \
> - eggaccelerators.c \
> - eggaccelerators.h
> +diff -Nrup metacity-2.16.3/src/Makefile.am
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/Makefile.am
> +--- metacity-2.16.3/src/Makefile.am 2006-11-02 13:18:50.417123000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/Makefile.am 2006-11-02
> 14:10:51.786071000 +0100
> +@@ -4,7 +4,7 @@ SUBDIRS=wm-tester tools themes
>
> + includ...@metacity_cflags@ -DMETACITY_LIBEXECDIR=\"$(libexecdir)\"
> -DHOST_ALIAS=\"@host_al...@\"
> -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
> -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\"
> -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1
> +
> -metacity_SOURCES= \
> +SOURCEFILES= \
> async-getprop.c \
> async-getprop.h \
> bell.h \
> -@@ -80,6 +80,9 @@ metacity_SOURCES= \
> +@@ -82,6 +82,9 @@ metacity_SOURCES= \
> theme-parser.h \
> themewidget.c \
> themewidget.h \
> @@ -75,16 +75,19 @@
> ui.c \
> ui.h \
> util.c \
> -@@ -94,21 +97,15 @@ metacity_SOURCES= \
> - xprops.h \
> - $(EGGFILES)
> +@@ -95,23 +98,16 @@ metacity_SOURCES= \
> + xprops.c \
> + xprops.h
>
> -+metacity_SOURCES= $(SOURCEFILES)
> ++metacity_SOURCES= $(SOURCEFILES)
> ++metacity_CFLAGS = $(AM_CFLAGS)
> +
> # by setting libmetacity_private_la_CFLAGS, the files shared with
> # metacity proper will be compiled with different names.
> libmetacity_private_la_CFLAGS =
> libmetacity_private_la_SOURCES= \
> +- boxes.c \
> +- boxes.h \
> - gradient.c \
> - gradient.h \
> preview-widget.c \
> @@ -100,9 +103,9 @@
>
> libmetacity_private_la_LDFLAGS = -no-undefined
> libmetacity_private_la_LIBADD = @METACITY_LIBS@
> -diff -Nrup metacity-2.14.3/src/display.c
> ../metacity-2.14.3-clean/src/display.cdiff -Nrup
> metacity-2.14.3/src/display.c ../metacity-2.14.3-compiled/src/display.c
> ---- metacity-2.14.3/src/display.c 2006-03-03 19:34:14.000000000 +0100
> -+++ ../metacity-2.14.3-compiled/src/display.c 2006-06-22
> 18:07:46.570170000 +0200
> +diff -Nrup metacity-2.16.3/src/display.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/display.c
> +--- metacity-2.16.3/src/display.c 2006-11-02 13:18:50.435094000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/display.c 2006-11-02
> 13:21:03.758620000 +0100
> @@ -64,6 +64,9 @@
> #include <X11/Xcursor/Xcursor.h>
> #endif
> @@ -111,9 +114,9 @@
> +#include "trusted.h"
> +#endif
>
> - #define USE_GDK_DISPLAY
> -
> -@@ -291,7 +294,10 @@ meta_display_open (const char *name)
> + #define GRAB_OP_IS_WINDOW_SWITCH(g) \
> + (g == META_GRAB_OP_KEYBOARD_TABBING_NORMAL || \
> +@@ -331,7 +334,10 @@ meta_display_open (void)
> "_NET_DESKTOP_VIEWPORT",
> "_METACITY_VERSION",
> "_NET_WM_VISIBLE_NAME",
> @@ -125,7 +128,7 @@
> };
> Atom atoms[G_N_ELEMENTS(atom_names)];
>
> -@@ -453,6 +459,11 @@ meta_display_open (const char *name)
> +@@ -489,6 +495,11 @@ meta_display_open (void)
> display->atom_metacity_version = atoms[91];
> display->atom_net_wm_visible_name = atoms[92];
> display->atom_net_wm_visible_icon_name = atoms[93];
> @@ -137,7 +140,7 @@
>
> display->prop_hooks = NULL;
> meta_display_init_window_prop_hooks (display);
> -@@ -474,6 +485,10 @@ meta_display_open (const char *name)
> +@@ -510,6 +521,10 @@ meta_display_open (void)
> display->screens = NULL;
> display->active_screen = NULL;
>
> @@ -148,7 +151,7 @@
> #ifdef HAVE_STARTUP_NOTIFICATION
> display->sn_display = sn_display_new (display->xdisplay,
> sn_error_trap_push,
> -@@ -1832,7 +1847,10 @@ event_callback (XEvent *event,
> +@@ -1811,7 +1826,10 @@ event_callback (XEvent *event,
> meta_window_handle_mouse_grab_op_event (window, event);
> break;
> case EnterNotify:
> @@ -170,7 +173,7 @@
> if (display->grab_window == window &&
> event->xany.serial >= display->grab_start_serial &&
> grab_op_is_mouse (display->grab_op))
> -@@ -2200,6 +2221,14 @@ event_callback (XEvent *event,
> +@@ -2185,6 +2206,14 @@ event_callback (XEvent *event,
> else if (event->xproperty.atom ==
> display->atom_net_desktop_names)
> meta_screen_update_workspace_names (screen);
> @@ -185,9 +188,9 @@
> #if 0
> else if (event->xproperty.atom ==
> display->atom_net_restack_window)
> -diff -Nrup metacity-2.14.3/src/display.h
> ../metacity-2.14.3-compiled/src/display.h
> ---- metacity-2.14.3/src/display.h 2006-04-13 20:32:00.000000000 +0200
> -+++ ../metacity-2.14.3-compiled/src/display.h 2006-06-22
> 18:07:46.570686000 +0200
> +diff -Nrup metacity-2.16.3/src/display.h
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/display.h
> +--- metacity-2.16.3/src/display.h 2006-11-02 13:18:50.435594000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/display.h 2006-11-02
> 13:21:03.761557000 +0100
> @@ -178,6 +178,9 @@ struct _MetaDisplay
> Atom atom_metacity_version;
> Atom atom_net_wm_visible_name;
> @@ -208,9 +211,9 @@
> MetaScreen *active_screen;
> GHashTable *window_ids;
> int error_traps;
> -diff -Nrup metacity-2.14.3/src/frame.c
> ../metacity-2.14.3-compiled/src/frame.c
> ---- metacity-2.14.3/src/frame.c 2006-01-09 21:57:24.000000000 +0100
> -+++ ../metacity-2.14.3-compiled/src/frame.c 2006-06-22 18:07:46.609217000
> +0200
> +diff -Nrup metacity-2.16.3/src/frame.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/frame.c
> +--- metacity-2.16.3/src/frame.c 2006-11-02 13:18:50.441652000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/frame.c 2006-11-02
> 13:21:03.763300000 +0100
> @@ -26,6 +26,9 @@
> #include "bell.h"
> #include "errors.h"
> @@ -239,9 +242,9 @@
> /* Move keybindings to frame instead of window */
> meta_window_grab_keys (window);
>
> -diff -Nrup metacity-2.14.3/src/frame.h
> ../metacity-2.14.3-compiled/src/frame.h
> ---- metacity-2.14.3/src/frame.h 2006-01-09 21:57:24.000000000 +0100
> -+++ ../metacity-2.14.3-compiled/src/frame.h 2006-06-22 18:07:46.609473000
> +0200
> +diff -Nrup metacity-2.16.3/src/frame.h
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/frame.h
> +--- metacity-2.16.3/src/frame.h 2006-11-02 13:18:50.442017000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/frame.h 2006-11-02
> 13:21:03.764262000 +0100
> @@ -23,17 +23,19 @@
> #define META_FRAME_H
>
> @@ -265,10 +268,10 @@
>
> struct _MetaFrame
> {
> -diff -Nrup metacity-2.14.3/src/frames.c
> ../metacity-2.14.3-compiled/src/frames.c
> ---- metacity-2.14.3/src/frames.c 2006-06-22 18:11:10.081433000 +0200
> -+++ ../metacity-2.14.3-compiled/src/frames.c 2006-06-22 18:07:46.611484000
> +0200
> -@@ -569,7 +569,7 @@ meta_frames_manage_window (MetaFrames *f
> +diff -Nrup metacity-2.16.3/src/frames.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/frames.c
> +--- metacity-2.16.3/src/frames.c 2006-11-02 13:18:50.443059000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/frames.c 2006-11-02
> 13:21:03.768671000 +0100
> +@@ -561,7 +561,7 @@ meta_frames_manage_window (MetaFrames *f
>
> g_assert (window);
>
> @@ -277,7 +280,7 @@
>
> frame->window = window;
>
> -@@ -2227,7 +2227,14 @@ meta_frames_paint_to_drawable (MetaFrame
> +@@ -2190,7 +2190,14 @@ meta_frames_paint_to_drawable (MetaFrame
>
> /* Punch out the client area */
> area.x = left;
> @@ -292,7 +295,7 @@
> area.width = w;
> area.height = h;
> tmp_region = gdk_region_rectangle (&area);
> -@@ -2257,7 +2264,12 @@ meta_frames_paint_to_drawable (MetaFrame
> +@@ -2217,7 +2224,12 @@ meta_frames_paint_to_drawable (MetaFrame
> frame->text_height,
> &button_layout,
> button_states,
> @@ -306,7 +309,7 @@
>
> if (GDK_IS_WINDOW (drawable))
> gdk_window_end_paint (drawable);
> -@@ -2554,3 +2566,26 @@ invalidate_whole_window (MetaFrames *fra
> +@@ -2509,3 +2521,26 @@ invalidate_whole_window (MetaFrames *fra
> gdk_window_invalidate_rect (frame->window, NULL, FALSE);
> invalidate_cache (frames, frame);
> }
> @@ -333,9 +336,9 @@
> +}
> +#endif
> +
> -diff -Nrup metacity-2.14.3/src/frames.h
> ../metacity-2.14.3-compiled/src/frames.h
> ---- metacity-2.14.3/src/frames.h 2005-11-01 19:49:34.000000000 +0100
> -+++ ../metacity-2.14.3-compiled/src/frames.h 2006-06-22 18:07:46.611676000
> +0200
> +diff -Nrup metacity-2.16.3/src/frames.h
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/frames.h
> +--- metacity-2.16.3/src/frames.h 2006-11-02 13:18:50.443366000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/frames.h 2006-11-02
> 13:21:03.770334000 +0100
> @@ -26,6 +26,9 @@
> #include <gdk/gdkx.h>
> #include "common.h"
> @@ -366,10 +369,10 @@
> + MetaTrustedLabel *label);
> +#endif
> #endif
> -diff -Nrup metacity-2.14.3/src/keybindings.c
> ../metacity-2.14.3-compiled/src/keybindings.c
> ---- metacity-2.14.3/src/keybindings.c 2006-06-22 18:11:10.024304000
> +0200
> -+++ ../metacity-2.14.3-compiled/src/keybindings.c 2006-06-22
> 18:07:46.648617000 +0200
> -@@ -43,6 +43,11 @@
> +diff -Nrup metacity-2.16.3/src/keybindings.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/keybindings.c
> +--- metacity-2.16.3/src/keybindings.c 2006-11-02 13:18:50.448923000
> +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/keybindings.c 2006-11-02
> 13:21:03.775661000 +0100
> +@@ -42,6 +42,11 @@
> #include <X11/XKBlib.h>
> #endif
>
> @@ -381,7 +384,7 @@
> static gboolean all_bindings_disabled = FALSE;
>
> typedef void (* MetaKeyHandlerFunc) (MetaDisplay *display,
> -@@ -2609,6 +2614,42 @@ meta_spawn_command_line_async_on_screen
> +@@ -2738,6 +2743,42 @@ meta_spawn_command_line_async_on_screen
> error))
> return FALSE;
>
> @@ -424,7 +427,7 @@
> retval = g_spawn_async (NULL,
> argv,
> NULL,
> -@@ -2618,11 +2659,10 @@ meta_spawn_command_line_async_on_screen
> +@@ -2747,11 +2788,10 @@ meta_spawn_command_line_async_on_screen
> NULL,
> error);
> g_strfreev (argv);
> @@ -437,9 +440,9 @@
> static void
> handle_run_command (MetaDisplay *display,
> MetaScreen *screen,
> -diff -Nrup metacity-2.14.3/src/prefs.c
> ../metacity-2.14.3-compiled/src/prefs.c
> ---- metacity-2.14.3/src/prefs.c 2006-06-22 18:11:10.032370000 +0200
> -+++ ../metacity-2.14.3-compiled/src/prefs.c 2006-06-22 18:07:46.690082000
> +0200
> +diff -Nrup metacity-2.16.3/src/prefs.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/prefs.c
> +--- metacity-2.16.3/src/prefs.c 2006-11-02 13:18:50.704637000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/prefs.c 2006-11-02
> 13:23:36.656857000 +0100
> @@ -29,6 +29,9 @@
> #endif
> #include <string.h>
> @@ -450,8 +453,8 @@
>
> #define MAX_REASONABLE_WORKSPACES 36
>
> -@@ -67,6 +70,10 @@
> - #define KEY_WINDOW_BINDINGS_PREFIX "/apps/metacity/window_keybindings"
> +@@ -68,6 +71,10 @@
> + #define KEY_LIST_BINDINGS_SUFFIX "_list"
>
> #define KEY_WORKSPACE_NAME_PREFIX "/apps/metacity/workspace_names/name_"
> +#ifdef HAVE_XTSOL
> @@ -461,7 +464,7 @@
>
> #define KEY_VISUAL_BELL "/apps/metacity/general/visual_bell"
> #define KEY_AUDIBLE_BELL "/apps/metacity/general/audible_bell"
> -@@ -125,6 +132,14 @@ static char *commands[MAX_COMMANDS] = {
> +@@ -128,6 +135,14 @@ static char *commands[MAX_COMMANDS] = {
> static char *terminal_command = NULL;
>
> static char *workspace_names[MAX_REASONABLE_WORKSPACES] = { NULL, };
> @@ -476,7 +479,7 @@
>
> #ifdef HAVE_GCONF
> static gboolean update_use_system_font (gboolean value);
> -@@ -164,6 +179,10 @@ static void change_notify (GConfClient
> +@@ -175,6 +190,10 @@ static void change_notify (GConfClient
> gpointer user_data);
>
> static char* gconf_key_for_workspace_name (int i);
> @@ -487,7 +490,7 @@
>
> static void queue_changed (MetaPreference pref);
> #endif /* HAVE_GCONF */
> -@@ -174,6 +193,15 @@ static void init_bindings
> +@@ -195,6 +214,15 @@ static void init_bindings
> static void init_commands (void);
> static void init_workspace_names (void);
>
> @@ -503,7 +506,7 @@
>
> typedef struct
> {
> -@@ -511,6 +539,11 @@ meta_prefs_init (void)
> +@@ -536,6 +564,11 @@ meta_prefs_init (void)
> /* workspace names */
> init_workspace_names ();
>
> @@ -515,7 +518,7 @@
> #ifdef HAVE_GCONF
> gconf_client_notify_add (default_client, "/apps/metacity",
> change_notify,
> -@@ -860,6 +893,75 @@ change_notify (GConfClient *client,
> +@@ -923,6 +956,75 @@ change_notify (GConfClient *client,
> if (update_workspace_name (key, str))
> queue_changed (META_PREF_WORKSPACE_NAMES);
> }
> @@ -591,7 +594,7 @@
> else if (strcmp (key, KEY_BUTTON_LAYOUT) == 0)
> {
> const char *str;
> -@@ -1467,6 +1569,42 @@ update_num_workspaces (int value)
> +@@ -1546,6 +1648,42 @@ update_num_workspaces (int value)
> value = MAX_REASONABLE_WORKSPACES;
> }
>
> @@ -634,10 +637,11 @@
> num_workspaces = value;
>
> return old != num_workspaces;
> -@@ -1713,6 +1851,14 @@ meta_preference_to_string (MetaPreferenc
> +@@ -1795,6 +1933,16 @@ meta_preference_to_string (MetaPreferenc
>
> - case META_PREF_CURSOR_SIZE:
> - return "CURSOR_SIZE";
> + case META_PREF_COMPOSITING_MANAGER:
> + return "COMPOSITING_MANAGER";
> ++
> +#ifdef HAVE_XTSOL
> + case META_PREF_WORKSPACE_LABELS:
> + return "WORKSPACE_LABELS";
> @@ -645,11 +649,12 @@
> + case META_PREF_WORKSPACE_ROLES:
> + return "WORKSPACE_ROLES";
> + break;
> -+#endif /*HAVE_XTSOL*/
> ++#endif /*HAVE_XTSOL*/
> ++
> }
>
> return "(unknown)";
> -@@ -2021,6 +2167,53 @@ init_commands (void)
> +@@ -2150,6 +2298,53 @@ init_commands (void)
> #endif /* HAVE_GCONF */
> }
>
> @@ -703,7 +708,7 @@
> static void
> init_workspace_names (void)
> {
> -@@ -2365,6 +2558,72 @@ meta_prefs_get_gconf_key_for_terminal_co
> +@@ -2666,6 +2861,72 @@ meta_prefs_get_gconf_key_for_terminal_co
> }
>
> #ifdef HAVE_GCONF
> @@ -776,7 +781,7 @@
> static gboolean
> update_workspace_name (const char *name,
> const char *value)
> -@@ -2442,6 +2701,152 @@ update_workspace_name (const char *name
> +@@ -2743,6 +3004,152 @@ update_workspace_name (const char *name
> return TRUE;
> }
> #endif /* HAVE_GCONF */
> @@ -929,7 +934,7 @@
>
> const char*
> meta_prefs_get_workspace_name (int i)
> -@@ -2517,6 +2922,29 @@ meta_prefs_change_workspace_name (int
> +@@ -2818,6 +3225,29 @@ meta_prefs_change_workspace_name (int
> }
>
> #ifdef HAVE_GCONF
> @@ -959,23 +964,23 @@
> static char*
> gconf_key_for_workspace_name (int i)
> {
> -diff -Nrup metacity-2.14.3/src/prefs.h
> ../metacity-2.14.3-compiled/src/prefs.h
> ---- metacity-2.14.3/src/prefs.h 2006-06-22 18:11:10.034159000 +0200
> -+++ ../metacity-2.14.3-compiled/src/prefs.h 2006-06-22 18:07:46.690382000
> +0200
> -@@ -55,6 +55,10 @@ typedef enum
> - META_PREF_GNOME_ACCESSIBILITY,
> +diff -Nrup metacity-2.16.3/src/prefs.h
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/prefs.h
> +--- metacity-2.16.3/src/prefs.h 2006-11-02 13:18:50.705019000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/prefs.h 2006-11-02
> 13:24:26.248825000 +0100
> +@@ -56,6 +56,10 @@ typedef enum
> META_PREF_CURSOR_THEME,
> - META_PREF_CURSOR_SIZE
> + META_PREF_CURSOR_SIZE,
> + META_PREF_COMPOSITING_MANAGER
> +#ifdef HAVE_XTSOL
> -+ ,META_PREF_WORKSPACE_LABELS,
> ++ ,META_PREF_WORKSPACE_LABELS,
> + META_PREF_WORKSPACE_ROLES
> +#endif /*HAVE_XTSOL*/
> } MetaPreference;
>
> typedef void (* MetaPrefsChangedFunc) (MetaPreference pref,
> -@@ -103,6 +107,16 @@ void meta_prefs_change_workspace_
> - const char* meta_prefs_get_cursor_theme (void);
> +@@ -105,6 +109,16 @@ const char* meta_prefs_get_cursor_theme
> int meta_prefs_get_cursor_size (void);
> + gboolean meta_prefs_get_compositing_manager (void);
>
> +#ifdef HAVE_XTSOL
> +const char* meta_prefs_get_workspace_label (int i);
> @@ -990,9 +995,9 @@
> /* Screen bindings */
> #define META_KEYBINDING_WORKSPACE_1 "switch_to_workspace_1"
> #define META_KEYBINDING_WORKSPACE_2 "switch_to_workspace_2"
> -diff -Nrup metacity-2.14.3/src/preview-widget.c
> ../metacity-2.14.3-compiled/src/preview-widget.c
> ---- metacity-2.14.3/src/preview-widget.c 2006-01-20 22:52:12.000000000
> +0100
> -+++ ../metacity-2.14.3-compiled/src/preview-widget.c 2006-06-22
> 18:07:46.410381000 +0200
> +diff -Nrup metacity-2.16.3/src/preview-widget.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/preview-widget.c
> +--- metacity-2.16.3/src/preview-widget.c 2006-11-02 13:18:50.419967000
> +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/preview-widget.c
> 2006-11-02 13:21:03.827543000 +0100
> @@ -19,6 +19,7 @@
> * 02111-1307, USA.
> */
> @@ -1014,9 +1019,9 @@
> }
>
> /* draw child */
> -diff -Nrup metacity-2.14.3/src/screen.c
> ../metacity-2.14.3-compiled/src/screen.c
> ---- metacity-2.14.3/src/screen.c 2006-03-03 19:34:22.000000000 +0100
> -+++ ../metacity-2.14.3-compiled/src/screen.c 2006-06-22 18:07:46.722256000
> +0200
> +diff -Nrup metacity-2.16.3/src/screen.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/screen.c
> +--- metacity-2.16.3/src/screen.c 2006-11-02 13:18:50.706767000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/screen.c 2006-11-02
> 13:21:03.872773000 +0100
> @@ -36,6 +36,7 @@
> #include "stack.h"
> #include "xprops.h"
> @@ -1025,8 +1030,8 @@
>
> #ifdef HAVE_SOLARIS_XINERAMA
> #include <X11/extensions/xinerama.h>
> -@@ -611,6 +612,13 @@ meta_screen_new (MetaDisplay *display,
> - update_num_workspaces (screen);
> +@@ -612,6 +613,13 @@ meta_screen_new (MetaDisplay *display,
> + update_num_workspaces (screen, timestamp);
>
> set_workspace_names (screen);
> +#ifdef HAVE_XTSOL
> @@ -1039,7 +1044,7 @@
>
> screen->all_keys_grabbed = FALSE;
> screen->keys_grabbed = FALSE;
> -@@ -820,6 +828,16 @@ prefs_changed_callback (MetaPreference p
> +@@ -872,6 +880,16 @@ prefs_changed_callback (MetaPreference p
> {
> set_workspace_names (screen);
> }
> @@ -1056,7 +1061,7 @@
> }
>
>
> -@@ -1114,6 +1132,13 @@ update_num_workspaces (MetaScreen *scree
> +@@ -1167,6 +1185,13 @@ update_num_workspaces (MetaScreen *scree
> }
>
> set_number_of_spaces_hint (screen, new_num);
> @@ -1070,9 +1075,9 @@
>
> meta_screen_queue_workarea_recalc (screen);
> }
> -diff -Nrup metacity-2.14.3/src/tabpopup.c
> ../metacity-2.14.3-compiled/src/tabpopup.c
> ---- metacity-2.14.3/src/tabpopup.c 2006-02-12 02:32:31.000000000 +0100
> -+++ ../metacity-2.14.3-compiled/src/tabpopup.c 2006-06-22
> 18:07:47.272960000 +0200
> +diff -Nrup metacity-2.16.3/src/tabpopup.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/tabpopup.c
> +--- metacity-2.16.3/src/tabpopup.c 2006-11-02 13:18:50.801016000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/tabpopup.c 2006-11-02
> 13:21:03.895686000 +0100
> @@ -31,6 +31,10 @@
> #include "frame.h"
> #include <gtk/gtk.h>
> @@ -1150,7 +1155,7 @@
> static GdkPixbuf*
> dimm_icon (GdkPixbuf *pixbuf)
> {
> -@@ -288,6 +351,13 @@ meta_ui_tab_popup_new (const MetaTabEntr
> +@@ -301,6 +364,13 @@ meta_ui_tab_popup_new (const MetaTabEntr
>
> gtk_box_pack_end (GTK_BOX (vbox), popup->label, FALSE, FALSE, 0);
>
> @@ -1164,7 +1169,7 @@
> max_label_width = 0;
> top = 0;
> bottom = 1;
> -@@ -920,6 +990,34 @@ meta_select_workspace_expose_event (GtkW
> +@@ -933,6 +1003,34 @@ meta_select_workspace_expose_event (GtkW
> }
> }
>
> @@ -1199,9 +1204,9 @@
> return TRUE;
> }
>
> -diff -Nrup metacity-2.14.3/src/theme-viewer.c
> ../metacity-2.14.3-compiled/src/theme-viewer.c
> ---- metacity-2.14.3/src/theme-viewer.c 2006-01-20 22:52:12.000000000
> +0100
> -+++ ../metacity-2.14.3-compiled/src/theme-viewer.c 2006-06-22
> 18:07:47.321125000 +0200
> +diff -Nrup metacity-2.16.3/src/theme-viewer.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/theme-viewer.c
> +--- metacity-2.16.3/src/theme-viewer.c 2006-11-02 13:18:50.810534000
> +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/theme-viewer.c
> 2006-11-02 13:21:03.898536000 +0100
> @@ -987,7 +987,11 @@ run_theme_benchmark (void)
> &button_layout,
> button_states,
> @@ -1215,9 +1220,9 @@
>
> g_object_unref (G_OBJECT (pixmap));
>
> -diff -Nrup metacity-2.14.3/src/theme.c
> ../metacity-2.14.3-compiled/src/theme.c
> ---- metacity-2.14.3/src/theme.c 2006-01-21 22:25:15.000000000 +0100
> -+++ ../metacity-2.14.3-compiled/src/theme.c 2006-06-22 18:07:46.465697000
> +0200
> +diff -Nrup metacity-2.16.3/src/theme.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/theme.c
> +--- metacity-2.16.3/src/theme.c 2006-11-02 13:18:50.423816000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/theme.c 2006-11-02
> 13:21:03.975292000 +0100
> @@ -28,6 +28,9 @@
> #include <string.h>
> #include <stdlib.h>
> @@ -1244,7 +1249,7 @@
> fgeom->top_titlebar_edge = layout->title_border.top;
> fgeom->bottom_titlebar_edge = layout->title_border.bottom;
> fgeom->left_titlebar_edge = layout->left_titlebar_edge;
> -@@ -886,7 +895,11 @@ meta_color_spec_new (MetaColorSpecType t
> +@@ -891,7 +900,11 @@ meta_color_spec_new (MetaColorSpecType t
> case META_COLOR_SPEC_BASIC:
> size += sizeof (dummy.data.basic);
> break;
> @@ -1257,7 +1262,7 @@
> case META_COLOR_SPEC_GTK:
> size += sizeof (dummy.data.gtk);
> break;
> -@@ -917,7 +930,11 @@ meta_color_spec_free (MetaColorSpec *spe
> +@@ -922,7 +935,11 @@ meta_color_spec_free (MetaColorSpec *spe
> case META_COLOR_SPEC_BASIC:
> DEBUG_FILL_STRUCT (&spec->data.basic);
> break;
> @@ -1270,7 +1275,7 @@
> case META_COLOR_SPEC_GTK:
> DEBUG_FILL_STRUCT (&spec->data.gtk);
> break;
> -@@ -1016,6 +1033,14 @@ meta_color_spec_new_from_string (const c
> +@@ -1021,6 +1038,14 @@ meta_color_spec_new_from_string (const c
> g_assert (spec->data.gtk.state < N_GTK_STATES);
> g_assert (spec->data.gtk.component < META_GTK_COLOR_LAST);
> }
> @@ -1285,7 +1290,7 @@
> else if (str[0] == 'b' && str[1] == 'l' && str[2] == 'e' && str[3] == 'n'
> &&
> str[4] == 'd' && str[5] == '/')
> {
> -@@ -1191,7 +1216,19 @@ meta_color_spec_render (MetaColorSpec *s
> +@@ -1196,7 +1221,19 @@ meta_color_spec_render (MetaColorSpec *s
> case META_COLOR_SPEC_BASIC:
> *color = spec->data.basic.color;
> break;
> @@ -1305,7 +1310,7 @@
> case META_COLOR_SPEC_GTK:
> switch (spec->data.gtk.component)
> {
> -@@ -2044,6 +2081,12 @@ pos_eval_helper (PosToken
> +@@ -2039,6 +2076,12 @@ pos_eval_helper (PosToken
> exprs[n_exprs].d.int_val = env->title_width;
> else if (strcmp (t->d.v.name, "title_height") == 0)
> exprs[n_exprs].d.int_val = env->title_height;
> @@ -1318,7 +1323,7 @@
> /* In practice we only hit this code on initial theme
> * parse; after that we always optimize constants away
> */
> -@@ -2495,6 +2538,11 @@ meta_draw_op_new (MetaDrawType type)
> +@@ -2484,6 +2527,11 @@ meta_draw_op_new (MetaDrawType type)
> case META_DRAW_TILE:
> size += sizeof (dummy.data.tile);
> break;
> @@ -1330,7 +1335,7 @@
> }
>
> op = g_malloc0 (size);
> -@@ -2639,6 +2687,14 @@ meta_draw_op_free (MetaDrawOp *op)
> +@@ -2628,6 +2676,14 @@ meta_draw_op_free (MetaDrawOp *op)
> g_free (op->data.tile.tile_width);
> g_free (op->data.tile.tile_height);
> break;
> @@ -1345,7 +1350,7 @@
> }
>
> g_free (op);
> -@@ -3155,6 +3211,10 @@ draw_op_as_pixbuf (const MetaDrawOp *
> +@@ -3144,6 +3200,10 @@ draw_op_as_pixbuf (const MetaDrawOp *
>
> case META_DRAW_TILE:
> break;
> @@ -1356,7 +1361,7 @@
> }
>
> return pixbuf;
> -@@ -3198,6 +3258,23 @@ fill_env (MetaPositionExprEnv *env,
> +@@ -3181,6 +3241,23 @@ fill_env (MetaPositionExprEnv *env,
>
> env->title_width = info->title_layout_width;
> env->title_height = info->title_layout_height;
> @@ -1380,7 +1385,7 @@
> env->theme = NULL; /* not required, constants have been optimized out */
> }
>
> -@@ -3369,6 +3446,14 @@ meta_draw_op_draw_with_env (const MetaDr
> +@@ -3349,6 +3426,14 @@ meta_draw_op_draw_with_env (const MetaDr
> {
> env->object_width = gdk_pixbuf_get_width
> (op->data.image.pixbuf);
> env->object_height = gdk_pixbuf_get_height
> (op->data.image.pixbuf);
> @@ -1395,7 +1400,7 @@
> }
>
> rwidth = parse_size_unchecked (op->data.image.width, env);
> -@@ -3555,6 +3640,67 @@ meta_draw_op_draw_with_env (const MetaDr
> +@@ -3535,6 +3620,67 @@ meta_draw_op_draw_with_env (const MetaDr
> }
> }
> break;
> @@ -1433,8 +1438,8 @@
> +
> + pango_layout_get_pixel_size (info->label->layout,&text_w, &text_h);
> +
> -+ rx = ((width - text_w) / 2 ) + x;
> -+ ry = ((height - text_h) / 2 ) + y;
> ++ rx = ((rect.width - text_w) / 2 ) + rect.x;
> ++ ry = ((rect.height - text_h) / 2 ) + rect.y;
> +
> + gc = get_gc_for_primitive (widget, drawable, shadow_color, clip, 0);
> +
> @@ -1463,7 +1468,7 @@
> }
> }
>
> -@@ -3988,6 +4134,9 @@ meta_frame_style_draw (MetaFrameStyle
> +@@ -3934,6 +4080,9 @@ meta_frame_style_draw (MetaFrameStyle
> int client_width,
> int client_height,
> PangoLayout *title_layout,
> @@ -1473,7 +1478,7 @@
> int text_height,
> MetaButtonState
> button_states[META_BUTTON_TYPE_LAST],
> GdkPixbuf *mini_icon,
> -@@ -4053,6 +4202,18 @@ meta_frame_style_draw (MetaFrameStyle
> +@@ -3999,6 +4148,18 @@ meta_frame_style_draw (MetaFrameStyle
> draw_info.title_layout_width = title_layout ? extents.width : 0;
> draw_info.title_layout_height = title_layout ? extents.height : 0;
> draw_info.fgeom = fgeom;
> @@ -1492,7 +1497,7 @@
>
> /* The enum is in the order the pieces should be rendered. */
> i = 0;
> -@@ -4069,7 +4230,14 @@ meta_frame_style_draw (MetaFrameStyle
> +@@ -4015,7 +4176,14 @@ meta_frame_style_draw (MetaFrameStyle
> rect.width = fgeom->width;
> rect.height = fgeom->height;
> break;
> @@ -1508,7 +1513,7 @@
> case META_FRAME_PIECE_TITLEBAR:
> rect = titlebar_rect;
> break;
> -@@ -4421,6 +4589,97 @@ meta_theme_get_current (void)
> +@@ -4353,6 +4521,97 @@ meta_theme_get_current (void)
> return meta_current_theme;
> }
>
> @@ -1606,7 +1611,7 @@
> void
> meta_theme_set_current (const char *name,
> gboolean force_reload)
> -@@ -4451,6 +4710,14 @@ meta_theme_set_current (const char *name
> +@@ -4383,6 +4642,14 @@ meta_theme_set_current (const char *name
>
> meta_current_theme = new_theme;
>
> @@ -1621,7 +1626,7 @@
> meta_topic (META_DEBUG_THEMES, "New theme is \"%s\"\n",
> meta_current_theme->name);
> }
> }
> -@@ -4827,7 +5094,11 @@ meta_theme_draw_frame (MetaTheme
> +@@ -4729,7 +4996,11 @@ meta_theme_draw_frame (MetaTheme
> const MetaButtonLayout *button_layout,
> MetaButtonState
> button_states[META_BUTTON_TYPE_LAST],
> GdkPixbuf *mini_icon,
> @@ -1634,7 +1639,7 @@
> {
> MetaFrameGeometry fgeom;
> MetaFrameStyle *style;
> -@@ -4855,6 +5126,9 @@ meta_theme_draw_frame (MetaTheme
> +@@ -4757,6 +5028,9 @@ meta_theme_draw_frame (MetaTheme
> &fgeom,
> client_width, client_height,
> title_layout,
> @@ -1644,7 +1649,7 @@
> text_height,
> button_states,
> mini_icon, icon);
> -@@ -5406,6 +5680,10 @@ meta_frame_piece_to_string (MetaFramePie
> +@@ -5305,6 +5579,10 @@ meta_frame_piece_to_string (MetaFramePie
> {
> case META_FRAME_PIECE_ENTIRE_BACKGROUND:
> return "entire_background";
> @@ -1655,10 +1660,10 @@
> case META_FRAME_PIECE_TITLEBAR:
> return "titlebar";
> case META_FRAME_PIECE_TITLEBAR_MIDDLE:
> -diff -Nrup metacity-2.14.3/src/theme.h
> ../metacity-2.14.3-compiled/src/theme.h
> ---- metacity-2.14.3/src/theme.h 2005-01-17 21:25:09.000000000 +0100
> -+++ ../metacity-2.14.3-compiled/src/theme.h 2006-06-22 18:07:46.342839000
> +0200
> -@@ -38,6 +38,9 @@ typedef struct _MetaFrameGeometry MetaFr
> +diff -Nrup metacity-2.16.3/src/theme.h
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/theme.h
> +--- metacity-2.16.3/src/theme.h 2006-11-02 13:18:50.416316000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/theme.h 2006-11-02
> 13:21:04.020925000 +0100
> +@@ -40,6 +40,9 @@ typedef struct _MetaFrameGeometry MetaFr
> typedef struct _MetaTheme MetaTheme;
> typedef struct _MetaPositionExprEnv MetaPositionExprEnv;
> typedef struct _MetaDrawInfo MetaDrawInfo;
> @@ -1668,7 +1673,7 @@
>
> #define META_THEME_ERROR (g_quark_from_static_string ("meta-theme-error"))
>
> -@@ -159,6 +162,10 @@ typedef enum
> +@@ -172,6 +175,10 @@ typedef enum
> META_COLOR_SPEC_GTK,
> META_COLOR_SPEC_BLEND,
> META_COLOR_SPEC_SHADE
> @@ -1679,7 +1684,7 @@
> } MetaColorSpecType;
>
> typedef enum
> -@@ -182,6 +189,11 @@ struct _MetaColorSpec
> +@@ -195,6 +202,11 @@ struct _MetaColorSpec
> struct {
> GdkColor color;
> } basic;
> @@ -1691,7 +1696,7 @@
> struct {
> MetaGtkColorComponent component;
> GtkStateType state;
> -@@ -219,6 +231,9 @@ struct _MetaDrawInfo
> +@@ -232,6 +244,9 @@ struct _MetaDrawInfo
> int title_layout_width;
> int title_layout_height;
> const MetaFrameGeometry *fgeom;
> @@ -1701,7 +1706,7 @@
> };
>
> typedef enum
> -@@ -249,6 +264,11 @@ typedef enum
> +@@ -262,6 +277,11 @@ typedef enum
> META_DRAW_OP_LIST,
> /* tiled draw op list */
> META_DRAW_TILE
> @@ -1713,7 +1718,7 @@
> } MetaDrawType;
>
> struct _MetaDrawOp
> -@@ -391,6 +411,14 @@ struct _MetaDrawOp
> +@@ -404,6 +424,14 @@ struct _MetaDrawOp
> char *tile_height;
> } tile;
>
> @@ -1728,7 +1733,7 @@
> } data;
> };
>
> -@@ -452,6 +480,10 @@ typedef enum
> +@@ -465,6 +493,10 @@ typedef enum
>
> /* entire frame */
> META_FRAME_PIECE_ENTIRE_BACKGROUND,
> @@ -1739,7 +1744,7 @@
> /* entire titlebar background */
> META_FRAME_PIECE_TITLEBAR,
> /* portion of the titlebar background inside the titlebar
> -@@ -579,6 +611,10 @@ struct _MetaPositionExprEnv
> +@@ -589,6 +621,10 @@ struct _MetaPositionExprEnv
> int bottom_height;
> int title_width;
> int title_height;
> @@ -1750,7 +1755,7 @@
> int mini_icon_width;
> int mini_icon_height;
> int icon_width;
> -@@ -691,6 +727,9 @@ void meta_frame_style_draw (MetaFrameSty
> +@@ -694,6 +730,9 @@ void meta_frame_style_draw (MetaFrameSty
> int client_width,
> int client_height,
> PangoLayout *title_layout,
> @@ -1760,7 +1765,7 @@
> int text_height,
> MetaButtonState
> button_states[META_BUTTON_TYPE_LAST],
> GdkPixbuf *mini_icon,
> -@@ -742,7 +781,11 @@ void meta_theme_draw_frame (MetaTheme
> +@@ -745,7 +784,11 @@ void meta_theme_draw_frame (MetaTheme
> const MetaButtonLayout *button_layout,
> MetaButtonState
> button_states[META_BUTTON_TYPE_LAST],
> GdkPixbuf *mini_icon,
> @@ -1773,9 +1778,9 @@
>
> void meta_theme_draw_menu_icon (MetaTheme *theme,
> GtkWidget *widget,
> -diff -Nrup metacity-2.14.3/src/trusted-pics.h
> ../metacity-2.14.3-compiled/src/trusted-pics.h
> ---- metacity-2.14.3/src/trusted-pics.h 1970-01-01 01:00:00.000000000
> +0100
> -+++ ../metacity-2.14.3-compiled/src/trusted-pics.h 2006-06-22
> 18:07:48.699871000 +0200
> +diff -Nrup metacity-2.16.3/src/trusted-pics.h
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/trusted-pics.h
> +--- metacity-2.16.3/src/trusted-pics.h 1970-01-01 01:00:00.000000000
> +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/trusted-pics.h
> 2006-11-02 13:21:04.026656000 +0100
> @@ -0,0 +1,728 @@
> +/* Metacity trusted image */
> +
> @@ -2505,9 +2510,9 @@
> +
> +
> +#endif /*TRUSTED_PICS_H */
> -diff -Nrup metacity-2.14.3/src/trusted.c
> ../metacity-2.14.3-compiled/src/trusted.c
> ---- metacity-2.14.3/src/trusted.c 1970-01-01 01:00:00.000000000 +0100
> -+++ ../metacity-2.14.3-compiled/src/trusted.c 2006-06-22
> 18:07:48.747662000 +0200
> +diff -Nrup metacity-2.16.3/src/trusted.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/trusted.c
> +--- metacity-2.16.3/src/trusted.c 1970-01-01 01:00:00.000000000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/trusted.c 2006-11-02
> 13:21:04.028609000 +0100
> @@ -0,0 +1,1131 @@
> +/* Metacity trusted */
> +
> @@ -3640,9 +3645,9 @@
> +
> +
> +#endif
> -diff -Nrup metacity-2.14.3/src/trusted.h
> ../metacity-2.14.3-compiled/src/trusted.h
> ---- metacity-2.14.3/src/trusted.h 1970-01-01 01:00:00.000000000 +0100
> -+++ ../metacity-2.14.3-compiled/src/trusted.h 2006-06-22
> 18:07:48.747950000 +0200
> +diff -Nrup metacity-2.16.3/src/trusted.h
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/trusted.h
> +--- metacity-2.16.3/src/trusted.h 1970-01-01 01:00:00.000000000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/trusted.h 2006-11-02
> 13:21:04.029390000 +0100
> @@ -0,0 +1,193 @@
> +/* Metacity trusted */
> +
> @@ -3837,10 +3842,10 @@
> +
> +#endif /*HAVE_XTSOL*/
> +#endif /*TRUSTED_H*/
> -diff -Nrup metacity-2.14.3/src/ui.c ../metacity-2.14.3-compiled/src/ui.c
> ---- metacity-2.14.3/src/ui.c 2006-03-03 19:34:22.000000000 +0100
> -+++ ../metacity-2.14.3-compiled/src/ui.c 2006-06-22 18:07:47.281565000
> +0200
> -@@ -957,3 +957,13 @@ meta_ui_get_drag_threshold (MetaUI *ui)
> +diff -Nrup metacity-2.16.3/src/ui.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/ui.c
> +--- metacity-2.16.3/src/ui.c 2006-11-02 13:18:50.802434000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/ui.c 2006-11-02
> 13:21:04.031870000 +0100
> +@@ -969,3 +969,13 @@ meta_ui_get_drag_threshold (MetaUI *ui)
>
> return threshold;
> }
> @@ -3854,9 +3859,9 @@
> + meta_frames_set_label (ui->frames, xwindow, label);
> +}
> +#endif
> -diff -Nrup metacity-2.14.3/src/ui.h ../metacity-2.14.3-compiled/src/ui.h
> ---- metacity-2.14.3/src/ui.h 2006-03-03 19:34:22.000000000 +0100
> -+++ ../metacity-2.14.3-compiled/src/ui.h 2006-06-22 18:07:47.281980000
> +0200
> +diff -Nrup metacity-2.16.3/src/ui.h
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/ui.h
> +--- metacity-2.16.3/src/ui.h 2006-11-02 13:18:50.802849000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/ui.h 2006-11-02
> 13:21:04.033142000 +0100
> @@ -28,6 +28,7 @@
> #include <X11/Xutil.h>
> #include <glib.h>
> @@ -3865,8 +3870,8 @@
>
> /* This is between GTK_PRIORITY_RESIZE (+10) and GTK_PRIORITY_REDRAW (+20)
> */
> #define META_PRIORITY_RESIZE (G_PRIORITY_HIGH_IDLE + 15)
> -@@ -194,6 +195,12 @@ gboolean meta_ui_window_is_widget (MetaU
> - int meta_ui_get_double_click_timeout (MetaUI *ui);
> +@@ -192,6 +193,12 @@ gboolean meta_ui_window_is_widget (MetaU
> +
> int meta_ui_get_drag_threshold (MetaUI *ui);
>
> +#ifdef HAVE_XTSOL
> @@ -3878,9 +3883,9 @@
> #include "tabpopup.h"
>
> #endif
> -diff -Nrup metacity-2.14.3/src/window.c
> ../metacity-2.14.3-compiled/src/window.c
> ---- metacity-2.14.3/src/window.c 2006-06-22 18:11:10.009382000 +0200
> -+++ ../metacity-2.14.3-compiled/src/window.c 2006-06-22 18:07:47.284784000
> +0200
> +diff -Nrup metacity-2.16.3/src/window.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/window.c
> +--- metacity-2.16.3/src/window.c 2006-11-02 13:18:50.805857000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/window.c 2006-11-02
> 13:21:04.051573000 +0100
> @@ -27,6 +27,7 @@
> #include "edge-resistance.h"
> #include "util.h"
> @@ -3898,7 +3903,7 @@
> prefs_changed_callback (MetaPreference pref,
> gpointer data)
> {
> -@@ -421,7 +422,11 @@ meta_window_new_with_attrs (MetaDisplay
> +@@ -423,7 +424,11 @@ meta_window_new_with_attrs (MetaDisplay
> window->rect.x = attrs->x;
> window->rect.y = attrs->y;
> window->rect.width = attrs->width;
> @@ -3910,9 +3915,9 @@
>
> /* And border width, size_hints are the "request" */
> window->border_width = attrs->border_width;
> -@@ -710,6 +715,10 @@ meta_window_new_with_attrs (MetaDisplay
> -
> - meta_window_update_struts (window);
> +@@ -725,6 +730,10 @@ meta_window_new_with_attrs (MetaDisplay
> + meta_stack_add (window->screen->stack,
> + window);
>
> +
> + if (window->decorated)
> @@ -3921,7 +3926,7 @@
> /* Put our state back where it should be,
> * passing TRUE for is_configure_request, ICCCM says
> * initial map is handled same as configure request
> -@@ -1216,6 +1225,16 @@ gboolean
> +@@ -1241,6 +1250,16 @@ gboolean
> meta_window_located_on_workspace (MetaWindow *window,
> MetaWorkspace *workspace)
> {
> @@ -3938,7 +3943,7 @@
> return (window->on_all_workspaces && window->screen == workspace->screen)
> ||
> (window->workspace == workspace);
> }
> -@@ -2884,7 +2903,23 @@ meta_window_move_resize_internal (MetaWi
> +@@ -3003,7 +3022,23 @@ meta_window_move_resize_internal (MetaWi
> if (window->shaded)
> new_h = fgeom.top_height;
> else
> @@ -3962,7 +3967,7 @@
>
> frame_size_dx = new_w - window->frame->rect.width;
> frame_size_dy = new_h - window->frame->rect.height;
> -@@ -3076,7 +3111,19 @@ meta_window_move_resize_internal (MetaWi
> +@@ -3195,7 +3230,19 @@ meta_window_move_resize_internal (MetaWi
>
> values.border_width = 0;
> values.x = client_move_x;
> @@ -3982,7 +3987,7 @@
> values.width = window->rect.width;
> values.height = window->rect.height;
>
> -@@ -3814,6 +3861,11 @@ void
> +@@ -3930,6 +3977,11 @@ void
> meta_window_change_workspace (MetaWindow *window,
> MetaWorkspace *workspace)
> {
> @@ -3994,7 +3999,7 @@
> meta_window_change_workspace_without_transients (window, workspace);
>
> meta_window_foreach_transient (window, change_workspace_foreach,
> -@@ -4819,16 +4871,17 @@ meta_window_notify_focus (MetaWindow *wi
> +@@ -4969,16 +5021,17 @@ meta_window_notify_focus (MetaWindow *wi
> GList* link;
> link = g_list_find
> (window->screen->active_workspace->mru_list,
> window);
> @@ -4022,7 +4027,7 @@
> }
>
> if (window->frame)
> -@@ -6402,7 +6455,16 @@ meta_window_show_menu (MetaWindow *windo
> +@@ -6310,7 +6363,16 @@ meta_window_show_menu (MetaWindow *windo
>
> if (!window->on_all_workspaces)
> {
> @@ -4040,7 +4045,7 @@
> if (layout.current_col > 0)
> ops |= META_MENU_OP_MOVE_LEFT;
> if ((layout.current_col < layout.cols - 1) &&
> -@@ -6413,6 +6475,7 @@ meta_window_show_menu (MetaWindow *windo
> +@@ -6321,6 +6383,7 @@ meta_window_show_menu (MetaWindow *windo
> if ((layout.current_row < layout.rows - 1) &&
> ((layout.current_row + 1) * layout.cols + layout.current_col <
> n_workspaces))
> ops |= META_MENU_OP_MOVE_DOWN;
> @@ -4048,9 +4053,9 @@
> }
>
> meta_screen_free_workspace_layout (&layout);
> -diff -Nrup metacity-2.14.3/src/window.h
> ../metacity-2.14.3-compiled/src/window.h
> ---- metacity-2.14.3/src/window.h 2006-03-30 21:24:28.000000000 +0200
> -+++ ../metacity-2.14.3-compiled/src/window.h 2006-06-22 18:07:47.285266000
> +0200
> +diff -Nrup metacity-2.16.3/src/window.h
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/window.h
> +--- metacity-2.16.3/src/window.h 2006-11-02 13:18:50.806354000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/window.h 2006-11-02
> 13:21:04.053727000 +0100
> @@ -30,6 +30,8 @@
> #include "util.h"
> #include "stack.h"
> @@ -4060,9 +4065,9 @@
> #include <X11/Xutil.h>
> #include <gdk-pixbuf/gdk-pixbuf.h>
>
> -diff -Nrup metacity-2.14.3/src/workspace.c
> ../metacity-2.14.3-compiled/src/workspace.c
> ---- metacity-2.14.3/src/workspace.c 2006-02-11 22:29:22.000000000 +0100
> -+++ ../metacity-2.14.3-compiled/src/workspace.c 2006-06-22
> 18:07:47.296652000 +0200
> +diff -Nrup metacity-2.16.3/src/workspace.c
> ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/workspace.c
> +--- metacity-2.16.3/src/workspace.c 2006-11-02 13:18:50.807912000 +0100
> ++++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/workspace.c 2006-11-02
> 13:21:04.054822000 +0100
> @@ -263,6 +263,10 @@ meta_workspace_queue_calc_showing (Meta
> GList *tmp;
>
