Changeset 1b8c3f8

Timestamp:

Sep 18, 2010, 5:07:40 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:

4a41f16

Parents:

dcd48ad

git-author:

David Benjamin <davidben@mit.edu> (09/16/10 17:10:21)

git-committer:

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

Message:

owl_viewwin doesn't need to keep track of cmdline

Files:

• owl.h (modified) (1 diff)
• viewwin.c (modified) (3 diffs)

owl.h

@@ -418 +418 @@
   gulong sig_status_redraw_id;
   owl_window *cmdwin;
-  owl_editwin *cmdline;
 } owl_viewwin;
   

viewwin.c

@@ -242 +242 @@
 owl_editwin *owl_viewwin_set_typwin_active(owl_viewwin *v, owl_history *hist) {
   int lines, cols;
-  if (v->cmdwin || v->cmdline)
+  owl_editwin *cmdline;
+  if (v->cmdwin)
     return NULL;
   /* Create the command line. */
@@ -248 +249 @@
   owl_viewwin_layout(v);
   owl_window_get_position(v->cmdwin, &lines, &cols, NULL, NULL);
-  v->cmdline = owl_editwin_new(v->cmdwin, lines, cols, OWL_EDITWIN_STYLE_ONELINE, hist);
+  cmdline = owl_editwin_new(v->cmdwin, lines, cols, OWL_EDITWIN_STYLE_ONELINE, hist);
   /* Swap out the bottom window. */
   owl_window_hide(v->status);
   owl_window_show(v->cmdwin);
-  return v->cmdline;
+  return cmdline;
 }
 
@@ -264 +265 @@
     g_object_unref(v->cmdwin);
     v->cmdwin = NULL;
-  }
-  if (v->cmdline) {
-    owl_editwin_unref(v->cmdline);
-    v->cmdline = NULL;
   }
 }