--- np2/x11/gtk2/dialog_about.c 2010/12/23 06:32:35 1.6 +++ np2/x11/gtk2/dialog_about.c 2012/01/23 04:46:47 1.10 @@ -1,5 +1,3 @@ -/* $Id: dialog_about.c,v 1.6 2010/12/23 06:32:35 monaka Exp $ */ - /* * Copyright (c) 2002-2003 NONAKA Kimihiro * All rights reserved. @@ -40,8 +38,6 @@ static void about_destroy(GtkWidget *w, GtkWidget **wp) { - UNUSED(wp); - install_idle_process(); gtk_widget_destroy(w); } @@ -55,9 +51,7 @@ create_about_dialog(void) GtkWidget *ver_label; GtkWidget *ok_button; GtkWidget *neko_image; - GdkColormap *colormap; - GdkPixmap *neko_pixmap; - GdkBitmap *mask; + GdkPixbuf *neko_pixbuf; uninstall_idle_process(); @@ -74,14 +68,9 @@ create_about_dialog(void) gtk_widget_show(main_widget); gtk_container_add(GTK_CONTAINER(about_dialog), main_widget); - colormap = gtk_widget_get_colormap(about_dialog); - neko_pixmap = gdk_pixmap_colormap_create_from_xpm_d(NULL, colormap, - &mask, NULL, (gchar **)np2_icon); - if (neko_pixmap == NULL) - g_error("Couldn't create replacement pixmap."); - neko_image = gtk_image_new_from_pixmap(neko_pixmap, mask); - g_object_unref(neko_pixmap); - g_object_unref(mask); + neko_pixbuf = gdk_pixbuf_new_from_xpm_data(np2_icon); + neko_image = gtk_image_new_from_pixbuf(neko_pixbuf); + g_object_unref(neko_pixbuf); gtk_widget_show(neko_image); gtk_box_pack_start(GTK_BOX(main_widget), neko_image, FALSE, FALSE, 10);