Package: bluefish
Version: 1.0.4-1

Hi,

I know that you are as well upstream,

but to inform you, that I backported a fix from latest BLUEFISH_1_0 branch to 
fix an issue in quickstart.c, I write this bugreport.
The correspondent bugreport from Ubuntu: 
https://launchpad.net/malone/bugs/1426

Regards,

\sh

#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_quickstart_fix.dpatch by Stephan Hermann <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad bluefish-1.0.4~/src/quickstart.c bluefish-1.0.4/src/quickstart.c
--- bluefish-1.0.4~/src/quickstart.c    2005-08-11 04:19:49.000000000 +0200
+++ bluefish-1.0.4/src/quickstart.c     2006-01-23 20:57:47.221815616 +0100
@@ -1,5 +1,5 @@
 /* Bluefish HTML Editor
- * quickstart.c --> quickstart dialog
+ * quickstart.c - quickstart dialog
  *
  * Copyright (C) 2005 James Hayward and Olivier Sessink
  *
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 
USA.
  */
  
 /*
@@ -185,10 +185,10 @@
                "name=\"keywords\" content=\"\"",
                "name=\"description\" content=\"\"",
                "name=\"ROBOTS\" content=\"NOINDEX, NOFOLLOW\"",
-               "http-equiv=\"Content-Type\" content=\"text/html; 
charset=UTF-8\"",
-               "http-equiv=\"Content-Type\" content=\"application/xhtml+xml; 
charset=UTF-8\"",
-               "http-equiv=\"Content-Style-Type\" content=\"text/css\"",
-               "http-equiv=\"Expires\" content=\"\"",
+               "http-equiv=\"content-type\" content=\"text/html; 
charset=UTF-8\"",
+               "http-equiv=\"content-type\" content=\"application/xhtml+xml; 
charset=UTF-8\"",
+               "http-equiv=\"content-style-type\" content=\"text/css\"",
+               "http-equiv=\"expires\" content=\"0\"",
                "http-equiv=\"refresh\" content=\"5; URL=http://\"";,
        };
 
@@ -348,18 +348,21 @@
                        styletitle = gtk_editable_get_chars (GTK_EDITABLE 
(qstart->styletitle), 0, 
-1);
                        
                        if (strcmp(name, "Linked") == 0) {
-                               stylestr = g_string_append (stylestr, "<link 
rel=stylesheet 
type=\"text/css\" ");
+                           tmpstr2 = g_strdup_printf ("<link href=\"%s\" 
rel=\"stylesheet\" 
type=\"text/css\"", stylehref);
+                           stylestr = g_string_append (stylestr, tmpstr2);
+                           g_free (tmpstr2);
+                           
                                if (strlen(stylemedia) > 0) {
                                        if (strlen(styletitle) > 0) {
-                                               tmpstr2 = g_strdup_printf 
("media=\"%s\" href=\"%s\" title=\"%s\">\n", 
stylemedia, stylehref, styletitle);
+                                               tmpstr2 = g_strdup_printf (" 
media=\"%s\" title=\"%s\">\n", stylemedia, 
styletitle);
                                        } else {
-                                               tmpstr2 = g_strdup_printf 
("media=\"%s\" href=\"%s\">\n", stylemedia, 
stylehref);
+                                               tmpstr2 = g_strdup_printf (" 
media=\"%s\">\n", stylemedia);
                                        }
                                } else {
                                        if (strlen(styletitle) > 0) {
-                                               tmpstr2 = g_strdup_printf 
("href=\"%s\" title=\"%s\">\n", stylehref, 
styletitle);
+                                               tmpstr2 = g_strdup_printf (" 
title=\"%s\">\n", styletitle);
                                        } else {
-                                               tmpstr2 = g_strdup_printf 
("href=\"%s\">\n", stylehref);
+                                           tmpstr2 = g_strdup (">\n");
                                        }
                                }
                        } else {
@@ -401,8 +404,8 @@
                }
                
                finalstr = g_strconcat (xmlstr, dtdstr, tmpstr, titlestr, 
metastr->str, 
-                                                                               
stylestr->str, stylearea, scriptsrc, scriptarea, 
-                                                                               
cap("</HEAD>\n"), is_frameset_dtd ? cap("<FRAMESET>\n") : 
cap("<BODY>\n"), NULL);
+                                    stylestr->str, stylearea, scriptsrc, 
scriptarea, 
+                                    cap("</HEAD>\n"), is_frameset_dtd ? 
cap("<FRAMESET>\n") : cap("<BODY>\n"), NULL);
                
                g_free (xmlstr);
                g_free (dtdstr);
@@ -421,8 +424,8 @@
                }
 
                doc_insert_two_strings(qstart->bfwin->current_document, 
-                                                                         
finalstr, 
-                                                                         
is_frameset_dtd ? cap("\n</FRAMESET>\n</HTML>") : 
cap("\n</BODY>\n</HTML>"));
+                                finalstr, 
+                                is_frameset_dtd ? 
cap("\n</FRAMESET>\n</HTML>") : cap("\n</BODY>\n</HTML>"));
                g_free (finalstr);
                
                doc_set_filetype(qstart->bfwin->current_document, 
get_filetype_by_name("html"));
@@ -457,7 +460,7 @@
        qstart->metaView = gtk_tree_view_new ();
        gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (qstart->metaView), 
FALSE);
        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW 
(qstart->metaView));
-       g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK 
(quickstart_meta_selection_changed), qstart);
+       
        gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
        gtk_container_add (GTK_CONTAINER (scrolwin), qstart->metaView);
        renderer = gtk_cell_renderer_text_new ();
@@ -480,6 +483,8 @@
        gtk_widget_set_sensitive (qstart->removeButton, FALSE);
        gtk_box_pack_start (GTK_BOX (hbox), bbox, FALSE, FALSE, 0);
        
+       g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK 
(quickstart_meta_selection_changed), qstart);
+       
        return hbox;
 }
 
@@ -685,7 +690,10 @@
        gtk_tree_selection_select_iter (selection, &iter);
        
        qstart->openNewDoc = gtk_check_button_new_with_mnemonic (_("Open in 
_new 
document."));
-       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (qstart->openNewDoc), 
TRUE);
+       if (doc_is_empty_non_modified_and_nameless(bfwin->current_document))
+           gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON 
(qstart->openNewDoc), 
FALSE);
+       else
+           gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON 
(qstart->openNewDoc), 
TRUE);  
        alignment = gtk_alignment_new (0, 0.5, 0, 0);
        gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 8, 4, 0);
        gtk_container_add (GTK_CONTAINER (alignment), qstart->openNewDoc);

Attachment: pgp6CPlRgR9gQ.pgp
Description: PGP signature

Reply via email to