Main part of Gnome to Gtk conversion

[hvgrip.git] / src / grip.c

diff --git a/src/grip.c b/src/grip.c
index 3b74664..303366c 100644 (file)
--- a/src/grip.c
+++ b/src/grip.c
@@ -30,7 +30,6 @@
 #include <X11/Xlib.h>
 #include <time.h>
 #include "grip.h"
-#include <libgnomeui/gnome-window-icon.h>
 #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)