--- np2/x11/gtk2/dialog_about.c	2004/07/15 14:24:33	1.2
+++ np2/x11/gtk2/dialog_about.c	2011/01/15 16:01:52	1.7
@@ -1,4 +1,4 @@
-/*	$Id: dialog_about.c,v 1.2 2004/07/15 14:24:33 monaka Exp $	*/
+/*	$Id: dialog_about.c,v 1.7 2011/01/15 16:01:52 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -12,8 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -42,8 +40,6 @@ static void
 about_destroy(GtkWidget *w, GtkWidget **wp)
 {
 
-	UNUSED(wp);
-
 	install_idle_process();
 	gtk_widget_destroy(w);
 }
@@ -70,7 +66,7 @@ create_about_dialog(void)
 	gtk_window_set_resizable(GTK_WINDOW(about_dialog), FALSE);
 	gtk_container_set_border_width(GTK_CONTAINER(about_dialog), 10);
 	g_signal_connect(GTK_OBJECT(about_dialog), "destroy",
-	    GTK_SIGNAL_FUNC(about_destroy), NULL);
+	    G_CALLBACK(about_destroy), NULL);
 
 	main_widget = gtk_hbox_new(FALSE, 3);
 	gtk_widget_show(main_widget);
@@ -82,8 +78,8 @@ create_about_dialog(void)
 	if (neko_pixmap == NULL)
 		g_error("Couldn't create replacement pixmap.");
 	neko_image = gtk_image_new_from_pixmap(neko_pixmap, mask);
-	gdk_pixmap_unref(neko_pixmap);
-	gdk_bitmap_unref(mask);
+	g_object_unref(neko_pixmap);
+	g_object_unref(mask);
 	gtk_widget_show(neko_image);
 	gtk_box_pack_start(GTK_BOX(main_widget), neko_image, FALSE, FALSE, 10);
 
@@ -100,9 +96,9 @@ create_about_dialog(void)
 	gtk_widget_show(ok_button);
 	gtk_box_pack_end(GTK_BOX(main_widget), ok_button, FALSE, TRUE, 0);
 	g_signal_connect_swapped(GTK_OBJECT(ok_button), "clicked",
-	    GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(about_dialog));
-	GTK_WIDGET_SET_FLAGS(ok_button, GTK_CAN_DEFAULT);
-	GTK_WIDGET_SET_FLAGS(ok_button, GTK_HAS_DEFAULT);
+	    G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(about_dialog));
+	gtk_widget_set_can_default(ok_button, TRUE);
+	gtk_widget_has_default(ok_button);
 	gtk_widget_grab_default(ok_button);
 
 	gtk_widget_show_all(about_dialog);