summaryrefslogtreecommitdiff
path: root/www/netscape-remote/files/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'www/netscape-remote/files/patch-aa')
-rw-r--r--www/netscape-remote/files/patch-aa89
1 files changed, 0 insertions, 89 deletions
diff --git a/www/netscape-remote/files/patch-aa b/www/netscape-remote/files/patch-aa
deleted file mode 100644
index e184c0e72551..000000000000
--- a/www/netscape-remote/files/patch-aa
+++ /dev/null
@@ -1,89 +0,0 @@
---- remote.c.orig Wed May 2 01:47:12 2001
-+++ remote.c Wed May 2 01:47:34 2001
-@@ -43,8 +43,8 @@
- file, you can find it at "http://home.netscape.com/newsref/std/vroot.h".
- If you don't care about supporting virtual root window managers, you can
- comment this line out.
-- */
- #include "vroot.h"
-+*/
-
-
- #ifdef STANDALONE
-@@ -81,21 +81,26 @@
- mozilla_remote_find_window (Display *dpy)
- {
- int i;
-- Window root = RootWindowOfScreen (DefaultScreenOfDisplay (dpy));
-- Window root2, parent, *kids;
-- unsigned int nkids;
-+ Window root, root2 = DefaultRootWindow(dpy);
-+ Window parent, *kids = NULL;
-+ unsigned int nkids = 0;
- Window result = 0;
- Window tenative = 0;
- unsigned char *tenative_version = 0;
-
-- if (! XQueryTree (dpy, root, &root2, &parent, &kids, &nkids))
-+ /* root != root2 is possible with virtual root WMs. */
-+ /* turns out, we need to get to the bottom -- the very top root window */
-+ /* what continues to puzzle me, is that xlsclients works without this -- */
-+ /* The DefaultRootWindow(dpy) always returns the right thing to it... */
-+ do {
-+ root = root2;
-+ if (! XQueryTree (dpy, root, &root2, &parent, &kids, &nkids))
- {
- fprintf (stderr, "%s: XQueryTree failed on display %s\n", progname,
- DisplayString (dpy));
- exit (2);
- }
--
-- /* root != root2 is possible with virtual root WMs. */
-+ } while (root != root2);
-
- if (! (kids && nkids))
- {
-@@ -146,11 +151,16 @@
- }
- else if (tenative)
- {
-+#ifndef STANDALONE
-+ /* no point in harassing the user when run standalone; everyone has
-+ * at least netscape 1.1 by now!
-+ */
- fprintf (stderr,
- "%s: warning: expected version %s but found version\n"
- "\t%s (0x%x) instead.\n",
- progname, expected_mozilla_version,
- tenative_version, (unsigned int) tenative);
-+#endif
- XFree (tenative_version);
- return tenative;
- }
-@@ -348,7 +358,7 @@
- mozilla_remote_command (Display *dpy, Window window, const char *command,
- Bool raise_p)
- {
-- int result;
-+ int result = -1;
- Bool done = False;
- char *new_command = 0;
-
-@@ -507,6 +517,8 @@
- int status = 0;
- mozilla_remote_init_atoms (dpy);
-
-+ if(commands == NULL) return 0;
-+
- if (window == 0)
- window = mozilla_remote_find_window (dpy);
- else
-@@ -566,7 +578,7 @@
- }
-
-
--void
-+int
- main (int argc, char **argv)
- {
- Display *dpy;