#include <config.h>
#include <gtk/gtk.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkbuildable.h>
#include "psppire-dialog.h"
#include "psppire-buttonbox.h"
#include "psppire-selector.h"
#include "psppire-conf.h"
#include <string.h>
+#include "helper.h"
static void psppire_dialog_class_init (PsppireDialogClass *);
static void psppire_dialog_init (PsppireDialog *);
PsppireConf *conf = psppire_conf_new ();
- if ( ! GTK_WIDGET_MAPPED (dialog))
+ if ( ! gtk_widget_get_mapped (GTK_WIDGET (dialog)))
return FALSE;
base = gtk_buildable_get_name (GTK_BUILDABLE (dialog));
gtk_window_set_type_hint (GTK_WINDOW (dialog),
GDK_WINDOW_TYPE_HINT_DIALOG);
- g_object_set (dialog, "icon-name", "psppicon", NULL);
+ g_object_set (dialog, "icon-name", "pspp", NULL);
}