X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fgrip.c;h=303366c033d688dffc56ffbd3a3413dde1732ed0;hb=755add816a5b297c5601f89b9c2fb049b6c7d6cf;hp=3b74664fd7fb47fdb5a72607e0f70c24ce18f0cb;hpb=64cdc5a741a2ab7cb8666e81be138657a0fea46e;p=hvgrip.git diff --git a/src/grip.c b/src/grip.c index 3b74664..303366c 100644 --- a/src/grip.c +++ b/src/grip.c @@ -30,7 +30,6 @@ #include #include #include "grip.h" -#include #include "discdb.h" #include "cdplay.h" #include "discedit.h" @@ -176,9 +175,11 @@ 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=gnome_app_new(PACKAGE,_("Grip")); + app = gtk_window_new(GTK_WINDOW_TOPLEVEL); ginfo=g_new0(GripInfo,1); @@ -307,7 +308,7 @@ GtkWidget *GripNew(const gchar* geometry,char *device,char *scsi_device, gtk_box_pack_start(GTK_BOX(uinfo->winbox),uinfo->controls,FALSE,FALSE,0); gtk_widget_show(uinfo->controls); - gnome_app_set_contents(GNOME_APP(app),uinfo->winbox); + gtk_container_add(GTK_CONTAINER(app), uinfo->winbox); gtk_widget_show(uinfo->winbox); CheckNewDisc(ginfo,FALSE); @@ -471,7 +472,9 @@ static void DoHelp(GtkWidget *widget,gpointer data) section=(char *)data; +#ifdef CONVERSION_GNOME_TO_GTK gnome_help_display("grip.xml",section,NULL); +#endif } static void MakeHelpPage(GripInfo *ginfo)