hook up contact_changed/contact_removed signals. (contact_changed): new

2004-02-02  Chris Toshok  <toshok@ximian.com>

	* gui/widgets/e-addressbook-view.c (eab_view_new): hook up
	contact_changed/contact_removed signals.
	(contact_changed): new function.  if the changed contact is the
	one we're displaying, re-render it.
	(contact_removed): new function.  if the removed contact is the
	one we're displaying, clear the display.
	(render_contact): set displayed_contact to the row.
	(eab_view_init): init displayed_contact to -1.
	(selection_changed): set displayed_contact to -1 when we clear the
	display.

	* gui/widgets/e-addressbook-view.h (struct _EABView): add
	"displayed_contact" so we can update the contact preview when it
	changes.

svn path=/trunk/; revision=24574

3 files changed, 86 insertions, 12 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 1a8868092e..d4f7890c3f 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,20 @@
+2004-02-02  Chris Toshok  <toshok@ximian.com>
+
+	* gui/widgets/e-addressbook-view.c (eab_view_new): hook up
+	contact_changed/contact_removed signals.
+	(contact_changed): new function.  if the changed contact is the
+	one we're displaying, re-render it.
+	(contact_removed): new function.  if the removed contact is the
+	one we're displaying, clear the display.
+	(render_contact): set displayed_contact to the row.
+	(eab_view_init): init displayed_contact to -1.
+	(selection_changed): set displayed_contact to -1 when we clear the
+	display.
+	
+	* gui/widgets/e-addressbook-view.h (struct _EABView): add
+	"displayed_contact" so we can update the contact preview when it
+	changes.
+
 2004-01-30  Chris Toshok  <toshok@ximian.com>
 
 	* gui/contact-editor/e-contact-editor.c: enable d&d drop photos.
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 633988ee31..d134707741 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -92,8 +92,11 @@ static void status_message     (GtkObject *object, const gchar *status, EABView
 static void search_result      (GtkObject *object, EBookViewStatus status, EABView *eav);
 static void folder_bar_message (GtkObject *object, const gchar *status, EABView *eav);
 static void stop_state_changed (GtkObject *object, EABView *eav);
-static void writable_status (GtkObject *object, gboolean writable, EABView *eav);
-static void backend_died (GtkObject *object, EABView *eav);
+static void writable_status    (GtkObject *object, gboolean writable, EABView *eav);
+static void backend_died       (GtkObject *object, EABView *eav);
+static void contact_changed    (EABModel *model, gint index, EABView *eav);
+static void contact_removed    (EABModel *model, gint index, EABView *eav);
+
 static void command_state_change (EABView *eav);
 
 static void selection_clear_event (GtkWidget *invisible, GdkEventSelection *event,
@@ -281,6 +284,7 @@ eab_view_init (EABView *eav)
 	eav->widget = NULL;
 	eav->scrolled = NULL;
 	eav->contact_display = NULL;
+	eav->displayed_contact = -1;
 
 	eav->view_instance = NULL;
 	eav->view_menus = NULL;
@@ -363,12 +367,15 @@ set_paned_position (EABView *eav)
 	GConfClient *gconf_client;
 	gint         pos;
 
+	/* XXX this should use the addressbook's global gconf client */
 	gconf_client = gconf_client_get_default ();
 	pos = gconf_client_get_int (gconf_client, "/apps/evolution/addressbook/display/vpane_position", NULL);
 	if (pos < 1)
 		pos = 144;
 
 	gtk_paned_set_position (GTK_PANED (eav->paned), pos);
+
+	g_object_unref (gconf_client);
 }
 
 static gboolean
@@ -377,11 +384,14 @@ get_paned_position (EABView *eav)
 	GConfClient *gconf_client;
 	gint pos;
 
+	/* XXX this should use the addressbook's global gconf client */
 	gconf_client = gconf_client_get_default ();
 
 	pos = gtk_paned_get_position (GTK_PANED (eav->paned));
 	gconf_client_set_int (gconf_client, "/apps/evolution/addressbook/display/vpane_position", pos, NULL);
 
+	g_object_unref (gconf_client);
+
 	return FALSE;
 }
 
@@ -406,6 +416,10 @@ eab_view_new (void)
 			  G_CALLBACK (writable_status), eav);
 	g_signal_connect (eav->model, "backend_died",
 			  G_CALLBACK (backend_died), eav);
+	g_signal_connect (eav->model, "contact_changed",
+			  G_CALLBACK (contact_changed), eav);
+	g_signal_connect (eav->model, "contact_removed",
+			  G_CALLBACK (contact_removed), eav);
 
 	eav->editable = FALSE;
 	eav->query = g_strdup (SHOW_ALL_SEARCH);
@@ -515,6 +529,23 @@ init_collection (void)
 }
 
 static void
+set_view_preview (EABView *view)
+{
+	/* XXX this should use the addressbook's global gconf client */
+	GConfClient *gconf_client;
+	gboolean state;
+
+	gconf_client = gconf_client_get_default();
+	state = gconf_client_get_bool(gconf_client, "/apps/evolution/addressbook/display/show_preview", NULL);
+	bonobo_ui_component_set_prop (view->uic,
+				      "/commands/ContactsViewPreview",
+				      "state",
+				      state ? "1" : "0", NULL);
+	
+	g_object_unref (gconf_client);
+}
+
+static void
 display_view(GalViewInstance *instance,
 	     GalView *view,
 	     gpointer data)
@@ -537,26 +568,25 @@ display_view(GalViewInstance *instance,
 	address_view->current_view = view;
 
 	set_paned_position (address_view);
+	set_view_preview (address_view);
 }
 
 static void
 view_preview(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data)
 {
-	GConfClient *gconf;
+	/* XXX this should use the addressbook's global gconf client */
+	GConfClient *gconf_client;
 	EABView *view = EAB_VIEW (data);
 
 	if (type != Bonobo_UIComponent_STATE_CHANGED)
 		return;
 
-#if 0
-	gconf = mail_config_get_gconf_client ();
-	gconf_client_set_bool(gconf, "/apps/evolution/mail/display/show_preview", state[0] != '0', NULL);
-
-	if (camel_object_meta_set(emfv->folder, "evolution:show_preview", state))
-		camel_object_state_write(emfv->folder);
-#endif
+	gconf_client = gconf_client_get_default();
+	gconf_client_set_bool(gconf_client, "/apps/evolution/addressbook/display/show_preview", state[0] != '0', NULL);
 
 	eab_view_show_contact_preview(view, state[0] != '0');
+
+	g_object_unref (gconf_client);
 }
 
 static void
@@ -577,8 +607,9 @@ setup_menus (EABView *view)
 				 G_CALLBACK (display_view), view);
 	}
 
-
 	bonobo_ui_component_add_listener(view->uic, "ContactsViewPreview", view_preview, view);
+
+	set_view_preview (view);
 }
 
 static void
@@ -1080,6 +1111,8 @@ render_contact (int row, EABView *view)
 {
 	EContact *contact = eab_model_get_contact (view->model, row);
 
+	view->displayed_contact = row;
+
 	eab_contact_display_render (EAB_CONTACT_DISPLAY (view->contact_display), contact,
 				    EAB_CONTACT_DISPLAY_RENDER_NORMAL);
 }
@@ -1096,9 +1129,11 @@ selection_changed (GObject *o, EABView *view)
 	if (e_selection_model_selected_count (selection_model) == 1)
 		e_selection_model_foreach (selection_model,
 					   (EForeachFunc)render_contact, view);
-	else
+	else {
+		view->displayed_contact = -1;
 		eab_contact_display_render (EAB_CONTACT_DISPLAY (view->contact_display), NULL,
 					    EAB_CONTACT_DISPLAY_RENDER_NORMAL);
+	}
 					    
 }
 
@@ -1241,6 +1276,26 @@ backend_died (GtkObject *object, EABView *eav)
 }
 
 static void
+contact_changed (EABModel *model, gint index, EABView *eav)
+{
+	if (eav->displayed_contact == index) {
+		/* if the contact that's presently displayed is changed, re-render it */
+		render_contact (index, eav);
+	}
+}
+
+static void
+contact_removed (EABModel *model, gint index, EABView *eav)
+{
+	if (eav->displayed_contact == index) {
+		/* if the contact that's presently displayed is changed, clear the display */
+		eab_contact_display_render (EAB_CONTACT_DISPLAY (eav->contact_display), NULL,
+					    EAB_CONTACT_DISPLAY_RENDER_NORMAL);
+		eav->displayed_contact = -1;
+	}
+}
+
+static void
 minicard_right_click (EMinicardView *minicard_view_item, GdkEvent *event, EABView *view)
 {
        do_popup_menu(view, event);
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index c03c1e3d00..c90356beee 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -76,6 +76,8 @@ struct _EABView
 	char  *query;
 	guint editable : 1;
 
+	gint displayed_contact;
+
 	GObject *object;
 	GtkWidget *widget;