diff options
| author | William Jon McCann <jmccann@redhat.com> | 2008-07-21 16:16:04 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2008-07-21 16:16:04 +0000 |
| commit | 968dc5d3899719473f3339ffac072c9c96baa27b (patch) | |
| tree | 73d31dad4daf83e7b08766fe9911f62af3dd3ceb /utils | |
| parent | 51c6b49401a9b4a622afcf72ce7ff40d58f707e9 (diff) | |
| download | gdm-968dc5d3899719473f3339ffac072c9c96baa27b.tar.gz | |
Fix xauth dir permissions if it exists.
2008-07-21 William Jon McCann <jmccann@redhat.com>
* 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
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/Makefile.am | 1 | ||||
| -rw-r--r-- | utils/gdm-screenshot.c | 20 |
2 files changed, 13 insertions, 8 deletions
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 |