# include <capplet-widget.h>
#endif
-extern Display *gdk_display;
+#include <gdk/gdkx.h>
#include "version.h"
#include "prefs.h"
while (parent->parent)
parent = parent->parent;
+ if (!GTK_WIDGET (parent)->window) /* too early to pop up transient dialogs */
+ return;
+
head = msg;
while (head)
{
GTK_SIGNAL_FUNC (warning_dialog_dismiss_cb),
(gpointer) dialog);
}
+
gdk_window_set_transient_for (GTK_WIDGET (dialog)->window,
GTK_WIDGET (parent)->window);
int status;
apply_changes_and_save (widget);
- status = xscreensaver_command (gdk_display, command, arg, False, &err);
+ status = xscreensaver_command (GDK_DISPLAY(), command, arg, False, &err);
if (status < 0)
{
char buf [255];
else
{
char *s = 0;
- xscreensaver_command (gdk_display, XA_DEMO, which + 1, False, &s);
+ xscreensaver_command (GDK_DISPLAY(), XA_DEMO, which + 1, False, &s);
if (s) free (s);
}
}
run_cmd (GTK_WIDGET (widget), XA_RESTART, 0);
#else
apply_changes_and_save (GTK_WIDGET (widget));
- xscreensaver_command (gdk_display, XA_EXIT, 0, False, NULL);
+ xscreensaver_command (GDK_DISPLAY(), XA_EXIT, 0, False, NULL);
sleep (1);
system ("xscreensaver -nosplash &");
#endif
{
int countdown = 5;
- Display *dpy = gdk_display;
+ Display *dpy = GDK_DISPLAY();
/* GtkWidget *dialog = 0;*/
char *rversion = 0;
char b[255]; \
sprintf (b, "Error:\n\n" "Directory does not exist: \"%s\"\n", line); \
warning_dialog (GTK_WIDGET (button), b, False, 100); \
+ if ((field)) free ((field)); \
+ (field) = strdup(line); \
} \
else { \
if ((field)) free ((field)); \
if (changed)
{
- Display *dpy = gdk_display;
+ Display *dpy = GDK_DISPLAY();
sync_server_dpms_settings (dpy, p->dpms_enabled_p,
p->dpms_standby / 1000,
p->dpms_suspend / 1000,
int format;
unsigned long nitems, bytesafter;
CARD32 *data = 0;
- Display *dpy = gdk_display;
+ Display *dpy = GDK_DISPLAY();
int which = 0;
GtkList *list;
Bool found_any_writable_cells = False;
Bool dpms_supported = False;
- Display *dpy = gdk_display;
+ Display *dpy = GDK_DISPLAY();
int nscreens = ScreenCount(dpy);
int i;
for (i = 0; i < nscreens; i++)
static void
the_network_is_not_the_computer (GtkWidget *parent)
{
- Display *dpy = gdk_display;
+ Display *dpy = GDK_DISPLAY();
char *rversion, *ruser, *rhost;
char *luser, *lhost;
char *msg = 0;
*/
XtToolkitInitialize ();
app = XtCreateApplicationContext ();
- dpy = gdk_display;
+ dpy = GDK_DISPLAY();
XtAppSetFallbackResources (app, defaults);
XtDisplayInitialize (app, dpy, progname, progclass, 0, 0, &argc, argv);
toplevel_shell = XtAppCreateShell (progname, progclass,