X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fgrip.c;fp=src%2Fgrip.c;h=80e859a9fe2a26a6c7b71ddbdb9b9847d4d218c4;hb=e1e84159f84c6f0164ecd7064304947a0efcea8d;hp=ee0fe2dc067af282606f5bdf34113a810d88153f;hpb=ac3dc15eeec6da8d9e01f997aacc43103c2fa720;p=hvgrip.git diff --git a/src/grip.c b/src/grip.c index ee0fe2d..80e859a 100644 --- a/src/grip.c +++ b/src/grip.c @@ -177,12 +177,8 @@ GtkWidget *GripNew(const gchar* geometry,char *device,char *scsi_device, int major,minor,point; char buf[256]; -#ifdef CONVERSION_GNOME_TO_GTK - gnome_window_icon_set_default_from_file(GNOME_ICONDIR"/gripicon.png"); -#endif - app = gtk_window_new(GTK_WINDOW_TOPLEVEL); - + ginfo=g_new0(GripInfo,1); gtk_object_set_user_data(GTK_OBJECT(app),(gpointer)ginfo); @@ -302,17 +298,19 @@ GtkWidget *GripNew(const gchar* geometry,char *device,char *scsi_device, uinfo->playopts=MakePlayOpts(ginfo); gtk_box_pack_start(GTK_BOX(uinfo->winbox),uinfo->playopts,FALSE,FALSE,0); if(uinfo->track_prog_visible) gtk_widget_show(uinfo->playopts); - + uinfo->controls=MakeControls(ginfo); if(uinfo->minimized) gtk_box_pack_start(GTK_BOX(uinfo->winbox),uinfo->controls,TRUE,TRUE,0); else gtk_box_pack_start(GTK_BOX(uinfo->winbox),uinfo->controls,FALSE,FALSE,0); gtk_widget_show(uinfo->controls); - + gtk_container_add(GTK_CONTAINER(app), uinfo->winbox); gtk_widget_show(uinfo->winbox); + gtk_window_set_icon_from_file(GTK_WINDOW(app), GNOME_ICONDIR"/gripicon.png", NULL); + CheckNewDisc(ginfo,FALSE); /* Check if we're running this version for the first time */