Allow absolute filenames in filename entry. Patch from Yevgen Muntyan

2006-05-23  Alexander Larsson  <alexl@redhat.com>

	* gtk/gtkprinteroptionwidget.c (filesave_changed_cb):
	Allow absolute filenames in filename entry.
	Patch from Yevgen Muntyan (#341679)

diff --git a/ChangeLog b/ChangeLog
index 70248c40a6b64b62ab1f0260d4e2b2942a5d144a..9a78450bb5dc6e7a90f54472d6e70ca04fb62789 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-23  Alexander Larsson  <alexl@redhat.com>
+
+       * gtk/gtkprinteroptionwidget.c (filesave_changed_cb):
+       Allow absolute filenames in filename entry.
+       Patch from Yevgen Muntyan (#341679)
+
 2006-05-23  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtk.symbols:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 70248c40a6b64b62ab1f0260d4e2b2942a5d144a..9a78450bb5dc6e7a90f54472d6e70ca04fb62789 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-05-23  Alexander Larsson  <alexl@redhat.com>
+
+       * gtk/gtkprinteroptionwidget.c (filesave_changed_cb):
+       Allow absolute filenames in filename entry.
+       Patch from Yevgen Muntyan (#341679)
+
 2006-05-23  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtk.symbols:

diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c
index 440b873a1dc4bf88970b33a08fe651fa61bb0f7d..37c1f57d4ce581fd1d6546416a88e8ac883289cc 100644 (file)
--- a/gtk/gtkprinteroptionwidget.c
+++ b/gtk/gtkprinteroptionwidget.c
@@ -420,7 +420,14 @@ filesave_changed_cb (GtkWidget *w,
   directory = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (priv->combo));
   file =  gtk_entry_get_text (GTK_ENTRY (priv->entry));
 
-  value = g_build_filename (directory, file, NULL);
+  if (g_path_is_absolute (file))
+    value = g_strdup (file);
+#ifdef G_OS_UNIX
+  else if (file[0] == '~' && file[1] == '/')
+    value = g_build_filename (g_get_home_dir (), file + 2, NULL);
+#endif
+  else
+    value = g_build_filename (directory, file, NULL);
 
   if (value)
     gtk_printer_option_set (priv->source, value);