fix tab rename

jcupitt · jcupitt · commit 6fe5ce789e68 · 2013-04-20T11:11:13.000+01:00
diff --git a/TODO b/TODO
@@ -1,4 +1,3 @@
-- tab menu / rename -> segv
 
 - hide tabs if only one tab in window, though we'd need to allow tab drop 
   anywhere in window for that
diff --git a/src/view.c b/src/view.c
@@ -282,7 +282,8 @@ view_child_front( View *child )
 {
 	View *parent = child->parent;
 
-	VIEW_GET_CLASS( parent )->child_front( parent, child );
+	if( parent )
+		VIEW_GET_CLASS( parent )->child_front( parent, child );
 }
 
 /* Break link to model. 
diff --git a/src/workspace.c b/src/workspace.c
@@ -1752,22 +1752,9 @@ workspace_selected_save( Workspace *ws, const char *filename )
 gboolean
 workspace_rename( Workspace *ws, const char *name, const char *caption )
 {
-	Workspacegroup *wsg = workspace_get_workspacegroup( ws );
-
 	if( !symbol_rename( ws->sym, name ) )
 		return( FALSE );
-
-	g_object_ref( ws );
-
-	icontainer_child_remove( ICONTAINER( ws ) );
 	iobject_set( IOBJECT( ws ), IOBJECT( ws->sym )->name, caption );
-	icontainer_child_add( ICONTAINER( wsg ), ICONTAINER( ws ),
-		ICONTAINER( ws )->pos );
-
-	g_object_unref( ws );
-
-	// do we need this? unclear
-	//iobject_changed( IOBJECT( wsg ) );
 
 	return( TRUE );
 }
diff --git a/src/workspacegroupview.c b/src/workspacegroupview.c
@@ -311,6 +311,7 @@ workspacegroupview_rename_sub( iWindow *iwnd, void *client,
 		nfn( sys, IWINDOW_ERROR );
 		return;
 	}
+
 	model_front( MODEL( ws ) );
 
 	nfn( sys, IWINDOW_YES );

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-- tab menu / rename -> segv`
`2`	`1`
`3`	`2`	`- hide tabs if only one tab in window, though we'd need to allow tab drop`
`4`	`3`	`anywhere in window for that`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,8 @@ view_child_front( View *child )`
`282`	`282`	`{`
`283`	`283`	`View *parent = child->parent;`
`284`	`284`
`285`		`- VIEW_GET_CLASS( parent )->child_front( parent, child );`
	`285`	`+ if( parent )`
	`286`	`+ VIEW_GET_CLASS( parent )->child_front( parent, child );`
`286`	`287`	`}`
`287`	`288`
`288`	`289`	`/* Break link to model.`
Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,7 @@ workspacegroupview_rename_sub( iWindow iwnd, void client,`
`311`	`311`	`nfn( sys, IWINDOW_ERROR );`
`312`	`312`	`return;`
`313`	`313`	`}`
	`314`	`+`
`314`	`315`	`model_front( MODEL( ws ) );`
`315`	`316`
`316`	`317`	`nfn( sys, IWINDOW_YES );`