diff -urN gtkjournal-0.3.5b.orig/src/gjournal/journalwindow.cpp gtkjournal-0.3.5b/src/gjournal/journalwindow.cpp
--- gtkjournal-0.3.5b.orig/src/gjournal/journalwindow.cpp	2004-03-13 14:58:26 +0500
+++ gtkjournal-0.3.5b/src/gjournal/journalwindow.cpp	2004-11-14 20:02:40 +0500
@@ -302,24 +302,29 @@
 		// create a toolbar with three items
 		mainBox.pack_start( toolBar, Gtk::PACK_SHRINK );
 		{
-			using namespace Gtk::Toolbar_Helpers;
-
-			// create some buttons
-			StockElem newItem( Gtk::Stock::NEW, SigC::slot( *this, &JournalWindow::_newFileHandler ), "New Journal" );
-			StockElem open( Gtk::Stock::OPEN, SigC::slot( *this, &JournalWindow::_openHandler ), "Open Journal" );
-			StockElem save( Gtk::Stock::SAVE, SigC::slot( *this, &JournalWindow::_saveHandler ), "Save Journal" );
-			StockElem today( Gtk::Stock::JUMP_TO, SigC::slot( *this, &JournalWindow::_todayHandler ), "Today's Entry" );
-
-			// add the buttons
-			toolBar.tools().push_back( newItem );
-			toolBar.tools().push_back( open );
-			toolBar.tools().push_back( save );
-			toolBar.tools().push_back( Space() );
-			toolBar.tools().push_back( today );
-
-			// add the date label
-			Element date( dateLabel );
-			toolBar.tools().push_back( date );
+			Gtk::ToolButton* item = Gtk::manage( new Gtk::ToolButton(Gtk::Stock::NEW) );
+			toolBar.append( *item );
+			item->signal_clicked().connect( sigc::mem_fun( this, &JournalWindow::_newFileHandler ) );
+			item->set_label( "New Journal" );
+
+			item = Gtk::manage( new Gtk::ToolButton(Gtk::Stock::OPEN) );
+			toolBar.append( *item );
+			item->signal_clicked().connect( sigc::mem_fun( this, &JournalWindow::_openHandler ) );
+			item->set_label( "Open Journal" );
+
+			item = Gtk::manage( new Gtk::ToolButton(Gtk::Stock::SAVE) );
+			toolBar.append( *item );
+			item->signal_clicked().connect( sigc::mem_fun( this, &JournalWindow::_saveHandler ) );
+			item->set_label( "Save Journal" );
+
+			item = Gtk::manage( new Gtk::ToolButton(Gtk::Stock::JUMP_TO) );
+			toolBar.append( *item );
+			item->signal_clicked().connect( sigc::mem_fun( this, &JournalWindow::_todayHandler ) );
+			item->set_label( "Today's Entry" );
+
+			Gtk::ToolItem * toolitem = Gtk::manage( new Gtk::ToolItem );
+			toolitem->add( dateLabel );
+			toolBar.append( *toolitem );
 		}
 
 		calendarBox.set_size_request( 210, 70 );