#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"
#include "parsecfg.h"
#include "tray.h"
-static void ReallyDie(gint reply,gpointer data);
+static void ReallyDie(gpointer data);
static void MakeStatusPage(GripInfo *ginfo);
static void DoHelp(GtkWidget *widget,gpointer data);
static void MakeHelpPage(GripInfo *ginfo);
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);
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);
/* Check if we have a dev release */
if(minor%2) {
- gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+ DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
_("This is a development version of Grip. If you encounter problems, you are encouraged to revert to the latest stable version."));
}
}
#ifndef GRIPCD
if(ginfo->ripping_a_disc || ginfo->encoding)
- gnome_app_ok_cancel_modal((GnomeApp *)ginfo->gui_info.app,
+ DisplayOkCancelDialog(GTK_WINDOW(ginfo->gui_info.app),
_("Work is in progress.\nReally shut down?"),
ReallyDie,(gpointer)ginfo);
- else ReallyDie(0,ginfo);
+ else ReallyDie(ginfo);
#else
- ReallyDie(0,ginfo);
+ ReallyDie(ginfo);
#endif
}
-static void ReallyDie(gint reply,gpointer data)
+static void ReallyDie(gpointer data)
{
GripInfo *ginfo;
- if(reply) return;
-
ginfo=(GripInfo *)data;
#ifndef GRIPCD
section=(char *)data;
+#ifdef CONVERSION_GNOME_TO_GTK
gnome_help_display("grip.xml",section,NULL);
+#endif
}
static void MakeHelpPage(GripInfo *ginfo)
if(confret<0) {
/* Check if the config is out of date */
if(confret==-2) {
- gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+ DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
_("Your config file is out of date -- "
"resetting to defaults.\n"
"You will need to re-configure Grip.\n"
g_snprintf(filename,256,"%s/%s",getenv("HOME"),ginfo->config_filename);
if(!SaveConfig(filename,"GRIP",2,cfg_entries))
- gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+ DisplayWarningMsg(GTK_WINDOW(ginfo->gui_info.app),
_("Error: Unable to save config file."));
SaveRipperConfig(ginfo,ginfo->selected_ripper);