--- a/patches/xscreensaver-25-gseal.diff Tue Jun 15 03:23:40 2010 +0000
+++ b/patches/xscreensaver-25-gseal.diff Tue Jun 15 23:47:51 2010 +0000
@@ -9,6 +9,8 @@
functions in the GTK docs at http://library.gnome.org/devel/gtk/ and have
not been manually verified.
+[Submitted upstream 06/11/10]
+
diff --git xscreensaver-5.11/driver/demo-Gtk-conf.c xscreensaver-5.11/driver/demo-Gtk-conf.c
--- xscreensaver-5.11/driver/demo-Gtk-conf.c
+++ xscreensaver-5.11/driver/demo-Gtk-conf.c
@@ -121,14 +123,14 @@
+# define SET_CAN_DEFAULT(w) gtk_widget_set_can_default ((w), TRUE)
+# define GET_SENSITIVE(w) gtk_widget_get_sensitive (w)
+#else
-+# define SET_CAN_DEFAULT(w) GTK_WIDGET_SET_FLAGS ((w), GTK_CAN_DEFAULT)
++# define SET_CAN_DEFAULT(w) GTK_WIDGET_SET_FLAGS ((w), GTK_CAN_DEFAULT)
+# define GET_SENSITIVE(w) GTK_WIDGET_IS_SENSITIVE (w)
+#endif
+
+#if GTK_CHECK_VERSION(2,20,0)
-+# define GET_REALIZED(w) gtk_widget_get_realized (w)
++# define GET_REALIZED(w) gtk_widget_get_realized (w)
+#else
-+# define GET_REALIZED(w) GTK_WIDGET_REALIZED (w)
++# define GET_REALIZED(w) GTK_WIDGET_REALIZED (w)
+#endif
+
/* from exec.c */
@@ -418,31 +420,4 @@
fix_preview_visual (s);
/* Realize page zero, so that we can diddle the scrollbar when the
-diff --git xscreensaver-5.11/driver/lock-Gtk.c xscreensaver-5.11/driver/lock-Gtk.c
---- xscreensaver-5.11/driver/lock-Gtk.c
-+++ xscreensaver-5.11/driver/lock-Gtk.c
-@@ -73,6 +73,12 @@
- #include "remote.h"
- #include "trusted-utils.h"
-
-+#if GTK_CHECK_VERSION(2,14,0)
-+# define GET_WINDOW(w) gtk_widget_get_window (w)
-+#else
-+# define GET_WINDOW(w) ((w)->window)
-+#endif
-+
- static Atom XA_UNLOCK_RATIO;
- Atom XA_VROOT;
- Atom XA_SCREENSAVER, XA_SCREENSAVER_RESPONSE, XA_SCREENSAVER_VERSION;
-@@ -714,8 +720,8 @@ main (int argc, char *argv[])
-
- XSync (GDK_DISPLAY (), False);
-
-- gdk_window_add_filter (pwd->dialog->window, dialog_filter_func, pwd);
-- write_windowid ("dialog_win", GDK_WINDOW_XID (pwd->dialog->window));
-+ gdk_window_add_filter (GET_WINDOW (pwd->dialog), dialog_filter_func, pwd);
-+ write_windowid ("dialog_win", GDK_WINDOW_XID (GET_WINDOW (pwd->dialog)));
-
- if (server_list && server_list->_length)
- {