From 968dc5d3899719473f3339ffac072c9c96baa27b Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Mon, 21 Jul 2008 16:16:04 +0000 Subject: Fix xauth dir permissions if it exists. 2008-07-21 William Jon McCann * daemon/gdm-display-access-file.c (_create_xauth_file_for_user): Fix xauth dir permissions if it exists. * utils/Makefile.am: * utils/gdm-screenshot.c (screenshot_save), (prepare_screenshot): Write gdm screenshot output to /var/run/gdm instead of /tmp. svn path=/trunk/; revision=6314 --- utils/Makefile.am | 1 + utils/gdm-screenshot.c | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'utils') diff --git a/utils/Makefile.am b/utils/Makefile.am index d33d5a6f..642cd382 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -3,6 +3,7 @@ NULL = INCLUDES = \ -I. \ -I.. \ + -DLOCALSTATEDIR=\""$(localstatedir)"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ $(UTILS_CFLAGS) \ $(GTK_CFLAGS) \ diff --git a/utils/gdm-screenshot.c b/utils/gdm-screenshot.c index f395a3b8..f92744b5 100644 --- a/utils/gdm-screenshot.c +++ b/utils/gdm-screenshot.c @@ -158,11 +158,14 @@ screenshot_get_pixbuf (Window w) static char * screenshot_save (GdkPixbuf *pixbuf) { - char *filename; - gboolean res; - GError *error; + char *filename; + gboolean res; + GError *error; + const char *save_dir; - filename = g_build_filename (g_get_tmp_dir (), + save_dir = LOCALSTATEDIR "/run/gdm"; + + filename = g_build_filename (save_dir, "GDM-Screenshot.png", NULL); @@ -206,10 +209,11 @@ prepare_screenshot (void) } filename = screenshot_save (screenshot); - g_print ("Wrote %s\n", filename); - /* FIXME: show a dialog or something */ - - g_free (filename); + if (filename != NULL) { + g_print ("Wrote %s\n", filename); + /* FIXME: show a dialog or something */ + g_free (filename); + } } int -- cgit v1.2.1