Changeset b3b1b05 for popwin.c

Timestamp:

Sep 18, 2010, 5:07:39 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

03ca005

Parents:

7ba2ad4

git-author:

David Benjamin <davidben@mit.edu> (08/01/10 01:06:10)

git-committer:

David Benjamin <davidben@mit.edu> (09/18/10 17:07:39)

Message:

To be thorough, track all signal ids in the popwin

This isn't actually necessary here, but it's more correct. The
awkwardness suggests that we want the widgets to be GObjects so that
owl_signal_connect_object may do this automatically.

File:

• popwin.c (modified) (3 diffs)

popwin.c

@@ -13 +13 @@
   pw->border = owl_window_new(NULL);
   pw->content = owl_window_new(pw->border);
-  g_signal_connect(pw->border, "redraw", G_CALLBACK(owl_popwin_draw_border), 0);
+  /* To be thorough, we ensure each signal is disconnected when we close. */
+  pw->sig_redraw_id =
+    g_signal_connect(pw->border, "redraw", G_CALLBACK(owl_popwin_draw_border), 0);
+  pw->sig_resize_id =
+    g_signal_connect(pw->border, "resized", G_CALLBACK(owl_popwin_size_content), pw);
   owl_signal_connect_object(owl_window_get_screen(), "resized", G_CALLBACK(owl_popwin_size_border), pw->border, 0);
-  owl_signal_connect_object(pw->border, "resized", G_CALLBACK(owl_popwin_size_content), pw->content, 0);
 
   /* bootstrap sizing */
@@ -45 +48 @@
 {
   int lines, cols;
-  owl_window *content = user_data;
+  owl_popwin *pw = user_data;
   owl_window_get_position(parent, &lines, &cols, 0, 0);
-  owl_window_set_position(content, lines-2, cols-2, 1, 1);
+  owl_window_set_position(pw->content, lines-2, cols-2, 1, 1);
 }
 
@@ -73 +76 @@
   if (!pw->active)
     return 1;
+  g_signal_handler_disconnect(pw->border, pw->sig_resize_id);
+  g_signal_handler_disconnect(pw->border, pw->sig_redraw_id);
   owl_window_unlink(pw->border);
   g_object_unref(pw->border);