diff src/browser.c @ 26:b9e90a914e20

[gaim-migrate @ 35] Peter Teichman sent me another huge list of patches. Here they are :) committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Fri, 24 Mar 2000 19:17:34 +0000
parents 2846a03bda67
children bfdc427b936d
line wrap: on
line diff
--- a/src/browser.c	Fri Mar 24 08:55:32 2000 +0000
+++ b/src/browser.c	Fri Mar 24 19:17:34 2000 +0000
@@ -135,10 +135,17 @@
     XGetWindowProperty(dpy, win, WM_STATE, 0, 0, False, AnyPropertyType,
                        &type, &format, &nitems, &after, &data);
     if (type)
-        return win;
+    {
+	XFree(data);
+	return win;
+    }
+
     inf = TryChildren(dpy, win, WM_STATE);
     if (!inf)
         inf = win;
+
+    XFree(data);
+
     return inf;
 }
 
@@ -166,6 +173,8 @@
                            &after, &data);
         if (type)
             inf = children[i];
+
+	XFree(data);
     }
     for (i = 0; !inf && (i < nchildren); i++)
         inf = TryChildren(dpy, children[i], WM_STATE);
@@ -212,7 +221,7 @@
         if (!(kids && nkids)) {
                 sprintf (debug_buff, "%s: root window has no children on display %s\n",
                          progname, DisplayString (gdk_display));
-				debug_print(debug_buff);
+		debug_print(debug_buff);
             	return NULL;
         }
 
@@ -228,8 +237,10 @@
                                                  False, XA_STRING,
                                                  &type, &format, &nitems, &bytesafter,
                                                  &version);
+
                 if (! version)
                         continue;
+
                 if (strcmp ((char *) version, expected_mozilla_version) &&
                     !tenative)
                 {
@@ -237,7 +248,7 @@
                         tenative_version = version;
                         continue;
                 }
-                g_free (version);
+                XFree(version);
                 if (status == Success && type != None)
                 {
                         result = w;
@@ -245,6 +256,8 @@
                 }
         }
 
+	XFree(kids);
+
         if (result && tenative)
         {
             sprintf (debug_buff,
@@ -254,7 +267,7 @@
                          expected_mozilla_version, (unsigned int) result,
                          expected_mozilla_version);
 			debug_print(debug_buff);
-            g_free (tenative_version);
+            XFree(tenative_version);
             return gdk_window_foreign_new(result);
         }
         else if (tenative)
@@ -265,7 +278,7 @@
                      progname, expected_mozilla_version,
                      tenative_version, (unsigned int) tenative);
 			debug_print(debug_buff);
-            g_free (tenative_version);
+            XFree(tenative_version);
             return gdk_window_foreign_new(tenative);
         }
         else if (result)
@@ -594,6 +607,7 @@
 
 		netscape_lock = 0;
 		
+		gdk_window_destroy (window);
 	} else {
 		pid = fork();
 		if (pid == 0) {