Move teardown to the logic place again (possible with deamon mode removed)

2 files changed, 2 insertions, 5 deletions

diff --git a/source/dialogs/combi.c b/source/dialogs/combi.c
index 2e828bc1..5ab58940 100644
--- a/source/dialogs/combi.c
+++ b/source/dialogs/combi.c
@@ -246,9 +246,9 @@ static char * combi_get_completion ( const Mode *sw, unsigned int index )
     CombiModePrivateData *pd = mode_get_private_data ( sw );
     for ( unsigned i = 0; i < pd->num_switchers; i++ ) {
         if ( index >= pd->starts[i] && index < ( pd->starts[i] + pd->lengths[i] ) ) {
-            char *comp = mode_get_completion ( pd->switchers[i], index - pd->starts[i] );
+            char *comp  = mode_get_completion ( pd->switchers[i], index - pd->starts[i] );
             char *mcomp = g_strdup_printf ( "!%c %s", mode_get_name ( pd->switchers[i] )[0], comp );
-            g_free(comp);
+            g_free ( comp );
             return mcomp;
         }
     }
diff --git a/source/dialogs/dmenu.c b/source/dialogs/dmenu.c
index fff41c98..56f397bf 100644
--- a/source/dialogs/dmenu.c
+++ b/source/dialogs/dmenu.c
@@ -510,9 +510,6 @@ int dmenu_switcher_dialog ( void )
     if ( find_arg ( "-password" ) >= 0 ) {
         menu_flags |= MENU_PASSWORD;
     }
-    if ( find_arg ( "-normal-window" ) >= 0 ) {
-        menu_flags |= MENU_NORMAL_WINDOW;
-    }
     /* copy filter string */
     input = g_strdup ( config.filter );