Changes in aim.c [e4524da:2770be99]

File:

• aim.c (modified) (2 diffs)

aim.c

@@ -1812 +1812 @@
   GPollFD *fd;
   int i;
-  if (len < event_source->fds->len)
+  if (len < event_source->fds->len) {
     owl_function_debugmsg("Truncating AIM PollFDs to %d, was %d", len, event_source->fds->len);
-  for (i = len; i < event_source->fds->len; i++) {
-    fd = event_source->fds->pdata[i];
-    g_source_remove_poll(&event_source->source, fd);
-    g_free(fd);
-  }
-  g_ptr_array_remove_range(event_source->fds, len, event_source->fds->len - len);
+    for (i = len; i < event_source->fds->len; i++) {
+      fd = event_source->fds->pdata[i];
+      g_source_remove_poll(&event_source->source, fd);
+      g_free(fd);
+    }
+    g_ptr_array_remove_range(event_source->fds, len, event_source->fds->len - len);
+  }
 }
 
@@ -1890 +1891 @@
 {
   owl_aim_event_source *event_source = (owl_aim_event_source*)source;
-  truncate_pollfd_list(event_source, 0);
-  g_ptr_array_free(event_source->fds, TRUE);
+  /* Don't remove the GPollFDs. We are being finalized, so they'll be removed
+   * for us. Moreover, glib will fire asserts if g_source_remove_poll is called
+   * on a source which has been destroyed (which occurs when g_source_remove is
+   * called on it). */
+  owl_ptr_array_free(event_source->fds, g_free);
 }