summaryrefslogtreecommitdiff
path: root/gui/gdmphotosetup.c
diff options
context:
space:
mode:
authorGeorge Lebl <jirka@5z.com>2002-05-15 00:04:15 +0000
committerGeorge Lebl <jirka@src.gnome.org>2002-05-15 00:04:15 +0000
commit5d303399b4802f886cbefb5ae3d77c0720c4aca2 (patch)
tree4fcc023f1222b32f0a8f5e47398baee7b751c5c7 /gui/gdmphotosetup.c
parent5468ab0b751c2542216d6d8f2fa61061e74f660c (diff)
downloadgdm-5d303399b4802f886cbefb5ae3d77c0720c4aca2.tar.gz
fixed crash, damnit I'm such an idiot, oh well fortunately the crash would
Tue May 14 17:13:33 2002 George Lebl <jirka@5z.com> * gui/gdmphotosetup.c: fixed crash, damnit I'm such an idiot, oh well fortunately the crash would happen only after things finished so most users would only notice a new corefile being created on exit :)
Diffstat (limited to 'gui/gdmphotosetup.c')
-rw-r--r--gui/gdmphotosetup.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/gui/gdmphotosetup.c b/gui/gdmphotosetup.c
index 793bc264..9cbd7198 100644
--- a/gui/gdmphotosetup.c
+++ b/gui/gdmphotosetup.c
@@ -134,8 +134,7 @@ main (int argc, char *argv[])
} else if (is_in_trusted_pic_dir (pixmap)) {
/* Picture is in trusted dir, no need to copy nor
* check it */
- char *homedir = g_get_home_dir ();
- char *cfg_file = g_strconcat (homedir,
+ char *cfg_file = g_strconcat (g_get_home_dir (),
"/.gnome/gdm",
NULL);
gnome_config_set_string ("/gdm/face/picture",
@@ -144,7 +143,6 @@ main (int argc, char *argv[])
/* ensure proper permissions */
chmod (cfg_file, 0600);
g_free (cfg_file);
- g_free (homedir);
break;
} else if (s.st_size > max_size) {
GtkWidget *d;
@@ -163,11 +161,10 @@ main (int argc, char *argv[])
} else {
char buf[4096];
size_t size;
- char *homedir = g_get_home_dir ();
- char *photofile = g_strconcat (homedir,
+ char *photofile = g_strconcat (g_get_home_dir (),
"/.gnome/photo",
NULL);
- char *cfg_file = g_strconcat (homedir,
+ char *cfg_file = g_strconcat (g_get_home_dir (),
"/.gnome/gdm",
NULL);
int fddest, fdsrc;
@@ -185,7 +182,6 @@ main (int argc, char *argv[])
g_strerror (errno));
gtk_dialog_run (GTK_DIALOG (d));
gtk_widget_destroy (d);
- g_free (homedir);
g_free (cfg_file);
g_free (photofile);
continue;
@@ -205,7 +201,6 @@ main (int argc, char *argv[])
gtk_dialog_run (GTK_DIALOG (d));
gtk_widget_destroy (d);
g_free (cfg_file);
- g_free (homedir);
g_free (photofile);
close (fdsrc);
continue;
@@ -223,7 +218,6 @@ main (int argc, char *argv[])
/* ensure proper permissions */
chmod (cfg_file, 0600);
g_free (cfg_file);
- g_free (homedir);
g_free (photofile);
break;
}