summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2003-09-30 07:18:46 +0000
committerChristian Persch <chpe@src.gnome.org>2003-09-30 07:18:46 +0000
commitd7368311fe43d9fc46179c740ee6ae8da6822736 (patch)
treea17259b34b6e0d8b74fc248a35167dc2c5b86349
parentd573e7f57f85d6b8c537f631c58638b0f71db01f (diff)
downloadepiphany-d7368311fe43d9fc46179c740ee6ae8da6822736.tar.gz
Don't pass NULL to gnome_vfs_expand_initial_tilde.
2003-09-30 Christian Persch <chpe@cvs.gnome.org> * embed/print-dialog.c: (print_get_info): Don't pass NULL to gnome_vfs_expand_initial_tilde.
-rw-r--r--ChangeLog6
-rwxr-xr-xembed/print-dialog.c11
2 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 144f47549..9e58521f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-30 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/print-dialog.c: (print_get_info):
+
+ Don't pass NULL to gnome_vfs_expand_initial_tilde.
+
2003-09-30 Marco Pesenti Gritti <marco@gnome.org>
* embed/ephy-history.c:
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index 1e20c9048..efecf68d5 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -270,6 +270,7 @@ print_get_info (EphyDialog *dialog)
GValue page_url = {0, };
GValue date = {0, };
GValue page_numbers = {0, };
+ const char *filename;
info = g_new0 (EmbedPrintInfo, 1);
@@ -282,7 +283,15 @@ print_get_info (EphyDialog *dialog)
g_value_unset (&printer);
ephy_dialog_get_value (dialog, FILE_PROP, &file);
- info->file = gnome_vfs_expand_initial_tilde (g_value_get_string (&file));
+ filename = g_value_get_string (&file);
+ if (filename != NULL)
+ {
+ info->file = gnome_vfs_expand_initial_tilde (g_value_get_string (&file));
+ }
+ else
+ {
+ info->file = NULL;
+ }
g_value_unset (&file);
ephy_dialog_get_value (dialog, BOTTOM_PROP, &bottom_margin);