rpms/bluefish/devel bluefish-1.0.7-syntax-highlight.patch, NONE, 1.1 bluefish.spec, 1.23, 1.24

[Paul Howarth (pghmcfc)]

Author: pghmcfc

Update of /cvs/pkgs/rpms/bluefish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20449

Modified Files:
	bluefish.spec 
Added Files:
	bluefish-1.0.7-syntax-highlight.patch 
Log Message:
include patch from upstream VCS to work around problem editing syntax
highlighting patterns (#390871)


bluefish-1.0.7-syntax-highlight.patch:

--- NEW FILE bluefish-1.0.7-syntax-highlight.patch ---
Index: src/preferences.c
===================================================================
RCS file: /cvsroot/bluefish/bluefish-gtk2/src/preferences.c,v
retrieving revision 1.120.2.10
retrieving revision 1.120.2.11
diff -u -r1.120.2.10 -r1.120.2.11
--- src/preferences.c	12 Nov 2006 03:35:28 -0000	1.120.2.10
+++ src/preferences.c	20 Jan 2008 04:26:25 -0000	1.120.2.11
@@ -162,7 +162,7 @@
 	GtkWidget *check;
 	GtkWidget *radio[9];
 	gchar **curstrarr;
-	const gchar *selected_filetype;
+	gchar *selected_filetype;
 } Thighlightpatterndialog;
 
 typedef struct {
@@ -910,12 +910,12 @@
 }
 
 static void highlightpattern_fill_from_selected_filetype(Tprefdialog *pd) {
-	DEBUG_MSG("highlightpattern_popmenu_activate, applied changes, about to clear liststore\n");
+	DEBUG_MSG("highlightpattern_fill_from_selected_filetype, applied changes, about to clear liststore\n");
 	gtk_list_store_clear(GTK_LIST_STORE(pd->hpd.lstore));
 	if (pd->hpd.selected_filetype) {
 		GList *tmplist;
 		tmplist = g_list_first(pd->lists[highlight_patterns]);
-		DEBUG_MSG("highlightpattern_popmenu_activate, about to fill for filetype %s (tmplist=%p)\n",pd->hpd.selected_filetype,tmplist);
+		DEBUG_MSG("highlightpattern_fill_from_selected_filetype, about to fill for filetype %s (tmplist=%p)\n",pd->hpd.selected_filetype,tmplist);
 		/* fill list model here */
 		while (tmplist) {
 			gchar **strarr =(gchar **)tmplist->data;
@@ -923,7 +923,7 @@
 				DEBUG_MSG("found entry with filetype %s\n",strarr[0]);
 				if (strcmp(strarr[0], pd->hpd.selected_filetype)==0) {
 					GtkTreeIter iter;
-					DEBUG_MSG("highlightpattern_popmenu_activate, appending pattern %s with filetype %s\n",strarr[1],strarr[0]);
+					DEBUG_MSG("highlightpattern_fill_from_selected_filetype, appending pattern %s with filetype %s\n",strarr[1],strarr[0]);
 					gtk_list_store_append(GTK_LIST_STORE(pd->hpd.lstore), &iter);
 					gtk_list_store_set(GTK_LIST_STORE(pd->hpd.lstore), &iter, 0, strarr[1], -1);
 				}
@@ -949,7 +949,9 @@
 	highlightpattern_apply_changes(pd);
 	pd->hpd.curstrarr = NULL;
 	if (menuitem) {
-		pd->hpd.selected_filetype = gtk_label_get_text(GTK_LABEL(GTK_BIN(menuitem)->child));
+	  if (pd->hpd.selected_filetype)
+	    g_free (pd->hpd.selected_filetype);
+		pd->hpd.selected_filetype = g_strdup (gtk_label_get_text(GTK_LABEL(GTK_BIN(menuitem)->child)));
 	}
 	highlightpattern_fill_from_selected_filetype(pd);
 }
@@ -1209,6 +1211,7 @@
 		
 		select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->hpd.lview));
 		g_signal_connect(G_OBJECT(select), "changed",G_CALLBACK(highlightpattern_selection_changed_cb),pd);
+		gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
 	}
 
 	vbox3 = gtk_vbox_new(FALSE, 2);
@@ -1807,6 +1810,9 @@
 	pd->lists[browsers] = NULL;
 	pd->lists[external_commands] = NULL;
 
+  if (pd->hpd.selected_filetype)
+	    g_free (pd->hpd.selected_filetype);
+
 /*	select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->ftd.lview));
 	g_signal_handlers_destroy(G_OBJECT(select));*/
 	DEBUG_MSG("preferences_destroy_lcb, destroying handlers for lstore %p\n",pd->ftd.lstore);


Index: bluefish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/bluefish.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bluefish.spec	28 Aug 2007 09:00:38 -0000	1.23
+++ bluefish.spec	21 Jan 2008 15:07:23 -0000	1.24
@@ -1,11 +1,12 @@
 Name:		bluefish
 Version:	1.0.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	GTK2 web development application for experienced users
 Group:		Development/Tools
 License:	GPLv2+
 URL:		http://bluefish.openoffice.nl/
 Source0:	http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}.tar.bz2
+Patch0:		bluefish-1.0.7-syntax-highlight.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	aspell-devel >= 0.5
 BuildRequires:	desktop-file-utils
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure --disable-update-databases
@@ -65,6 +67,10 @@
 %{_mandir}/man1/bluefish.1*
 
 %changelog
+* Mon Jan 21 2008 Paul Howarth <paul at city-fan.org> - 1.0.7-3
+- include patch from upstream VCS to work around problem editing syntax
+  highlighting patterns (#390871)
+
 * Sun Aug 26 2007 Paul Howarth <paul at city-fan.org> - 1.0.7-2
 - clarify license as GPL version 2 or later
 - unexpand tabs in spec