gtkhtml r8794 - branches/gnome-2-22/components/html-editor

[mcrha svn gnome org]

Author: mcrha
Date: Thu Mar 27 11:56:52 2008
New Revision: 8794
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8794&view=rev

Log:
2008-03-27  Milan Crha  <mcrha redhat com>

	** Fix for bug #520711

	* paragraph-style.h: (paragraph_style_combobox_disconnect_html):
	* paragraph-style.c: (paragraph_style_combobox_disconnect_html):
	New function to disconnect style combo box from the html component.
	* paragraph.c: (paragraph_close_cb): Calling previous function.



Modified:
   branches/gnome-2-22/components/html-editor/ChangeLog
   branches/gnome-2-22/components/html-editor/paragraph-style.c
   branches/gnome-2-22/components/html-editor/paragraph-style.h
   branches/gnome-2-22/components/html-editor/paragraph.c

Modified: branches/gnome-2-22/components/html-editor/paragraph-style.c
==============================================================================
--- branches/gnome-2-22/components/html-editor/paragraph-style.c	(original)
+++ branches/gnome-2-22/components/html-editor/paragraph-style.c	Thu Mar 27 11:56:52 2008
@@ -215,3 +215,12 @@
 			GTK_TREE_MODEL (store), &iter);
 	}
 }
+
+void
+paragraph_style_combobox_disconnect_html (GtkHTMLControlData *cd, GtkWidget *combo_box)
+{
+	g_return_if_fail (cd != NULL);
+	g_return_if_fail (cd->html != NULL);
+
+	g_signal_handlers_disconnect_by_func (cd->html, G_CALLBACK (current_paragraph_style_changed_cb), combo_box);
+}

Modified: branches/gnome-2-22/components/html-editor/paragraph-style.h
==============================================================================
--- branches/gnome-2-22/components/html-editor/paragraph-style.h	(original)
+++ branches/gnome-2-22/components/html-editor/paragraph-style.h	Thu Mar 27 11:56:52 2008
@@ -27,5 +27,6 @@
 
 GtkWidget *	paragraph_style_combo_box_new	(GtkHTMLControlData *cd);
 void		paragraph_style_update_store	(GtkHTMLControlData *cd);
+void		paragraph_style_combobox_disconnect_html (GtkHTMLControlData *cd, GtkWidget *combo_box);
 
 #endif /* _PARAGRAPH_STYLE_H */

Modified: branches/gnome-2-22/components/html-editor/paragraph.c
==============================================================================
--- branches/gnome-2-22/components/html-editor/paragraph.c	(original)
+++ branches/gnome-2-22/components/html-editor/paragraph.c	Thu Mar 27 11:56:52 2008
@@ -101,5 +101,8 @@
 void
 paragraph_close_cb (GtkHTMLControlData *cd, gpointer get_data)
 {
+	g_return_if_fail (get_data != NULL);
+
+	paragraph_style_combobox_disconnect_html (cd, ((GtkHTMLEditParagraphProperties *)get_data)->style_option);
 	g_free (get_data);
 }