GNOME.org
 

[evolution-patches] Re: [gene-pool] evo 1.4.x and connector testing and gnome2.6?

On Thu, 2004-02-05 at 15:36 +0100, Radek Doulík wrote:
> On Thu, 2004-02-05 at 09:02 -0500, JP Rosevear wrote:
> > On Thu, 2004-02-05 at 08:40, Radek Doulík wrote:
> > > On Wed, 2004-02-04 at 20:00 -0500, JP Rosevear wrote:
> > > > On Wed, 2004-02-04 at 19:11, Christine McLellan wrote:
> > > > > Dan -- Thank you so much! 
> > > > > 
> > > > > Tim/Mark -- Have you guys tested 1.4 on GNOME2.5? Will you be able to
> > > > > give it a go before 1.4.6???  Are there other big gotchas out there? 
> > > > 
> > > > The biggest gotchas I've seen are the occasional crashes (likely gtk+)
> > > > and the de-sensitization of the Normal/Pre-Format/etc menu in the
> > > > composer.
> > > 
> > > the de-sensitization fix we have in 1.5.x can be used for 1.4.x as well.
> > 
> > And it will work for gtk+ 2.2 and 2.0?  If so, lets get it in.
> 
> Yes, it should. I tried to compile gtkhtml 3.0.x with gtk 2.3.x, but
> looks like gal 2.0.x needs some patching as well.

gal and gtkhtml patches attached. gal also needs
gal/gal/widgets/gal*.[ch] from gal/HEAD.


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/ChangeLog,v
retrieving revision 1.800.2.12
diff -u -p -r1.800.2.12 ChangeLog
--- ChangeLog	3 Feb 2004 15:37:29 -0000	1.800.2.12
+++ ChangeLog	5 Feb 2004 16:00:28 -0000
@@ -1,3 +1,9 @@
+2003-11-17  Mike Kestner  <mkestner ximian com>
+
+	* gal/widgets/gtk-combo* : renamespace and move to
+	* gal/widgets/gal-combo* : here
+	* gal/widgets/Makefile.am : build new files
+
 2004-02-03 Chris Toshok <toshok ximian com>
 	
 	* gal/e-text/e-text.c (e_text_command): it's possible to get to
Index: gal/e-table/ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/ChangeLog,v
retrieving revision 1.909.2.5
diff -u -p -r1.909.2.5 ChangeLog
--- gal/e-table/ChangeLog	3 Nov 2003 13:40:49 -0000	1.909.2.5
+++ gal/e-table/ChangeLog	5 Feb 2004 16:00:34 -0000
@@ -1,3 +1,7 @@
+2003-11-17  Mike Kestner  <mkestner ximian com>
+
+	* e-table-config.c : use new gal_combo_* namespace.
+
 2003-10-13  Charles Zhang  <charles zhang sun com>
 
 	* e-table-config.c (e_table_config_new): disable apply button
Index: gal/e-table/e-table-config.c
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/e-table-config.c,v
retrieving revision 1.58.2.3
diff -u -p -r1.58.2.3 e-table-config.c
--- gal/e-table/e-table-config.c	3 Nov 2003 13:40:49 -0000	1.58.2.3
+++ gal/e-table/e-table-config.c	5 Feb 2004 16:00:35 -0000
@@ -270,7 +270,7 @@ update_sort_and_group_config_dialog (ETa
 		}
 
 		/* Set the text */
-		gtk_combo_text_set_text (widgets [i].combo, text);
+		gal_combo_text_set_text (widgets [i].combo, text);
 
 		g_signal_handler_unblock (
 			widgets [i].radio_ascending,
@@ -614,7 +614,7 @@ GtkWidget *e_table_proxy_gtk_combo_text_
 GtkWidget *
 e_table_proxy_gtk_combo_text_new (void)
 {
-	return gtk_combo_text_new (TRUE);
+	return gal_combo_text_new (TRUE);
 }
 
 #if 0
@@ -707,10 +707,10 @@ configure_sort_dialog (ETableConfig *con
 		char buffer [80];
 
 		snprintf (buffer, sizeof (buffer), "sort-combo-%d", i + 1);
-		config->sort [i].combo = GTK_COMBO_TEXT (
+		config->sort [i].combo = GAL_COMBO_TEXT (
 			glade_xml_get_widget (gui, buffer));
 		gtk_widget_show (GTK_WIDGET (config->sort [i].combo));
-		gtk_combo_text_add_item (config->sort [i].combo, "", "");
+		gal_combo_text_add_item (config->sort [i].combo, "", "");
 
 		snprintf (buffer, sizeof (buffer), "frame-sort-%d", i + 1);
 		config->sort [i].frames = 
@@ -735,7 +735,7 @@ configure_sort_dialog (ETableConfig *con
 		char *label = l->data;
 
 		for (i = 0; i < 4; i++){
-			gtk_combo_text_add_item (config->sort [i].combo,
+			gal_combo_text_add_item (config->sort [i].combo,
 						 dgettext (config->domain, label), label);
 		}
 	}
@@ -811,11 +811,11 @@ configure_group_dialog (ETableConfig *co
 		char buffer [80];
 
 		snprintf (buffer, sizeof (buffer), "group-combo-%d", i + 1);
-		config->group [i].combo = GTK_COMBO_TEXT (
+		config->group [i].combo = GAL_COMBO_TEXT (
 			glade_xml_get_widget (gui, buffer));
 		gtk_widget_show (GTK_WIDGET (config->group [i].combo));
 
-		gtk_combo_text_add_item (config->group [i].combo, "", "");
+		gal_combo_text_add_item (config->group [i].combo, "", "");
 
 		snprintf (buffer, sizeof (buffer), "frame-group-%d", i + 1);
 		config->group [i].frames = 
@@ -847,7 +847,7 @@ configure_group_dialog (ETableConfig *co
 		char *label = l->data;
 
 		for (i = 0; i < 4; i++){
-			gtk_combo_text_add_item (
+			gal_combo_text_add_item (
 				config->group [i].combo,
 				dgettext (config->domain, label), label);
 		}
Index: gal/e-table/e-table-config.h
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/e-table-config.h,v
retrieving revision 1.18
diff -u -p -r1.18 e-table-config.h
--- gal/e-table/e-table-config.h	19 Dec 2002 02:24:24 -0000	1.18
+++ gal/e-table/e-table-config.h	5 Feb 2004 16:00:35 -0000
@@ -27,7 +27,7 @@
 
 #include <gal/e-table/e-table-sort-info.h>
 #include <gal/e-table/e-table-specification.h>
-#include <gal/widgets/gtk-combo-text.h>
+#include <gal/widgets/gal-combo-text.h>
 #include <gal/e-table/e-table-without.h>
 #include <gal/e-table/e-table-subset-variable.h>
 #include <gal/e-table/e-table.h>
@@ -43,7 +43,7 @@ G_BEGIN_DECLS
 #define E_TABLE_CONFIG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_CONFIG_TYPE, ETableConfigClass))
 
 typedef struct {
-	GtkComboText *combo;
+	GalComboText *combo;
 	GtkWidget    *frames;
 	GtkWidget    *radio_ascending;
 	GtkWidget    *radio_descending;
Index: gal/widgets/Makefile.am
===================================================================
RCS file: /cvs/gnome/gal/gal/widgets/Makefile.am,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile.am
--- gal/widgets/Makefile.am	28 Jul 2003 16:17:12 -0000	1.57
+++ gal/widgets/Makefile.am	5 Feb 2004 16:00:35 -0000
@@ -28,9 +28,9 @@ libwidgets_la_SOURCES = 			\
 	e-selection-model-simple.c		\
 	e-selection-model.c			\
 	e-unicode.c				\
-	gtk-combo-box.c				\
-	gtk-combo-stack.c			\
-	gtk-combo-text.c			\
+	gal-combo-box.c				\
+	gal-combo-stack.c			\
+	gal-combo-text.c			\
 	widget-color-combo.c			\
 	widget-pixmap-combo.c
 
@@ -73,9 +73,9 @@ libwidgetsinclude_HEADERS = 			\
 	e-selection-model-simple.h		\
 	e-selection-model.h			\
 	e-unicode.h				\
-	gtk-combo-box.h				\
-	gtk-combo-stack.h			\
-	gtk-combo-text.h			\
+	gal-combo-box.h				\
+	gal-combo-stack.h			\
+	gal-combo-text.h			\
 	widget-color-combo.h			\
 	widget-pixmap-combo.h
 
Index: gal/widgets/widget-color-combo.c
===================================================================
RCS file: /cvs/gnome/gal/gal/widgets/widget-color-combo.c,v
retrieving revision 1.45
diff -u -p -r1.45 widget-color-combo.c
--- gal/widgets/widget-color-combo.c	30 May 2003 16:10:54 -0000	1.45
+++ gal/widgets/widget-color-combo.c	5 Feb 2004 16:00:35 -0000
@@ -47,7 +47,7 @@ enum {
 
 static guint color_combo_signals [LAST_SIGNAL] = { 0, };
 
-#define PARENT_TYPE GTK_COMBO_BOX_TYPE
+#define PARENT_TYPE GAL_COMBO_BOX_TYPE
 static GObjectClass *color_combo_parent_class;
 
 #define make_color(CC,COL) (((COL) != NULL) ? (COL) : ((CC) ? ((CC)->default_color) : NULL))
@@ -101,7 +101,7 @@ emit_color_changed (ColorCombo *cc, GdkC
   	g_signal_emit (cc,
 		       color_combo_signals [CHANGED], 0,
 		       color, is_custom, by_user, is_default);
-	gtk_combo_box_popup_hide (GTK_COMBO_BOX (cc));
+	gal_combo_box_popup_hide (GAL_COMBO_BOX (cc));
 }
 
 static void
@@ -126,7 +126,7 @@ preview_clicked (GtkWidget *button, Colo
 static void
 cb_cust_color_clicked (GtkWidget *widget, ColorCombo *cc)
 {
-	gtk_combo_box_popup_hide (GTK_COMBO_BOX (cc));
+	gal_combo_box_popup_hide (GAL_COMBO_BOX (cc));
 }
 
 /*
@@ -230,7 +230,7 @@ color_combo_construct (ColorCombo *cc, G
 
 	gtk_widget_show_all (cc->preview_button);
 
-	gtk_combo_box_construct (GTK_COMBO_BOX (cc),
+	gal_combo_box_construct (GAL_COMBO_BOX (cc),
 				 cc->preview_button,
 				 GTK_WIDGET (cc->palette));
 
Index: gal/widgets/widget-color-combo.h
===================================================================
RCS file: /cvs/gnome/gal/gal/widgets/widget-color-combo.h,v
retrieving revision 1.22
diff -u -p -r1.22 widget-color-combo.h
--- gal/widgets/widget-color-combo.h	16 Nov 2002 23:42:18 -0000	1.22
+++ gal/widgets/widget-color-combo.h	5 Feb 2004 16:00:35 -0000
@@ -32,13 +32,13 @@
 #define GNUMERIC_WIDGET_COLOR_COMBO_H
 
 #include <gtk/gtkwidget.h>
-#include <gal/widgets/gtk-combo-box.h>
+#include <gal/widgets/gal-combo-box.h>
 #include <gal/widgets/color-palette.h>
 
 G_BEGIN_DECLS
 
 typedef struct _ColorCombo {
-	GtkComboBox     combo_box;
+	GalComboBox     combo_box;
 
 	/*
 	 * Canvas where we display
@@ -53,7 +53,7 @@ typedef struct _ColorCombo {
 } ColorCombo;
 
 typedef struct {
-	GtkComboBoxClass parent_class;
+	GalComboBoxClass parent_class;
 
 	/* Signals emited by this widget */
 	void (* color_changed) (ColorCombo *color_combo, GdkColor *color,
Index: gal/widgets/widget-pixmap-combo.c
===================================================================
RCS file: /cvs/gnome/gal/gal/widgets/widget-pixmap-combo.c,v
retrieving revision 1.14
diff -u -p -r1.14 widget-pixmap-combo.c
--- gal/widgets/widget-pixmap-combo.c	16 Nov 2002 23:42:18 -0000	1.14
+++ gal/widgets/widget-pixmap-combo.c	5 Feb 2004 16:00:35 -0000
@@ -26,7 +26,7 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtktable.h>
 #include <libgnome/gnome-i18n.h>
-#include "gtk-combo-box.h"
+#include "gal-combo-box.h"
 #include "widget-pixmap-combo.h"
 #include "gal/util/e-util.h"
 
@@ -40,7 +40,7 @@ enum {
 
 static guint pixmap_combo_signals [LAST_SIGNAL] = { 0, };
 
-#define PARENT_TYPE GTK_COMBO_BOX_TYPE
+#define PARENT_TYPE GAL_COMBO_BOX_TYPE
 static GtkObjectClass *pixmap_combo_parent_class;
 
 /***************************************************************************/
@@ -98,7 +98,7 @@ pixmap_clicked (GtkWidget *button, Pixma
 	int index = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (button)));
 	pixmap_combo_select_pixmap (pc, index);
 	emit_change (button, pc);
-	gtk_combo_box_popup_hide (GTK_COMBO_BOX (pc));
+	gal_combo_box_popup_hide (GAL_COMBO_BOX (pc));
 }
 
 static GtkWidget *
@@ -180,7 +180,7 @@ pixmap_combo_construct (PixmapCombo *pc,
 
 	gtk_widget_show_all (pc->preview_button);
 
-	gtk_combo_box_construct (GTK_COMBO_BOX (pc),
+	gal_combo_box_construct (GAL_COMBO_BOX (pc),
 				 pc->preview_button,
 				 pc->combo_table);
 }
Index: gal/widgets/widget-pixmap-combo.h
===================================================================
RCS file: /cvs/gnome/gal/gal/widgets/widget-pixmap-combo.h,v
retrieving revision 1.9
diff -u -p -r1.9 widget-pixmap-combo.h
--- gal/widgets/widget-pixmap-combo.h	16 Nov 2002 23:42:18 -0000	1.9
+++ gal/widgets/widget-pixmap-combo.h	5 Feb 2004 16:00:35 -0000
@@ -29,7 +29,7 @@
 #include <gtk/gtktooltips.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomeui/gnome-pixmap.h>
-#include <gal/widgets/gtk-combo-box.h>
+#include <gal/widgets/gal-combo-box.h>
 
 G_BEGIN_DECLS
 
@@ -45,7 +45,7 @@ typedef struct {
 } PixmapComboElement;
 
 typedef struct {
-	GtkComboBox     combo_box;
+	GalComboBox     combo_box;
 
 	/* Static information */
 	PixmapComboElement const *elements;
@@ -67,7 +67,7 @@ GtkWidget *pixmap_combo_new           (P
 void       pixmap_combo_select_pixmap (PixmapCombo *combo, int index);
 				  
 typedef struct {
-	GtkComboBoxClass parent_class;
+	GalComboBoxClass parent_class;
 
 	/* Signals emited by this widget */
 	void (* changed) (PixmapCombo *pixmap_combo, int index);

Index: components/html-editor/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
retrieving revision 1.410.2.13
diff -u -p -r1.410.2.13 ChangeLog
--- components/html-editor/ChangeLog	30 Jan 2004 11:21:57 -0000	1.410.2.13
+++ components/html-editor/ChangeLog	5 Feb 2004 16:01:57 -0000
@@ -1,3 +1,23 @@
+2003-11-18  JP Rosevear  <jpr ximian com>
+
+	* Makefile.am: remove gnome and gtk deprecated flags
+
+2004-02-03  Radek Doulik  <rodo ximian com>
+
+	* toolbar.c (create_style_toolbar): unset focus for all toolbar
+	widgets
+
+2004-01-23  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-01-19  Yong Sun <Yong Sun sun com>
 
 	* cell.c image.c rule.c table.c template.c: add domain param in
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 -p -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	5 Feb 2004 16:01:57 -0000
@@ -16,10 +16,8 @@ AM_CFLAGS = \
         -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)"\"			\
Index: components/html-editor/toolbar.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/toolbar.c,v
retrieving revision 1.61
diff -u -p -r1.61 toolbar.c
--- components/html-editor/toolbar.c	12 May 2003 20:46:48 -0000	1.61
+++ components/html-editor/toolbar.c	5 Feb 2004 16:01:57 -0000
@@ -298,8 +298,6 @@ setup_color_combo (GtkHTMLControlData *c
         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);
@@ -604,6 +602,7 @@ create_style_toolbar (GtkHTMLControlData
 	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);
 
@@ -622,23 +621,45 @@ create_style_toolbar (GtkHTMLControlData
 	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);
 }
@@ -647,8 +668,8 @@ void
 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, 
Index: src/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.1814.2.19
diff -u -p -r1.1814.2.19 ChangeLog
--- src/ChangeLog	12 Dec 2003 07:08:28 -0000	1.1814.2.19
+++ src/ChangeLog	5 Feb 2004 16:02:09 -0000
@@ -1,3 +1,8 @@
+2003-11-18  Radek Doulik  <rodo ximian com>
+
+	* Makefile.am: enable deprecated gtk stuff. gtkcombo.h is
+	deprecated in gnome2.5. we will require gnome-2.5 soon
+
 2003-12-10  Yong Sun <Yong Sun sun com>
 
 	* htmlengine-edit-cursor.c: correct the calculation of 
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/Makefile.am,v
retrieving revision 1.136.6.1
diff -u -p -r1.136.6.1 Makefile.am
--- src/Makefile.am	3 Sep 2003 19:08:51 -0000	1.136.6.1
+++ src/Makefile.am	5 Feb 2004 16:02:10 -0000
@@ -12,10 +12,10 @@ INCLUDES = 				\
 
 AM_CFLAGS = 								\
 	-DICONDIR=\"$(datadir)/gtkhtml- GTKHTML_RELEASE@/icons\"	\
-	-DGTK_DISABLE_DEPRECATED=1					\
 	-DGDK_DISABLE_DEPRECATED=1					\
 	-DG_DISABLE_DEPRECATED=1					\
 	-DGNOME_DISABLE_DEPRECATED=1
+#	-DGTK_DISABLE_DEPRECATED=1
 
 lib_LTLIBRARIES = libgtkhtml-3.0.la
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]