tags 396735 + patch
thanks
Hi,
Attached is the diff for my bluefish 1.0.6-1.1 NMU.
For some reason I managed to enter a completely unrelated bug number in
the changelog, which also made nmudiff send to the wrong bug (and
probably will make dak re-close it); sorry about that. :-)
diff -Nru /tmp/qQI1wqkZOo/bluefish-1.0.6/debian/changelog
/tmp/S0X3SWIcsI/bluefish-1.0.6/debian/changelog
--- /tmp/qQI1wqkZOo/bluefish-1.0.6/debian/changelog 2006-11-12
17:32:38.000000000 +0100
+++ /tmp/S0X3SWIcsI/bluefish-1.0.6/debian/changelog 2006-11-12
17:32:39.000000000 +0100
@@ -1,3 +1,11 @@
+bluefish (1.0.6-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * 02_fix_396095.dpatch: Fix an issue where Bluefish would segfault if trying
+ to save from a clean install; patch from upstream CVS. (Closes: #360401)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Sun, 12 Nov 2006 16:53:32 +0100
+
bluefish (1.0.6-1) unstable; urgency=low
* New upstream release 1.0.6.
diff -Nru /tmp/qQI1wqkZOo/bluefish-1.0.6/debian/patches/00list
/tmp/S0X3SWIcsI/bluefish-1.0.6/debian/patches/00list
--- /tmp/qQI1wqkZOo/bluefish-1.0.6/debian/patches/00list 1970-01-01
01:00:00.000000000 +0100
+++ /tmp/S0X3SWIcsI/bluefish-1.0.6/debian/patches/00list 2006-11-12
17:32:39.000000000 +0100
@@ -0,0 +1 @@
+02_fix_396096.dpatch
diff -Nru /tmp/qQI1wqkZOo/bluefish-1.0.6/debian/patches/02_fix_396096.dpatch
/tmp/S0X3SWIcsI/bluefish-1.0.6/debian/patches/02_fix_396096.dpatch
--- /tmp/qQI1wqkZOo/bluefish-1.0.6/debian/patches/02_fix_396096.dpatch
1970-01-01 01:00:00.000000000 +0100
+++ /tmp/S0X3SWIcsI/bluefish-1.0.6/debian/patches/02_fix_396096.dpatch
2006-11-12 17:32:39.000000000 +0100
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_396095.dpatch by Steinar H. Gunderson <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a bug when trying to save a file with a new install and
+## DP: a file has never been opened or a project is not open.
+## DP:
+## DP: The patch is extracted from upstream CVS.
+
[EMAIL PROTECTED]@
+--- bluefish-gtk2/src/gtk_easy.c 22 Aug 2006 04:06:56 -0000
1.98.2.15
++++ bluefish-gtk2/src/gtk_easy.c 8 Oct 2006 15:51:07 -0000
1.98.2.16
+@@ -1339,7 +1339,7 @@
+
+ #ifdef HAVE_ATLEAST_GTK_2_4
+
+-static void file_chooser_set_current_dir(GtkWidget *dialog, gchar *dir) {
++static void file_chooser_set_current_dir(GtkWidget *dialog, const gchar *dir)
{
+ if (dir) {
+ if (dir[0] == '/')
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),dir);
+ else
gtk_file_chooser_set_current_folder_uri(GTK_FILE_CHOOSER(dialog),dir);
+@@ -1374,7 +1374,8 @@
+ DEBUG_MSG("file_chooser_dialog, opendir=%s,
savedir=%s\n",bfwin->session->opendir,bfwin->session->savedir);
+ if (bfwin->session->savedir)
file_chooser_set_current_dir(dialog,bfwin->session->savedir);
+ else if (bfwin->session->opendir)
file_chooser_set_current_dir(dialog,bfwin->session->opendir);
+- else if (bfwin->project->basedir)
file_chooser_set_current_dir(dialog, bfwin->project->basedir);
++ else if (bfwin->project && bfwin->project->basedir)
file_chooser_set_current_dir(dialog, bfwin->project->basedir);
++ else file_chooser_set_current_dir(dialog,
g_get_home_dir());
+ } else {
+ DEBUG_MSG("file_chooser_dialog,
opendir=%s\n",bfwin->session->opendir);
+
file_chooser_set_current_dir(dialog,bfwin->session->opendir);
+--- bluefish-gtk2/src/rcfile.c 13 Feb 2006 18:05:18 -0000 1.136.2.9
++++ bluefish-gtk2/src/rcfile.c 8 Oct 2006 15:51:07 -0000 1.136.2.10
+@@ -905,8 +905,8 @@
+ GList *configlist = NULL;
+ init_prop_string(&configlist, &project->name,"name:",_("Untitled
Project"));
+ init_prop_stringlist(&configlist, &project->files, "files:", FALSE);
+- init_prop_string(&configlist, &project->basedir,"basedir:","");
+- init_prop_string(&configlist, &project->webdir,"webdir:","");
++ init_prop_string_with_escape(&configlist, &project->basedir,"basedir:",
NULL);
++ init_prop_string_with_escape(&configlist, &project->webdir,"webdir:",
NULL);
+ init_prop_string(&configlist, &project->template,"template:","");
+ /* init_prop_stringlist(&configlist, &project->recentfiles,
"recentfiles:", FALSE); / * should be changed to use the session->recent_files
*/
+ init_prop_integer (&configlist,
&project->word_wrap,"word_wrap:",1,FALSE);
+
