--- a/ChangeLog Wed Jul 19 13:42:57 2006 +0000
+++ b/ChangeLog Wed Jul 19 15:48:48 2006 +0000
@@ -1,3 +1,23 @@
+2006-07-19 Dermot McCluskey - <[email protected]>
+
+ * at-spi.spec:
+ * atk.spec:
+ * control-center.spec:
+ * eog.spec:
+ Increment tarballs to latest 2.15 community versions.
+ * patches/control-center-02-ctrl-alt-del.diff:
+ * patches/control-center-04-remove-xkb-layout.diff:
+ * patches/control-center-07-custom-keybinding.diff:
+ * patches/control-center-08-keybinding-caps-lock.diff:
+ * patches/control-center-13-layout-deletion.diff:
+ * patches/control-center-16-mouse-dialog.diff:
+ * patches/control-center-17-disable-gnome-screensaver.diff:
+ * patches/control-center-18-menu-entry.diff:
+ * patches/control-center-18-negative-refresh-rates.diff:
+ * patches/control-center-19-negative-refresh-rates.diff:
+ * patches/control-center-20-trusted-extensions.diff:
+ Rework patches. patch #16 deleted; later patches renamed.
+
2006-07-18 Henry Zhang <[email protected]>
* patches/libgtop-01-solaris.diff: Port
--- a/Solaris/.pkgtoolrc Wed Jul 19 13:42:57 2006 +0000
+++ b/Solaris/.pkgtoolrc Wed Jul 19 15:48:48 2006 +0000
@@ -1,5 +1,5 @@
# tarballdirs [string]: colon (:) separated list of directories where source tarballs are searched for
-tarballdirs: /sgnome/tarballs/gnome2.14:/sgnome/tarballs/moz-evo
+tarballdirs: /sgnome/tarballs/gnome2.14:/sgnome/tarballs/gnome2.15:/sgnome/tarballs/moz-evo
# logdir [string]: the directory for saving log files
# logdir: /tmp
--- a/Solaris/ChangeLog Wed Jul 19 13:42:57 2006 +0000
+++ b/Solaris/ChangeLog Wed Jul 19 15:48:48 2006 +0000
@@ -1,3 +1,7 @@
+2006-07-19 Dermot McCluskey <[email protected]>
+
+ * .pkgtoolrc: add gnome2.15 tarballsdir to search path
+
2006-07-19 Damien Carbery <[email protected]>
* SUNWgnome-system-monitor.spec: Fix dir perms and merge share pkg into
--- a/at-spi.spec Wed Jul 19 13:42:57 2006 +0000
+++ b/at-spi.spec Wed Jul 19 15:48:48 2006 +0000
@@ -8,8 +8,8 @@
Name: at-spi
License: LGPL
Group: System/Libraries
-Version: 1.7.7
-Release: 242
+Version: 1.7.9
+Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Assistive Technology Service Provider Interface
@@ -126,6 +126,9 @@
%{_mandir}/man3/*
%changelog
+* Wed Jul 19 2006 - [email protected]
+- Bump to 1.7.9
+
* Mon Apr 01 2006 - [email protected]
- Add patch 01-define-symbols so that gok builds.
--- a/atk.spec Wed Jul 19 13:42:57 2006 +0000
+++ b/atk.spec Wed Jul 19 15:48:48 2006 +0000
@@ -8,12 +8,12 @@
Name: atk
License: LGPL
Group: System/Libraries
-Version: 1.11.4
+Version: 1.12.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: ATK - Accesibility Toolkit Libraries
-Source: http://ftp.gnome.org/pub/GNOME/sources/atk/1.11/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/atk/1.12/%{name}-%{version}.tar.bz2
Source1: libatk-1.0.3.gz
URL: http://www.gtk.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -143,6 +143,9 @@
%{_mandir}/man3/*
%changelog
+* Wed Jul 19 2006 - [email protected]
+- Bump to 1.12.1.
+
* Fri Mar 31 2006 - [email protected]
- Bump to 1.11.4.
--- a/control-center.spec Wed Jul 19 13:42:57 2006 +0000
+++ b/control-center.spec Wed Jul 19 15:48:48 2006 +0000
@@ -9,12 +9,12 @@
Name: control-center
License: GPL
Group: System/GUI/GNOME
-Version: 2.14.1
-Release: 2
+Version: 2.15.4
+Release: 1
Distribution: Java Desktop System, Release 3
Vendor: Sun Microsystems, Inc.
Summary: The GNOME control center for GNOME
-Source: http://ftp.gnome.org/pub/GNOME/sources/control-center/2.14/control-center-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/control-center/2.15/control-center-%{version}.tar.bz2
Source1: gnome-font-viewer.1.gz
Source2: gnome-accessibility-keyboard-properties.1.gz
Source3: gnome-background-properties.1.gz
@@ -48,11 +48,10 @@
Patch13: control-center-13-layout-deletion.diff
Patch14: control-center-14-background-crash.diff
Patch15: control-center-15-fix-keyboard-dialog.diff
-Patch16: control-center-16-mouse-dialog.diff
-Patch17: control-center-17-disable-gnome-screensaver.diff
-Patch18: control-center-18-menu-entry.diff
-Patch19: control-center-19-negative-refresh-rates.diff
-Patch20: control-center-20-trusted-extensions.diff
+Patch16: control-center-16-disable-gnome-screensaver.diff
+Patch17: control-center-17-menu-entry.diff
+Patch18: control-center-18-negative-refresh-rates.diff
+Patch19: control-center-19-trusted-extensions.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -130,7 +129,6 @@
%patch17 -p1
%patch18 -p1
%patch19 -p1
-%patch20 -p1
%build
%ifos linux
@@ -249,10 +247,15 @@
%{_libdir}/*.so
%changelog
+* Web Jul 19 2006 - [email protected]
+- Bump to 2.15.4.
+ Remove patch #16 (upstream) and decrement later patches.
+
* Sat Jul 15 2006 - [email protected]
- Remove all the xkb layout related patches to be
replaced by a single patch that removes the layout
options completely.
+
* Mon Jun 12 2006 - [email protected]
- Added patch22 to fix issue with negative refresh rates:
Bug #6437221
--- a/eog.spec Wed Jul 19 13:42:57 2006 +0000
+++ b/eog.spec Wed Jul 19 15:48:48 2006 +0000
@@ -8,12 +8,12 @@
Name: eog
License: GPL
Group: System/GUI/GNOME
-Version: 2.14.1
+Version: 2.15.4
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Eye Of GNOME Image Viewer
-Source: http://ftp.gnome.org/pub/GNOME/sources/eog/2.14/eog-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/eog/2.15/eog-%{version}.tar.bz2
Source1: eog.1.gz
Patch1: eog-01-full-screen-show.diff
Patch2: eog-02-jpeg.diff
@@ -113,6 +113,9 @@
%{_prefix}/var/scrollkeeper
%changelog
+* Web Jul 19 2006 - [email protected]
+- Bump to 2.15.4.
+
* Tue Apr 11 2006 - [email protected]
- Bump to 2.14.1.
--- a/patches/control-center-02-ctrl-alt-del.diff Wed Jul 19 13:42:57 2006 +0000
+++ b/patches/control-center-02-ctrl-alt-del.diff Wed Jul 19 15:48:48 2006 +0000
@@ -1,10 +1,10 @@
---- control-center-2.10.1/capplets/keybindings/gnome-keybinding-properties.c Fri May 13 10:12:35 2005
-+++ control-center-2.10.1-new/capplets/keybindings/gnome-keybinding-properties.c Fri May 13 10:15:36 2005
-@@ -53,6 +53,7 @@ const KeyListEntry desktop_key_list[] =
+--- control-center-2.15.4/capplets/keybindings/gnome-keybinding-properties.c Thu Apr 27 10:50:41 2006
++++ control-center-2.15.4.new/capplets/keybindings/gnome-keybinding-properties.c Wed Jul 19 14:29:39 2006
+@@ -47,6 +47,7 @@
{ "/apps/metacity/global_keybindings/run_command_screenshot", ALWAYS_VISIBLE, 0 },
{ "/apps/metacity/global_keybindings/run_command_window_screenshot", ALWAYS_VISIBLE, 0 },
{ "/apps/metacity/global_keybindings/run_command_terminal", ALWAYS_VISIBLE, 0 },
-+ { "/apps/metacity/global_keybindings/run_command_process_manager", ALWAYS_VISIBLE, 0},
- #ifdef USE_FBLEVEL
- { "/apps/gnome_settings_daemon/keybindings/brightness_down", ALWAYS_VISIBLE, 0 },
- { "/apps/gnome_settings_daemon/keybindings/brightness_up", ALWAYS_VISIBLE, 0 },
++ { "/apps/metacity/global_keybindings/run_command_process_manager", ALWAYS_VISIBLE, 0 },
+ { NULL }
+ };
+ static const KeyListEntry sounds_key_list[] =
--- a/patches/control-center-04-remove-xkb-layout.diff Wed Jul 19 13:42:57 2006 +0000
+++ b/patches/control-center-04-remove-xkb-layout.diff Wed Jul 19 15:48:48 2006 +0000
@@ -290,7 +290,7 @@
- <widget class="GtkButton" id="xkb_model_pick">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
-- <property name="label" translatable="yes">...</property>
+- <property name="label" translatable="yes">Choose...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
@@ -1727,7 +1727,7 @@
+ <widget class="GtkButton" id="xkb_model_pick">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="label" translatable="yes">...</property>
++ <property name="label" translatable="yes">Choose...</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
@@ -2845,10 +2845,10 @@
+ <program_name></program_name>
+ <gnome_support>FALSE</gnome_support>
+</glade-project>
-diff -urN control-center-2.14.1/gnome-settings-daemon/gnome-settings-daemon.c control-center-2.14.1-hacked/gnome-settings-daemon/gnome-settings-daemon.c
---- control-center-2.14.1/gnome-settings-daemon/gnome-settings-daemon.c 2005-11-15 04:21:11.000000000 +1300
-+++ control-center-2.14.1-hacked/gnome-settings-daemon/gnome-settings-daemon.c 2006-07-14 18:35:42.578931000 +1200
-@@ -341,8 +341,10 @@
+diff -urN control-center-2.15.4/gnome-settings-daemon/gnome-settings-daemon.c control-center-2.15.4.new/gnome-settings-daemon/gnome-settings-daemon.c
+--- control-center-2.15.4/gnome-settings-daemon/gnome-settings-daemon.c Thu Jul 6 20:44:00 2006
++++ control-center-2.15.4.new/gnome-settings-daemon/gnome-settings-daemon.c Wed Jul 19 14:41:35 2006
+@@ -326,8 +326,10 @@
gnome_settings_xsettings_init (client);
gnome_settings_mouse_init (client);
/* Essential - xkb initialization should happen before */
@@ -2859,13 +2859,13 @@
gnome_settings_keyboard_init (client);
gnome_settings_multimedia_keys_init (client);
/* */
-@@ -396,7 +398,9 @@
+@@ -381,7 +383,9 @@
gnome_settings_xsettings_load (client);
gnome_settings_mouse_load (client);
/* Essential - xkb initialization should happen before */
-+ /* HACK: Remove all settings for XKB keyboard loading
++/* HACK: Remove all settings for XKB keyboard loading
gnome_settings_keyboard_xkb_load (client);
-+ */
++*/
gnome_settings_keyboard_load (client);
gnome_settings_multimedia_keys_load (client);
/* */
--- a/patches/control-center-07-custom-keybinding.diff Wed Jul 19 13:42:57 2006 +0000
+++ b/patches/control-center-07-custom-keybinding.diff Wed Jul 19 15:48:48 2006 +0000
@@ -1005,9 +1005,9 @@
#define LABEL_DATA "gnome-keybinding-properties-label"
#define MAX_ELEMENTS_BEFORE_SCROLLING 10
@@ -25,19 +25,6 @@
- #else
- #undef USE_FBLEVEL
- #endif
+
+ #define LABEL_DATA "gnome-keybinding-properties-label"
+ #define MAX_ELEMENTS_BEFORE_SCROLLING 10
-
-typedef enum {
- ALWAYS_VISIBLE,
--- a/patches/control-center-08-keybinding-caps-lock.diff Wed Jul 19 13:42:57 2006 +0000
+++ b/patches/control-center-08-keybinding-caps-lock.diff Wed Jul 19 15:48:48 2006 +0000
@@ -13,9 +13,9 @@
--- control-center-2.10.1/capplets/keybindings/gnome-keybinding-properties.c Fri May 13 12:12:07 2005
+++ control-center-2.10.1-new/capplets/keybindings/gnome-keybinding-properties.c Fri May 13 12:14:25 2005
@@ -26,6 +26,9 @@
- #else
- #undef USE_FBLEVEL
- #endif
+
+ #define LABEL_DATA "gnome-keybinding-properties-label"
+ #define MAX_ELEMENTS_BEFORE_SCROLLING 10
+
+#define ignore_modifiers ( GDK_LOCK_MASK )
+
--- a/patches/control-center-13-layout-deletion.diff Wed Jul 19 13:42:57 2006 +0000
+++ b/patches/control-center-13-layout-deletion.diff Wed Jul 19 15:48:48 2006 +0000
@@ -1,13 +1,13 @@
--- control-center-2.10.1/capplets/keyboard/gnome-keyboard-properties-xkblt.c 2005-02-09 04:12:10.000000000 +0530
+++ control-center-2.10.1-new/capplets/keyboard/gnome-keyboard-properties-xkblt.c 2005-08-04 21:28:23.665368800 +0530
@@ -195,7 +195,9 @@ xkb_layouts_enable_disable_buttons (Glad
- gtk_widget_set_sensitive (addLayoutBtn,
- (nSelectedLayouts < maxSelectedLayouts ||
- maxSelectedLayouts == 0));
-- gtk_widget_set_sensitive (delLayoutBtn, nSelectedSelectedLayouts > 0);
-+ gtk_widget_set_sensitive (delLayoutBtn,
-+ (nSelectedLayouts > 1)
-+ && (nSelectedSelectedLayouts > 0));
+ gtk_widget_set_sensitive (add_layout_btn,
+ (n_selected_layouts < max_selected_layouts ||
+ max_selected_layouts == 0));
+- gtk_widget_set_sensitive (del_layout_btn, n_selected_selected_layouts > 0);
++ gtk_widget_set_sensitive (del_layout_btn,
++ (n_selected_layouts > 1)
++ && (n_selected_selected_layouts > 0));
- if (gtk_tree_selection_get_selected (sSelection, NULL, &iter))
+ if (gtk_tree_selection_get_selected (s_selection, NULL, &iter))
{
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-16-disable-gnome-screensaver.diff Wed Jul 19 15:48:48 2006 +0000
@@ -0,0 +1,31 @@
+diff -urNp control-center-2.12.1/gnome-settings-daemon/gnome-settings-screensaver.c control-center-2.12.1-hacked/gnome-settings-daemon/gnome-settings-screensaver.c
+--- control-center-2.12.1/gnome-settings-daemon/gnome-settings-screensaver.c 2005-07-25 23:55:59.000000000 +1200
++++ control-center-2.12.1-hacked/gnome-settings-daemon/gnome-settings-screensaver.c 2005-11-09 13:09:14.488848000 +1300
+@@ -74,24 +74,16 @@
+ really_start_screensaver (gpointer user_data)
+ {
+ GError *gerr = NULL;
+- gboolean use_gscreensaver = FALSE;
+ gboolean show_error;
+ GtkWidget *dialog, *toggle;
+ gchar *ss_command;
+ GConfClient *client;
+
+- if ((ss_command = g_find_program_in_path ("gnome-screensaver")))
+- use_gscreensaver = TRUE;
+- else {
+- if (!(ss_command = g_find_program_in_path ("xscreensaver")))
+- return FALSE;
+- }
++ if (!(ss_command = g_find_program_in_path ("xscreensaver")))
++ return FALSE;
+
+ g_free (ss_command);
+- if (use_gscreensaver)
+- ss_command = GSCREENSAVER_COMMAND;
+- else
+- ss_command = XSCREENSAVER_COMMAND;
++ ss_command = XSCREENSAVER_COMMAND;
+
+ if (g_spawn_command_line_async (ss_command, &gerr))
+ return FALSE;
--- a/patches/control-center-16-mouse-dialog.diff Wed Jul 19 13:42:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- control-center-2.14.1/capplets/mouse/gnome-mouse-properties.c-orig 2006-06-09 11:10:52.922270000 +0100
-+++ control-center-2.14.1/capplets/mouse/gnome-mouse-properties.c 2006-06-09 10:03:29.251483000 +0100
-@@ -532,6 +532,13 @@
- model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT(smodel));
-
- cursor_font = gconf_client_get_string (client, CURSOR_FONT_KEY, NULL);
-+
-+ /* If there's no value set, then don't select anything, and return */
-+ if ( cursor_font == NULL ) {
-+ gtk_tree_selection_unselect_all(selection);
-+ return;
-+ }
-+
- gtk_tree_model_get_iter_root (model, &iter);
-
- do {
--- a/patches/control-center-17-disable-gnome-screensaver.diff Wed Jul 19 13:42:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-diff -urNp control-center-2.12.1/gnome-settings-daemon/gnome-settings-screensaver.c control-center-2.12.1-hacked/gnome-settings-daemon/gnome-settings-screensaver.c
---- control-center-2.12.1/gnome-settings-daemon/gnome-settings-screensaver.c 2005-07-25 23:55:59.000000000 +1200
-+++ control-center-2.12.1-hacked/gnome-settings-daemon/gnome-settings-screensaver.c 2005-11-09 13:09:14.488848000 +1300
-@@ -74,24 +74,16 @@
- really_start_screensaver (gpointer user_data)
- {
- GError *gerr = NULL;
-- gboolean use_gscreensaver = FALSE;
- gboolean show_error;
- GtkWidget *dialog, *toggle;
- gchar *ss_command;
- GConfClient *client;
-
-- if ((ss_command = g_find_program_in_path ("gnome-screensaver")))
-- use_gscreensaver = TRUE;
-- else {
-- if (!(ss_command = g_find_program_in_path ("xscreensaver")))
-- return FALSE;
-- }
-+ if (!(ss_command = g_find_program_in_path ("xscreensaver")))
-+ return FALSE;
-
- g_free (ss_command);
-- if (use_gscreensaver)
-- ss_command = GSCREENSAVER_COMMAND;
-- else
-- ss_command = XSCREENSAVER_COMMAND;
-+ ss_command = XSCREENSAVER_COMMAND;
-
- if (g_spawn_command_line_async (ss_command, &gerr))
- return FALSE;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-17-menu-entry.diff Wed Jul 19 15:48:48 2006 +0000
@@ -0,0 +1,33 @@
+diff -urN control-center-2.14.1/capplets/about-me/gnome-about-me.desktop.in.in control-center-2.14.1-hacked/capplets/about-me/gnome-about-me.desktop.in.in
+--- control-center-2.14.1/capplets/about-me/gnome-about-me.desktop.in.in 2006-01-24 00:36:20.000000000 +1300
++++ control-center-2.14.1-hacked/capplets/about-me/gnome-about-me.desktop.in.in 2006-05-05 15:52:42.321339000 +1200
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=About Me
++_Name=Personal Information
+ _Comment=Set your personal information
+ Exec=gnome-about-me
+ Icon=user-info
+diff -urN control-center-2.14.1/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in control-center-2.14.1-hacked/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
+--- control-center-2.14.1/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in 2006-01-24 00:36:20.000000000 +1300
++++ control-center-2.14.1-hacked/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in 2006-05-05 15:53:45.220966000 +1200
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Keyboard
++_Name=Keyboard Accessibility
+ _Comment=Set your keyboard accessibility preferences
+ Exec=gnome-accessibility-keyboard-properties
+ Icon=gnome-settings-accessibility-keyboard
+diff -urN control-center-2.14.1/capplets/windows/window-properties.desktop.in.in control-center-2.14.1-hacked/capplets/windows/window-properties.desktop.in.in
+--- control-center-2.14.1/capplets/windows/window-properties.desktop.in.in 2006-01-24 00:36:20.000000000 +1300
++++ control-center-2.14.1-hacked/capplets/windows/window-properties.desktop.in.in 2006-05-05 16:01:50.370014000 +1200
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Windows
++_Name=Window Behavior
+ _Comment=Set your window properties
+ Exec=gnome-window-properties
+ Icon=gnome-window-manager
--- a/patches/control-center-18-menu-entry.diff Wed Jul 19 13:42:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-diff -urN control-center-2.14.1/capplets/about-me/gnome-about-me.desktop.in.in control-center-2.14.1-hacked/capplets/about-me/gnome-about-me.desktop.in.in
---- control-center-2.14.1/capplets/about-me/gnome-about-me.desktop.in.in 2006-01-24 00:36:20.000000000 +1300
-+++ control-center-2.14.1-hacked/capplets/about-me/gnome-about-me.desktop.in.in 2006-05-05 15:52:42.321339000 +1200
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=About Me
-+_Name=Personal Information
- _Comment=Set your personal information
- Exec=gnome-about-me
- Icon=user-info
-diff -urN control-center-2.14.1/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in control-center-2.14.1-hacked/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
---- control-center-2.14.1/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in 2006-01-24 00:36:20.000000000 +1300
-+++ control-center-2.14.1-hacked/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in 2006-05-05 15:53:45.220966000 +1200
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Keyboard
-+_Name=Keyboard Accessibility
- _Comment=Set your keyboard accessibility preferences
- Exec=gnome-accessibility-keyboard-properties
- Icon=gnome-settings-accessibility-keyboard
-diff -urN control-center-2.14.1/capplets/windows/window-properties.desktop.in.in control-center-2.14.1-hacked/capplets/windows/window-properties.desktop.in.in
---- control-center-2.14.1/capplets/windows/window-properties.desktop.in.in 2006-01-24 00:36:20.000000000 +1300
-+++ control-center-2.14.1-hacked/capplets/windows/window-properties.desktop.in.in 2006-05-05 16:01:50.370014000 +1200
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Windows
-+_Name=Window Behavior
- _Comment=Set your window properties
- Exec=gnome-window-properties
- Icon=gnome-window-manager
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-18-negative-refresh-rates.diff Wed Jul 19 15:48:48 2006 +0000
@@ -0,0 +1,20 @@
+--- control-center-2.15.4/capplets/display/main.c Fri Jul 7 16:10:25 2006
++++ control-center-2.15.4.new/capplets/display/main.c Wed Jul 19 15:39:46 2006
+@@ -229,7 +229,7 @@
+ gdk_x11_drawable_get_xid (GDK_DRAWABLE (root_window)),
+ new_res,
+ new_rot,
+- new_rate,
++ new_rate > 0 ? new_rate : 0,
+ GDK_CURRENT_TIME);
+ }
+ }
+@@ -277,7 +277,7 @@
+ gdk_x11_drawable_get_xid (GDK_DRAWABLE (root_window)),
+ screen_info->old_size,
+ screen_info->old_rotation,
+- screen_info->old_rate,
++ screen_info->old_rate > 0 ? screen_info->old_rate : 0,
+ GDK_CURRENT_TIME);
+
+ }
--- a/patches/control-center-19-negative-refresh-rates.diff Wed Jul 19 13:42:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
---- control-center-2.14.1/capplets/display/main.c 2005-11-14 23:21:07.000000000 +0800
-+++ control-center-2.14.1-new/capplets/display/main.c 2006-06-12 16:56:05.436629000 +0800
-@@ -1,3 +1,4 @@
-+
- #include <config.h>
-
- #include <string.h>
-@@ -184,7 +185,7 @@
- gdk_x11_drawable_get_xid (GDK_DRAWABLE (root_window)),
- new_res,
- screen_info->current_rotation,
-- new_rate,
-+ new_rate > 0 ? new_rate : 0,
- GDK_CURRENT_TIME);
- }
- }
-@@ -232,7 +233,7 @@
- gdk_x11_drawable_get_xid (GDK_DRAWABLE (root_window)),
- screen_info->old_size,
- screen_info->old_rotation,
-- screen_info->old_rate,
-+ screen_info->old_rate > 0 ? screen_info->old_rate : 0,
- GDK_CURRENT_TIME);
-
- }
-@@ -352,6 +353,10 @@
- menuitem = gtk_menu_item_new_with_label (str);
-
- g_object_set_data (G_OBJECT (menuitem), "rate", GINT_TO_POINTER ((int)rates[i]));
-+ if (rates[i] < 0)
-+ { /* Don't allow selection of negative refresh rates */
-+ gtk_widget_set_sensitive (menuitem, FALSE);
-+ }
-
- g_free (str);
- gtk_widget_show (menuitem);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-19-trusted-extensions.diff Wed Jul 19 15:48:48 2006 +0000
@@ -0,0 +1,90 @@
+diff -urN control-center-2.14.1/gnome-settings-daemon/gnome-settings-keybindings.c ../SUNWgnome-desktop-prefs-2.14.1.hacked/control-center-2.14.1/gnome-settings-daemon/gnome-settings-keybindings.c
+--- control-center-2.14.1/gnome-settings-daemon/gnome-settings-keybindings.c 2006-06-12 12:33:36.567877000 +0100
++++ ../SUNWgnome-desktop-prefs-2.14.1.hacked/control-center-2.14.1/gnome-settings-daemon/gnome-settings-keybindings.c 2006-06-12 12:48:38.094184000 +0100
+@@ -19,7 +19,10 @@
+ * for these set */
+ #define USED_MODS (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)
+
+-#define GCONF_BINDING_DIR "/desktop/gnome/keybindings"
++#define GCONF_BINDING_DIR "/desktop/gnome/keybindings"
++
++extern gboolean gnome_desktop_tsol_is_multi_label_session (void);
++extern void gnome_desktop_tsol_proxy_app_launch (gchar *);
+
+ typedef struct {
+ guint keysym;
+@@ -366,6 +369,7 @@
+ XEvent *xevent = (XEvent *)gdk_xevent;
+ guint keycode, state;
+ GSList *li;
++ int i = (int)data;
+
+ if(xevent->type != KeyPress)
+ return GDK_FILTER_CONTINUE;
+@@ -384,6 +388,7 @@
+ gboolean retval;
+ gchar **argv = NULL;
+ gchar **envp = NULL;
++ char *tsolcmd;
+
+ g_return_val_if_fail (binding->action != NULL, GDK_FILTER_CONTINUE);
+
+@@ -394,6 +399,12 @@
+
+ envp = get_exec_environment (xevent);
+
++ if (gnome_desktop_tsol_is_multi_label_session ()) {
++ tsolcmd = g_strdup_printf ("%d:%s", i, argv[0]);
++ gnome_desktop_tsol_proxy_app_launch (tsolcmd);
++ g_free (tsolcmd);
++ return GDK_FILTER_CONTINUE;
++ }
+
+ retval = g_spawn_async (NULL,
+ argv,
+@@ -437,12 +448,12 @@
+
+ gdk_window_add_filter (gdk_get_default_root_window (),
+ keybindings_filter,
+- NULL);
++ 0);
+ for (i = 0; i < screen_num; i++)
+ {
+ screen = gdk_display_get_screen (dpy, i);
+ gdk_window_add_filter (gdk_screen_get_root_window (screen),
+- keybindings_filter, NULL);
++ keybindings_filter, i);
+ }
+ }
+
+diff -urN control-center-2.14.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c ../SUNWgnome-desktop-prefs-2.14.1.hacked/control-center-2.14.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c
+--- control-center-2.14.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-06-12 12:33:36.585316000 +0100
++++ ../SUNWgnome-desktop-prefs-2.14.1.hacked/control-center-2.14.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-06-12 12:48:57.372499000 +0100
+@@ -57,6 +57,9 @@
+ * for these set */
+ #define USED_MODS (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)
+
++extern gboolean gnome_desktop_tsol_is_multi_label_session (void);
++extern void gnome_desktop_tsol_proxy_app_launch (gchar *);
++
+ typedef struct {
+ AcmeVolume *volobj;
+ #ifdef USE_FBLEVEL
+@@ -104,7 +107,16 @@
+ gboolean retval;
+ gchar **argv;
+ gint argc;
+-
++
++ if (gnome_desktop_tsol_is_multi_label_session ()) {
++ char *tsolcmd;
++ /* FIXME: assume the screen 0 since ACME does not support multi-head */
++ tsolcmd = g_strdup_printf ("0:%s", cmd);
++ gnome_desktop_tsol_proxy_app_launch (tsolcmd);
++ g_free (tsolcmd);
++ return;
++ }
++
+ retval = FALSE;
+
+ if (g_shell_parse_argv (cmd, &argc, &argv, NULL)) {
--- a/patches/control-center-20-trusted-extensions.diff Wed Jul 19 13:42:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-diff -urN control-center-2.14.1/gnome-settings-daemon/gnome-settings-keybindings.c ../SUNWgnome-desktop-prefs-2.14.1.hacked/control-center-2.14.1/gnome-settings-daemon/gnome-settings-keybindings.c
---- control-center-2.14.1/gnome-settings-daemon/gnome-settings-keybindings.c 2006-06-12 12:33:36.567877000 +0100
-+++ ../SUNWgnome-desktop-prefs-2.14.1.hacked/control-center-2.14.1/gnome-settings-daemon/gnome-settings-keybindings.c 2006-06-12 12:48:38.094184000 +0100
-@@ -19,7 +19,10 @@
- * for these set */
- #define USED_MODS (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)
-
--#define GCONF_BINDING_DIR "/desktop/gnome/keybindings"
-+#define GCONF_BINDING_DIR "/desktop/gnome/keybindings"
-+
-+extern gboolean gnome_desktop_tsol_is_multi_label_session (void);
-+extern void gnome_desktop_tsol_proxy_app_launch (gchar *);
-
- typedef struct {
- guint keysym;
-@@ -366,6 +369,7 @@
- XEvent *xevent = (XEvent *)gdk_xevent;
- guint keycode, state;
- GSList *li;
-+ int i = (int)data;
-
- if(xevent->type != KeyPress)
- return GDK_FILTER_CONTINUE;
-@@ -384,6 +388,7 @@
- gboolean retval;
- gchar **argv = NULL;
- gchar **envp = NULL;
-+ char *tsolcmd;
-
- g_return_val_if_fail (binding->action != NULL, GDK_FILTER_CONTINUE);
-
-@@ -394,6 +399,12 @@
-
- envp = get_exec_environment (xevent);
-
-+ if (gnome_desktop_tsol_is_multi_label_session ()) {
-+ tsolcmd = g_strdup_printf ("%d:%s", i, argv[0]);
-+ gnome_desktop_tsol_proxy_app_launch (tsolcmd);
-+ g_free (tsolcmd);
-+ return GDK_FILTER_CONTINUE;
-+ }
-
- retval = g_spawn_async (NULL,
- argv,
-@@ -437,12 +448,12 @@
-
- gdk_window_add_filter (gdk_get_default_root_window (),
- keybindings_filter,
-- NULL);
-+ 0);
- for (i = 0; i < screen_num; i++)
- {
- screen = gdk_display_get_screen (dpy, i);
- gdk_window_add_filter (gdk_screen_get_root_window (screen),
-- keybindings_filter, NULL);
-+ keybindings_filter, i);
- }
- }
-
-diff -urN control-center-2.14.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c ../SUNWgnome-desktop-prefs-2.14.1.hacked/control-center-2.14.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c
---- control-center-2.14.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-06-12 12:33:36.585316000 +0100
-+++ ../SUNWgnome-desktop-prefs-2.14.1.hacked/control-center-2.14.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-06-12 12:48:57.372499000 +0100
-@@ -57,6 +57,9 @@
- * for these set */
- #define USED_MODS (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)
-
-+extern gboolean gnome_desktop_tsol_is_multi_label_session (void);
-+extern void gnome_desktop_tsol_proxy_app_launch (gchar *);
-+
- typedef struct {
- AcmeVolume *volobj;
- #ifdef USE_FBLEVEL
-@@ -104,7 +107,16 @@
- gboolean retval;
- gchar **argv;
- gint argc;
--
-+
-+ if (gnome_desktop_tsol_is_multi_label_session ()) {
-+ char *tsolcmd;
-+ /* FIXME: assume the screen 0 since ACME does not support multi-head */
-+ tsolcmd = g_strdup_printf ("0:%s", cmd);
-+ gnome_desktop_tsol_proxy_app_launch (tsolcmd);
-+ g_free (tsolcmd);
-+ return;
-+ }
-+
- retval = FALSE;
-
- if (g_shell_parse_argv (cmd, &argc, &argv, NULL)) {