[patch] Several small fixes to gdl, gnome-build, gnome-debug and anjuta2

From: "Gustavo M. Giráldez" <gustavo giraldez gmx net>
To: gnome-devtools gnome org
Subject: [patch] Several small fixes to gdl, gnome-build, gnome-debug and anjuta2
Date: Sun, 18 Nov 2001 16:37:51 -0300

Hi,

This patches fix some bugs I found in my second round of debugging
Anjuta and GdlDock.  Most of them fix warnings.  The save_layout_idle_cb
(anjuta2) one fixes the ETree resizing problem, as ETableHeader does
this with a low priority idle callback, so it was never executed once
the save layout cb was activated.  The destroy_cb in gdl one fixes a segfault.

Regards,

Gustavo

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gdl/ChangeLog,v
retrieving revision 1.37
diff -u -r1.37 ChangeLog
--- ChangeLog	2001/11/16 02:28:11	1.37
+++ ChangeLog	2001/11/18 18:59:40
@@ -1,3 +1,10 @@
+2001-11-18  Gustavo Giráldez  <gustavo giraldez gmx net>
+
+	* gdl/gdl-dock.c (gdl_dock_layout_load): Test if we have docked
+	items to show.  
+	* gdl/gdl-server-manager.c (destroy_cb): Call
+	all_destroyed_callback only if set.
+	
 2001-11-15  Dave Camp  <dave ximian com>
 
 	* gdl/gdl-file-selector-util.c: Added file.  Copied from
Index: gdl/gdl-dock.c
===================================================================
RCS file: /cvs/gnome/gdl/gdl/gdl-dock.c,v
retrieving revision 1.4
diff -u -r1.4 gdl-dock.c
--- gdl/gdl-dock.c	2001/11/10 14:52:24	1.4
+++ gdl/gdl-dock.c	2001/11/18 18:59:43
@@ -903,7 +903,8 @@
     }
     
     /* Show all items. */
-    gtk_widget_show_all (dock->root);
+    if (dock->root)
+        gtk_widget_show_all (dock->root);
 }
 
 void
Index: gdl/gdl-server-manager.c
===================================================================
RCS file: /cvs/gnome/gdl/gdl/gdl-server-manager.c,v
retrieving revision 1.2
diff -u -r1.2 gdl-server-manager.c
--- gdl/gdl-server-manager.c	2001/06/19 06:12:29	1.2
+++ gdl/gdl-server-manager.c	2001/11/18 19:00:03
@@ -67,7 +67,7 @@
 {
     num_servers--;
 
-    if (num_servers == 0) {
+    if (num_servers == 0 && all_destroyed_callback) {
         all_destroyed_callback ();
     }
 }

? src/event-service/Makefile
? src/event-service/Makefile.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-debug/ChangeLog,v
retrieving revision 1.144
diff -u -r1.144 ChangeLog
--- ChangeLog	2001/11/11 16:14:02	1.144
+++ ChangeLog	2001/11/18 19:22:48
@@ -1,3 +1,11 @@
+2001-11-18  Gustavo Giraldez  <gustavo giraldez gmx net>
+
+	* src/controls/gdf-output-terminal.c (output_terminal_class_init)
+	* src/controls/gdf-register-viewer.c (register_viewer_class_init)
+	* src/controls/gdf-stack-browser.c (stack_browser_class_init)
+	* src/controls/gdf-variable-viewer.c (variable_viewer_class_init):
+	remove GTK_ARG_CONSTRUCT from debugger argument.
+	
 2001-11-12  Wang Jian  <lark linux net cn>
 
 	* configure.in(ALL_LINGUAS): Added "zh_CN" for Simplified Chinese.
Index: src/controls/gdf-output-terminal.c
===================================================================
RCS file: /cvs/gnome/gnome-debug/src/controls/gdf-output-terminal.c,v
retrieving revision 1.3
diff -u -r1.3 gdf-output-terminal.c
--- src/controls/gdf-output-terminal.c	2001/07/04 20:35:50	1.3
+++ src/controls/gdf-output-terminal.c	2001/11/18 19:22:49
@@ -141,7 +141,7 @@
 
     gtk_object_add_arg_type ("GdfOutputTerminal::debugger",
                              GTK_TYPE_OBJECT,
-                             GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT, 
+                             GTK_ARG_READWRITE, 
                              ARG_DEBUGGER);
 	
     parent_class = gtk_type_class (zvt_term_get_type ());
Index: src/controls/gdf-register-viewer.c
===================================================================
RCS file: /cvs/gnome/gnome-debug/src/controls/gdf-register-viewer.c,v
retrieving revision 1.18
diff -u -r1.18 gdf-register-viewer.c
--- src/controls/gdf-register-viewer.c	2001/10/02 17:43:50	1.18
+++ src/controls/gdf-register-viewer.c	2001/11/18 19:22:50
@@ -168,7 +168,7 @@
 
     gtk_object_add_arg_type ("GdfRegisterViewer::debugger",
                              GTK_TYPE_OBJECT,
-                             GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT, 
+                             GTK_ARG_READWRITE, 
                              ARG_DEBUGGER);
 	
     parent_class = gtk_type_class (gtk_frame_get_type ());
Index: src/controls/gdf-stack-browser.c
===================================================================
RCS file: /cvs/gnome/gnome-debug/src/controls/gdf-stack-browser.c,v
retrieving revision 1.23
diff -u -r1.23 gdf-stack-browser.c
--- src/controls/gdf-stack-browser.c	2001/10/02 17:43:50	1.23
+++ src/controls/gdf-stack-browser.c	2001/11/18 19:22:51
@@ -184,7 +184,7 @@
 
     gtk_object_add_arg_type ("GdfStackBrowser::debugger",
                              GTK_TYPE_OBJECT,
-                             GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT, 
+                             GTK_ARG_READWRITE, 
                              ARG_DEBUGGER);
 
 
Index: src/controls/gdf-variable-viewer.c
===================================================================
RCS file: /cvs/gnome/gnome-debug/src/controls/gdf-variable-viewer.c,v
retrieving revision 1.41
diff -u -r1.41 gdf-variable-viewer.c
--- src/controls/gdf-variable-viewer.c	2001/07/16 03:38:25	1.41
+++ src/controls/gdf-variable-viewer.c	2001/11/18 19:22:52
@@ -278,7 +278,7 @@
 
     gtk_object_add_arg_type ("GdfVariableViewer::debugger",
                              GTK_TYPE_OBJECT,
-                             GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT, 
+                             GTK_ARG_READWRITE, 
                              ARG_DEBUGGER);
     gtk_object_add_arg_type ("GdfVariableViewer::show_entry",
                              GTK_TYPE_BOOL,

? gbfConf.sh
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-build/ChangeLog,v
retrieving revision 1.77
diff -u -r1.77 ChangeLog
--- ChangeLog	2001/11/15 20:37:41	1.77
+++ ChangeLog	2001/11/18 19:55:18
@@ -1,3 +1,15 @@
+2001-11-18  Gustavo Giráldez  <gustavo giraldez gmx net>
+
+	* src/controls/control-factories.c
+	(project_tree_control_set_frame_cb,
+	target_tree_control_set_frame_cb): Check if control frame is not
+	NIL before adding the menus.
+
+	* src/controls/gbf-build-info.c (class_init)
+	* src/controls/gbf-project-tree.c (class_init)
+	* src/controls/gbf-target-tree.c (class_init): remove
+	GTK_ARG_CONSTRUCT flag from project argument.
+	
 2001-11-15  JP Rosevear  <jpr ximian com>
 
 	* src/controls/gbf-target-tree.c: include header
Index: src/controls/control-factories.c
===================================================================
RCS file: /cvs/gnome/gnome-build/src/controls/control-factories.c,v
retrieving revision 1.16
diff -u -r1.16 control-factories.c
--- src/controls/control-factories.c	2001/11/15 17:34:46	1.16
+++ src/controls/control-factories.c	2001/11/18 19:55:25
@@ -165,7 +165,16 @@
 static void
 project_tree_control_set_frame_cb (BonoboControl *control, gpointer data)
 {
-    menus_add (control, data, "gbf-project-tree", pt_verbs);
+    CORBA_Environment ev;
+    Bonobo_ControlFrame frame;
+
+    frame = bonobo_control_get_control_frame (control);
+    if (frame != CORBA_OBJECT_NIL) {
+        menus_add (control, data, "gbf-project-tree", pt_verbs);
+        CORBA_exception_init (&ev);
+        CORBA_Object_release (CORBA_OBJECT (frame), &ev);
+        CORBA_exception_free (&ev);
+    };
 }
 
 static BonoboObject *
@@ -205,7 +214,16 @@
 static void
 target_tree_control_set_frame_cb (BonoboControl *control, gpointer data)
 {
-    menus_add (control, data, "gbf-target-tree", tt_verbs);
+    CORBA_Environment ev;
+    Bonobo_ControlFrame frame;
+
+    frame = bonobo_control_get_control_frame (control);
+    if (frame != CORBA_OBJECT_NIL) {
+        menus_add (control, data, "gbf-target-tree", tt_verbs);
+        CORBA_exception_init (&ev);
+        CORBA_Object_release (CORBA_OBJECT (frame), &ev);
+        CORBA_exception_free (&ev);
+    };
 }
 
 static BonoboObject *
Index: src/controls/gbf-build-info.c
===================================================================
RCS file: /cvs/gnome/gnome-build/src/controls/gbf-build-info.c,v
retrieving revision 1.8
diff -u -r1.8 gbf-build-info.c
--- src/controls/gbf-build-info.c	2001/11/15 20:37:44	1.8
+++ src/controls/gbf-build-info.c	2001/11/18 19:55:26
@@ -89,7 +89,7 @@
 
 	gtk_object_add_arg_type ("GbfBuildInfo::project",
 				 GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT, 
+				 GTK_ARG_READWRITE,
 				 ARG_PROJECT);
 
 	parent_class = gtk_type_class (gtk_vbox_get_type ());
Index: src/controls/gbf-project-tree.c
===================================================================
RCS file: /cvs/gnome/gnome-build/src/controls/gbf-project-tree.c,v
retrieving revision 1.21
diff -u -r1.21 gbf-project-tree.c
--- src/controls/gbf-project-tree.c	2001/11/15 18:31:55	1.21
+++ src/controls/gbf-project-tree.c	2001/11/18 19:55:31
@@ -134,7 +134,7 @@
 
 	 gtk_object_add_arg_type ("GbfProjectTree::project",
 				  GTK_TYPE_OBJECT,
-				  GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT, 
+				  GTK_ARG_READWRITE,
 				  ARG_PROJECT);
 
 	 parent_class = gtk_type_class (gtk_vbox_get_type ());
Index: src/controls/gbf-target-tree.c
===================================================================
RCS file: /cvs/gnome/gnome-build/src/controls/gbf-target-tree.c,v
retrieving revision 1.19
diff -u -r1.19 gbf-target-tree.c
--- src/controls/gbf-target-tree.c	2001/11/15 20:37:44	1.19
+++ src/controls/gbf-target-tree.c	2001/11/18 19:55:35
@@ -153,7 +153,7 @@
 
 	gtk_object_add_arg_type ("GbfTargetTree::project",
 				 GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT, 
+				 GTK_ARG_READWRITE,
 				 ARG_PROJECT);
 
 	parent_class = gtk_type_class (gtk_vbox_get_type ());

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/anjuta2/ChangeLog,v
retrieving revision 1.152
diff -u -r1.152 ChangeLog
--- ChangeLog	2001/11/16 04:09:42	1.152
+++ ChangeLog	2001/11/18 19:28:03
@@ -1,3 +1,9 @@
+2001-11-18  Gustavo Giráldez  <gustavo giraldez gmx net>
+
+	* src/window.c (save_layout_idle_cb): return FALSE to delete the
+	idle callback from the main loop.
+	(anjuta_window_remove_widget): unbind the dock item from the dock.
+	
 2001-11-15  Dave Camp  <dave ximian com>
 
 	* plugins/project-manager/project-tool.c (project_open): Use
Index: src/window.c
===================================================================
RCS file: /cvs/gnome/anjuta2/src/window.c,v
retrieving revision 1.44
diff -u -r1.44 window.c
--- src/window.c	2001/11/10 14:53:52	1.44
+++ src/window.c	2001/11/18 19:28:17
@@ -178,7 +178,7 @@
 save_layout_idle_cb (gpointer data)
 {
 	anjuta_window_save_layout (ANJUTA_WINDOW (data));
-	return TRUE;
+	return FALSE;
 }
 
 static void
@@ -284,7 +284,8 @@
 {
 	GtkWidget *item;
 	item = gtk_object_get_data (GTK_OBJECT (w), "dockitem");
-	gdl_dock_item_hide (GDL_DOCK_ITEM (item));
+  	gdl_dock_item_hide (GDL_DOCK_ITEM (item));
+	gdl_dock_unbind_item (GDL_DOCK (window->dock), GDL_DOCK_ITEM (item));
 }
 
 void

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]