GNOME.org
 

[evolution-patches] Gtkhtml for Evolution 1.4 Patches

One of these patches is Radek's for fixing the composer tool bar
behaviour in gnome 2.5/2.6 and the other removes the deprecated flags.

-JP
-- 
JP Rosevear <jpr ximian com>
Ximian, Inc.

? autom4te.cache
? gtkhtml-dep.patch
? components/html-editor/GNOME_GtkHTML_Editor-emacs.xml
? components/html-editor/gtkhtml-toolbar.patch
? components/html-editor/test_editor
Index: a11y/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/a11y/ChangeLog,v
retrieving revision 1.2
diff -u -r1.2 ChangeLog
--- a11y/ChangeLog	1 Nov 2002 15:34:27 -0000	1.2
+++ a11y/ChangeLog	16 Feb 2004 17:17:00 -0000
@@ -1,3 +1,7 @@
+2004-02-16  JP Rosevear <jpr ximian com>
+
+	* Makefile.am: remove disable deprecated flags
+
 2002-05-07  Radek Doulik  <rodo ximian com>
 
 	* Makefile.am: fixed .la versioning
Index: a11y/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/a11y/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- a11y/Makefile.am	15 Nov 2002 13:57:59 -0000	1.3
+++ a11y/Makefile.am	16 Feb 2004 17:17:00 -0000
@@ -2,7 +2,7 @@
 
 INCLUDES = -I$(top_srcdir)/src $(GTKHTML_CFLAGS)
 
-CFLAGS += $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
+CFLAGS += $(GAIL_CFLAGS)
 
 lib_LTLIBRARIES = libgtkhtml-a11y-3.0.la
 
Index: capplet/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/capplet/ChangeLog,v
retrieving revision 1.50
diff -u -r1.50 ChangeLog
--- capplet/ChangeLog	1 May 2003 21:26:33 -0000	1.50
+++ capplet/ChangeLog	16 Feb 2004 17:17:01 -0000
@@ -1,3 +1,7 @@
+2004-02-16  JP Rosevear <jpr ximian com>
+
+	* Makefile.am: remove disable deprecated flags
+
 2003-05-01  Abel Cheung  <maddog linux org hk>
 
 	* gtkhtml-capplet.glade.h gtkhtml-properties.desktop.in.h:
Index: capplet/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/capplet/Makefile.am,v
retrieving revision 1.22
diff -u -r1.22 Makefile.am
--- capplet/Makefile.am	1 Nov 2002 15:06:12 -0000	1.22
+++ capplet/Makefile.am	16 Feb 2004 17:17:01 -0000
@@ -7,7 +7,6 @@
 
 CFLAGS +=  					\
 	$(CAPPLET_CFLAGS)			\
-	-DGTK_DISABLE_DEPRECATED		\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
 	-DGLADE_DATADIR=\"$(gladedir)\"
 
Index: components/html-editor/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/Makefile.am,v
retrieving revision 1.89.2.2
diff -u -r1.89.2.2 Makefile.am
--- components/html-editor/Makefile.am	10 Sep 2003 22:20:44 -0000	1.89.2.2
+++ components/html-editor/Makefile.am	16 Feb 2004 17:17:04 -0000
@@ -16,15 +16,10 @@
         -DGTKHTML_DATADIR=\""$(gtkhtml_data)"\"		\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-DGLADE_DATADIR=\"$(gladedir)\"			\
-	-DGTK_DISABLE_DEPRECATED=1 			\
-	-DGDK_DISABLE_DEPRECATED=1			\
-	-DG_DISABLE_DEPRECATED=1			\
-	-DGNOME_DISABLE_DEPRECATED=1			\
 	-DPREFIX=\""$(prefix)"\"			\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
 	-DDATADIR=\""$(datadir)"\"			\
-	-DLIBDIR=\""$(datadir)"\"			\
-	-DBONOBO_DISABLE_DEPRECATED=1
+	-DLIBDIR=\""$(datadir)"\"
 
 # CORBA stuff
 IDLS = Editor.idl
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/Makefile.am,v
retrieving revision 1.136.6.1
diff -u -r1.136.6.1 Makefile.am
--- src/Makefile.am	3 Sep 2003 19:08:51 -0000	1.136.6.1
+++ src/Makefile.am	16 Feb 2004 17:17:06 -0000
@@ -11,11 +11,7 @@
 	-DPREFIX=\"$(prefix)\"
 
 AM_CFLAGS = 								\
-	-DICONDIR=\"$(datadir)/gtkhtml- GTKHTML_RELEASE@/icons\"	\
-	-DGTK_DISABLE_DEPRECATED=1					\
-	-DGDK_DISABLE_DEPRECATED=1					\
-	-DG_DISABLE_DEPRECATED=1					\
-	-DGNOME_DISABLE_DEPRECATED=1
+	-DICONDIR=\"$(datadir)/gtkhtml- GTKHTML_RELEASE@/icons\"
 
 lib_LTLIBRARIES = libgtkhtml-3.0.la
 

? GNOME_GtkHTML_Editor-emacs.xml
? gtkhtml-toolbar.patch
? test_editor
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
retrieving revision 1.410.2.14
diff -u -r1.410.2.14 ChangeLog
--- ChangeLog	11 Feb 2004 13:08:42 -0000	1.410.2.14
+++ ChangeLog	16 Feb 2004 17:14:00 -0000
@@ -1,3 +1,23 @@
+2003-02-13  JP Rosevear  <jpr ximian com>
+ 
+ 	* Makefile.am: remove gnome and gtk deprecated flags
+ 
+2004-02-13  Radek Doulik  <rodo ximian com>
+ 
+ 	* toolbar.c (create_style_toolbar): unset focus for all toolbar
+ 	widgets
+ 
+2004-02-13  Radek Doulik  <rodo ximian com>
+ 
+ 	* toolbar.c (create_style_toolbar): set initial unindent button
+ 	sensitivity
+ 	(toolbar_item_represents): new helper function
+ 	(toolbar_item_update_sensitivity): use toolbar_item_represents,
+ 	newer gtk toolbar contains gtktoolitems so we have to be more
+ 	careful
+ 	(toolbar_update_format): use gtk_container_foreach instead of
+ 	forall
+
 2004-02-11  Yong Sun <Yong Sun sun com>
 
 	* toolbar.c: (create_style_toolbar) steal domain for libgnomeui to 
Index: toolbar.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/toolbar.c,v
retrieving revision 1.61.6.1
diff -u -r1.61.6.1 toolbar.c
--- toolbar.c	11 Feb 2004 13:08:42 -0000	1.61.6.1
+++ toolbar.c	16 Feb 2004 17:14:01 -0000
@@ -298,8 +298,6 @@
         g_signal_connect (cd->html, "load_done", G_CALLBACK (load_done), cd);
 
 	cd->combo = color_combo_new (NULL, _("Automatic"), &color->color, color_group_fetch ("toolbar_text", cd));
-	GTK_WIDGET_UNSET_FLAGS (cd->combo, GTK_CAN_FOCUS);
-	gtk_container_forall (GTK_CONTAINER (cd->combo), unset_focus, NULL);
         g_signal_connect (cd->combo, "color_changed", G_CALLBACK (color_changed), cd);
 
 	gtk_widget_show_all (cd->combo);
@@ -617,6 +615,7 @@
 	cd->right_align_button = editor_toolbar_alignment_group[2].widget;
 
 	cd->unindent_button  = editor_toolbar_style_uiinfo [8].widget;
+	gtk_widget_set_sensitive (cd->unindent_button, gtk_html_get_paragraph_indentation (cd->html) != 0);
 	g_signal_connect (cd->html, "current_paragraph_indentation_changed",
 			  G_CALLBACK (indentation_changed), cd);
 
@@ -635,23 +634,45 @@
 	gtk_widget_show_all (hbox);
 
 	toolbar_update_format (cd);
+	GTK_WIDGET_UNSET_FLAGS (cd->toolbar_style, GTK_CAN_FOCUS);
+	gtk_container_forall (GTK_CONTAINER (cd->toolbar_style), unset_focus, NULL);
 
 	return hbox;
 }
 
+static gboolean
+toolbar_item_represents (GtkWidget *item, GtkWidget *widget)
+{
+	GtkWidget *parent;
+
+	if (item == widget)
+		return TRUE;
+
+	parent = gtk_widget_get_parent (widget);
+	while (parent) {
+		if (parent == item)
+			return TRUE;
+		parent = gtk_widget_get_parent (parent);
+	}
+
+	return FALSE;
+}
+
 static void
 toolbar_item_update_sensitivity (GtkWidget *widget, gpointer data)
 {
 	GtkHTMLControlData *cd = (GtkHTMLControlData *)data;
 	gboolean sensitive;
 
-	sensitive = ((cd->format_html && widget != cd->unindent_button)
-		     || widget == cd->paragraph_option
-		     || widget == cd->indent_button
-		     || (widget == cd->unindent_button && gtk_html_get_paragraph_indentation (cd->html))
-		     || widget == cd->left_align_button
-		     || widget == cd->center_button
-		     || widget == cd->right_align_button);
+	if (toolbar_item_represents (widget, cd->unindent_button))
+		return;
+
+	sensitive = (cd->format_html
+		     || toolbar_item_represents (widget, cd->paragraph_option)
+		     || toolbar_item_represents (widget, cd->indent_button)
+		     || toolbar_item_represents (widget, cd->left_align_button)
+		     || toolbar_item_represents (widget, cd->center_button)
+		     || toolbar_item_represents (widget, cd->right_align_button));
 
 	gtk_widget_set_sensitive (widget, sensitive);
 }
@@ -660,8 +681,8 @@
 toolbar_update_format (GtkHTMLControlData *cd)
 {
 	if (cd->toolbar_style)
-		gtk_container_forall (GTK_CONTAINER (cd->toolbar_style), 
-				      toolbar_item_update_sensitivity, cd);
+		gtk_container_foreach (GTK_CONTAINER (cd->toolbar_style), 
+		toolbar_item_update_sensitivity, cd);
 
 	if (cd->paragraph_option)
 		paragraph_style_option_menu_set_mode (cd->paragraph_option,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]