Changeset 7eaf2d172909418013d8e9cf19812bc6906cc2ad

Timestamp:

09/05/10 02:58:22 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

86b174b97aaa58086f66be2873ac2201fdf559cf

Parents:

ef9e54e3fdea5f50be28da38b8c9801828bedec2

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-09-05T02:58:22Z+0300

Message:

gui: properly cleanup on graph view creation failure

Files:

• gui/graph_view.c (modified) (4 diffs)

gui/graph_view.c

@@ -84 +84 @@
 }
 
+static void detach_canvas(struct graph_view * view_ptr)
+{
+  GtkWidget * child;
+
+  child = gtk_bin_get_child(GTK_BIN(g_main_scrolledwin));
+  if (child == view_ptr->canvas_widget)
+  {
+    gtk_container_remove(GTK_CONTAINER(g_main_scrolledwin), view_ptr->canvas_widget);
+    g_current_view = NULL;
+    gtk_widget_show(g_view_label);
+    gtk_scrolled_window_add_with_viewport(g_main_scrolledwin, g_view_label);
+  }
+}
+
 #define view_ptr ((struct graph_view *)context)
 
@@ -221 +235 @@
     if (!ladish_app_supervisor_proxy_create(service, object, view_ptr, app_added, app_state_changed, app_removed, &view_ptr->app_supervisor))
     {
-      goto detach_graph_canvas;
+      goto remove_from_world_tree;
     }
   }
@@ -252 +266 @@
     ladish_app_supervisor_proxy_destroy(view_ptr->app_supervisor);
   }
-detach_graph_canvas:
-  graph_canvas_detach(view_ptr->graph_canvas);
+remove_from_world_tree:
+  list_del(&view_ptr->siblings);
+  if (!list_empty(&g_views))
+  {
+    world_tree_activate((graph_view_handle)list_entry(g_views.next, struct graph_view, siblings));
+  }
+  else
+  {
+    set_main_window_title(NULL);
+  }
+
+  detach_canvas(view_ptr);
+
+  world_tree_remove((graph_view_handle)view_ptr);
 destroy_graph_canvas:
   graph_canvas_destroy(view_ptr->graph_canvas);
@@ -297 +323 @@
 }
 
-static void detach_canvas(struct graph_view * view_ptr)
-{
-  GtkWidget * child;
-
-  child = gtk_bin_get_child(GTK_BIN(g_main_scrolledwin));
-  if (child == view_ptr->canvas_widget)
-  {
-    gtk_container_remove(GTK_CONTAINER(g_main_scrolledwin), view_ptr->canvas_widget);
-    g_current_view = NULL;
-    gtk_widget_show(g_view_label);
-    gtk_scrolled_window_add_with_viewport(g_main_scrolledwin, g_view_label);
-  }
-}
-
 #define view_ptr ((struct graph_view *)view)