bonobo-text-plain patch

[Nat Friedman <nat helixcode com>]

Does the word "duh" mean anything to you? :-)

Yes, this is ok to checkin.  Thanks!

Nat

Maciej Stachowiak writes:
 > 
 > OK to check this in?
 > 
 > 2000-03-08  Maciej Stachowiak  <mjs@eazel.com>
 > 
 > 	* components/text-plain/bonobo-text-plain.c: Don't merge that
 >           ugly toolbar thing (some kind of test component should be
 >           the testbed for that); assorted cleanup.
 > 
 > 
 > Index: components/text-plain/bonobo-text-plain.c
 > ===================================================================
 > RCS file: /cvs/gnome/bonobo/components/text-plain/bonobo-text-plain.c,v
 > retrieving revision 1.38
 > diff -u -r1.38 bonobo-text-plain.c
 > --- components/text-plain/bonobo-text-plain.c	2000/02/16 10:27:58	1.38
 > +++ components/text-plain/bonobo-text-plain.c	2000/03/08 19:55:12
 > @@ -289,7 +289,7 @@
 >  	g_free (bonobo_object_data);
 >  
 >  	running_objects--;
 > -	if (running_objects != 0)
 > +	if (running_objects > 0)
 >  		return;
 >  
 >  	if (factory) {
 > @@ -449,11 +449,13 @@
 >  					label, NULL, -1, BONOBO_UI_HANDLER_PIXMAP_XPM_DATA,
 >  					bolt_xpm, 0, 0, clear_text_cb, view_data);
 >  
 > +	#if 0
 >  	bonobo_ui_handler_create_toolbar (uih, "Common");
 >  
 >  	bonobo_ui_handler_toolbar_new_item (uih, "/Common/item1", "item 1", NULL, -1,
 >  					   BONOBO_UI_HANDLER_PIXMAP_XPM_DATA, bolt_xpm,
 >  					   0, 0, NULL, NULL);
 > +	#endif
 >  }
 >  
 >  static void
 > @@ -732,6 +734,7 @@
 >  	 * signals so that we can update the other views.
 >  	 */
 >  	gtk_text_set_editable (GTK_TEXT (view_data->text), TRUE);
 > +
 >  	gtk_signal_connect (GTK_OBJECT (view_data->text), "insert_text",
 >  			    GTK_SIGNAL_FUNC (text_inserted_cb), view_data);
 >  	gtk_signal_connect (GTK_OBJECT (view_data->text), "delete_text",
 > @@ -745,7 +748,6 @@
 >  	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view_data->sw),
 >  					GTK_POLICY_AUTOMATIC,
 >  					GTK_POLICY_AUTOMATIC);
 > -
 >  	gtk_container_add (GTK_CONTAINER (view_data->sw), view_data->text);
 >  
 >  	gtk_table_attach (GTK_TABLE (view_data->table), view_data->sw,
 > @@ -775,8 +777,6 @@
 >          view = bonobo_view_new (view_data->table);
 >  	view_data->view = view;
 >  
 > -	bonobo_view_set_view_frame (view, view_frame);
 > -
 >  	gtk_signal_connect (GTK_OBJECT (view), "destroy",
 >  			    GTK_SIGNAL_FUNC (view_destroy_cb), view_data);
 >  
 > @@ -885,8 +885,7 @@
 >  		"bonobo-text-plain", VERSION,
 >  		&argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
 >  
 > -	orb = gnome_CORBA_ORB ();
 > -	if (bonobo_init (orb, NULL, NULL) == FALSE)
 > +	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
 >  		g_error (_("I could not initialize Bonobo"));
 >  
 >  	CORBA_exception_free (&ev);
 > 
 > 
 > -- 
 >         FAQ: Frequently-Asked Questions at http://www.gnome.org/gnomefaq
 >          To unsubscribe: mail gnome-components-list-request@gnome.org with 
 >                        "unsubscribe" as the Subject.