[evolution-patches] 57287 Round II

[JP Rosevear <jpr novell com>]

Forgot these other parts of the patch in my tree.

-JP
-- 
JP Rosevear <jpr novell com>
Novell, Inc.

? 57287-addr.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1791
diff -u -r1.1791 ChangeLog
--- ChangeLog	13 Jul 2004 20:47:27 -0000	1.1791
+++ ChangeLog	14 Jul 2004 18:43:59 -0000
@@ -1,3 +1,9 @@
+2004-07-14  JP Rosevear  <jpr novell com>
+
+	* gui/component/autocompletion-config.c
+	(autocompletion_config_control_new): don't set the toggle
+	selection
+
 2004-07-13  Rodney Dawes  <dobey novell com>
 
 	[ fixes #56657 ]
Index: gui/component/autocompletion-config.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/autocompletion-config.c,v
retrieving revision 1.4
diff -u -r1.4 autocompletion-config.c
--- gui/component/autocompletion-config.c	16 Jun 2004 06:59:36 -0000	1.4
+++ gui/component/autocompletion-config.c	14 Jul 2004 18:43:59 -0000
@@ -35,6 +35,7 @@
 #include <libedataserver/e-source-list.h>
 #include <libgnome/gnome-i18n.h>
 #include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtktreeselection.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtksignal.h>
 
@@ -130,8 +131,7 @@
 					     GTK_SHADOW_IN);
 
 	ac->control_widget = e_source_selector_new (ac->source_list);
-	e_source_selector_set_toggle_selection((ESourceSelector *)ac->control_widget, TRUE);
-
+	
 	gtk_container_add (GTK_CONTAINER (scrolledwin), ac->control_widget);
 
 	initialize_selection (ac);

? 57287-misc.patch
? primary-uncheck.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/ChangeLog,v
retrieving revision 1.318
diff -u -r1.318 ChangeLog
--- ChangeLog	13 Jul 2004 15:59:33 -0000	1.318
+++ ChangeLog	14 Jul 2004 18:44:09 -0000
@@ -1,3 +1,14 @@
+2004-07-14  JP Rosevear  <jpr novell com>
+
+	* e-source-selector.h: remove proto
+
+	* e-source-selector.c (selection_func): don't force the item to be
+	checked
+	(cell_toggled_callback): allow the cell to be untoggled even if
+	its primary
+	(init): set the pixbuf renderable
+	(e_source_selector_set_toggle_selection): no longer necessary
+
 2004-07-12  Jeffrey Stedfast  <fejj novell com>
 
 	* e-charset-picker.c: s/GB-2312/GB2312/ - fixes bug #61385.
Index: e-source-selector.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-source-selector.c,v
retrieving revision 1.21
diff -u -r1.21 e-source-selector.c
--- e-source-selector.c	24 Jun 2004 17:22:40 -0000	1.21
+++ e-source-selector.c	14 Jul 2004 18:44:09 -0000
@@ -44,7 +44,7 @@
 	ESourceList *list;
 
 	GtkTreeStore *tree_store;
-
+	
 	GHashTable *selected_sources;
 	GtkTreeRowReference *saved_primary_selection;
 	
@@ -52,7 +52,6 @@
 
 	gboolean toggled_last;
 	gboolean checkboxes_shown;
-	gboolean toggle_selection;
 	gboolean select_new;
 };
 
@@ -467,15 +466,6 @@
 		return FALSE;
 	}
 
-	if (source_is_selected (selector, E_SOURCE (data))) {
-		clear_saved_primary_selection (selector);
-		g_object_unref (data);
-		
-		return TRUE;
-	}
-
-	e_source_selector_select_source (selector, E_SOURCE (data));
-
 	clear_saved_primary_selection (selector);
 	g_object_unref (data);
 
@@ -505,18 +495,15 @@
 	if (!E_IS_SOURCE_GROUP (data)) {
 		source = E_SOURCE (data);
 
-		if (e_source_selector_peek_primary_selection (selector) != source
-		    || selector->priv->toggle_selection) {
-			if (source_is_selected (selector, source))
-				unselect_source (selector, source);
-			else
-				select_source (selector, source);
-			
-			selector->priv->toggled_last = TRUE;
-			
-			gtk_tree_model_row_changed (model, path, &iter);
-			g_signal_emit (selector, signals[SELECTION_CHANGED], 0);
-		}
+		if (source_is_selected (selector, source))
+			unselect_source (selector, source);
+		else
+			select_source (selector, source);
+		
+		selector->priv->toggled_last = TRUE;
+		
+		gtk_tree_model_row_changed (model, path, &iter);
+		g_signal_emit (selector, signals[SELECTION_CHANGED], 0);
 	}
 
 	gtk_tree_path_free (path);
@@ -596,6 +583,8 @@
 	GtkTreePath *path;
 	ESource *source = NULL;
 	
+	priv->toggled_last = FALSE;
+	
 	/* only process right-clicks */
 	if (event->button != 3 || event->type != GDK_BUTTON_PRESS)
 		return FALSE;
@@ -742,6 +731,7 @@
 	gtk_tree_view_append_column (GTK_TREE_VIEW (selector), column);
 
 	cell_renderer = gtk_cell_renderer_pixbuf_new ();
+	g_object_set (G_OBJECT (cell_renderer), "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL);
 	gtk_tree_view_column_pack_start (column, cell_renderer, FALSE);
 	gtk_tree_view_column_set_cell_data_func (column, cell_renderer, (GtkTreeCellDataFunc) pixbuf_cell_data_func, selector, NULL);
 	cell_renderer = gtk_cell_renderer_toggle_new ();
@@ -890,22 +880,6 @@
 	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), FALSE);
 
 	return selector->priv->checkboxes_shown;
-}
-
-/**
- * e_source_selector_set_toggle_selection:
- * @selector: 
- * @state: 
- * 
- * Set the source selector behaviour, whether you can toggle the
- * current selection or not.
- **/
-void
-e_source_selector_set_toggle_selection(ESourceSelector *selector, gboolean state)
-{
-	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
-
-	selector->priv->toggle_selection = state;
 }
 
 /**
Index: e-source-selector.h
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-source-selector.h,v
retrieving revision 1.6
diff -u -r1.6 e-source-selector.h
--- e-source-selector.h	24 Jun 2004 17:22:40 -0000	1.6
+++ e-source-selector.h	14 Jul 2004 18:44:09 -0000
@@ -72,8 +72,6 @@
 					      gboolean         show);
 gboolean  e_source_selector_selection_shown  (ESourceSelector *selector);
 
-void     e_source_selector_set_toggle_selection(ESourceSelector *selector, gboolean state);
-
 void e_source_selector_set_select_new (ESourceSelector *selector, gboolean state);
 
 ESource *e_source_selector_peek_primary_selection  (ESourceSelector *selector);