Index: src/gui/gui.c =================================================================== --- src/gui/gui.c (revision 44) +++ src/gui/gui.c (working copy) @@ -120,32 +120,8 @@ *box = hbox; return vbox; } - - -/* generally generated by glade */ -static GtkWidget* create_about(void) -{ - GtkAboutDialog* about; - GdkPixbuf* logo; - const char* authors[] = { "Pete Bessman ", 0 }; - /* should this be freed later on? */ - logo = gdk_pixbuf_new_from_file(PIXMAPDIR "specimen.png", NULL); - - about = (GtkAboutDialog*)gtk_about_dialog_new(); - gtk_about_dialog_set_name(about, "Specimen"); - gtk_about_dialog_set_version(about, VERSION); - gtk_about_dialog_set_copyright(about, "(C) 2004 - 2005 Pete Bessman"); - gtk_about_dialog_set_authors(about, authors); - gtk_about_dialog_set_logo(about, logo); - - gtk_container_set_border_width(GTK_CONTAINER(about), GUI_BORDERSPACE); - gtk_window_set_type_hint(GTK_WINDOW(about), GDK_WINDOW_TYPE_HINT_DIALOG); - - return (GtkWidget*)about; -} - - + /* when the 'x' button is clicked on the titlebar */ static gboolean cb_delete (GtkWidget* widget, GdkEvent* event, gpointer data) @@ -399,9 +375,20 @@ static void cb_menu_help_about (GtkWidget* widget, gpointer data) { - GtkWidget* about = create_about(); - - gtk_widget_show(about); + GdkPixbuf* logo; + const char* authors[] = { "Pete Bessman ", 0 }; + + /* should this be freed later on? */ + logo = gdk_pixbuf_new_from_file(PIXMAPDIR "specimen.png", NULL); + + gtk_show_about_dialog( + GTK_WINDOW(data), + "name", "Specimen", + "logo", logo, + "authors", authors, + "version", VERSION, + "copyright", "(C) 2004 - 2005 Pete Bessman", + NULL); } @@ -551,7 +538,7 @@ gtk_menu_shell_append (GTK_MENU_SHELL (menu_help), menu_help_about); g_signal_connect (G_OBJECT (menu_help_about), "activate", - G_CALLBACK (cb_menu_help_about), NULL); + G_CALLBACK (cb_menu_help_about), window); gtk_widget_show (menu_help_about); /* setup the main window's master hbox, and left and right boxes */