From 2878a355805ec60f521ea8816a738a0ae0a75893 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 18 Jan 2011 17:50:55 -0500 Subject: Use e_source_selector_get_source_by_path(). Allows Evolution to not have to know the ESource column number in ESourceSelector tree models. Backported from "account-mgmt" branch. --- modules/calendar/e-cal-shell-sidebar.c | 9 +-------- modules/calendar/e-memo-shell-sidebar.c | 9 +-------- modules/calendar/e-task-shell-sidebar.c | 9 +-------- 3 files changed, 3 insertions(+), 24 deletions(-) (limited to 'modules/calendar') diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c index 45bb5a37fb..1af16b3b8e 100644 --- a/modules/calendar/e-cal-shell-sidebar.c +++ b/modules/calendar/e-cal-shell-sidebar.c @@ -325,15 +325,8 @@ cal_shell_sidebar_row_changed_cb (ECalShellSidebar *cal_shell_sidebar, ESourceSelector *selector; ESource *source; - /* XXX ESourceSelector's underlying tree store has only one - * column: ESource objects. While we're not supposed to - * know this, listening for "row-changed" signals from - * the model is easier to deal with than the selector's - * "selection-changed" signal, which doesn't tell you - * _which_ row changed. */ - selector = e_cal_shell_sidebar_get_selector (cal_shell_sidebar); - gtk_tree_model_get (tree_model, tree_iter, 0, &source, -1); + source = e_source_selector_get_source_by_path (selector, tree_path); /* XXX This signal gets emitted a lot while the model is being * rebuilt, during which time we won't get a valid ESource. diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c index c22cff35dc..31304948f9 100644 --- a/modules/calendar/e-memo-shell-sidebar.c +++ b/modules/calendar/e-memo-shell-sidebar.c @@ -333,15 +333,8 @@ memo_shell_sidebar_row_changed_cb (EMemoShellSidebar *memo_shell_sidebar, ESourceSelector *selector; ESource *source; - /* XXX ESourceSelector's underlying tree store has only one - * column: ESource objects. While we're not supposed to - * know this, listening for "row-changed" signals from - * the model is easier to deal with than the selector's - * "selection-changed" signal, which doesn't tell you - * _which_ row changed. */ - selector = e_memo_shell_sidebar_get_selector (memo_shell_sidebar); - gtk_tree_model_get (tree_model, tree_iter, 0, &source, -1); + source = e_source_selector_get_source_by_path (selector, tree_path); /* XXX This signal gets emitted a lot while the model is being * rebuilt, during which time we won't get a valid ESource. diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c index a688da41cd..e00159026c 100644 --- a/modules/calendar/e-task-shell-sidebar.c +++ b/modules/calendar/e-task-shell-sidebar.c @@ -333,15 +333,8 @@ task_shell_sidebar_row_changed_cb (ETaskShellSidebar *task_shell_sidebar, ESourceSelector *selector; ESource *source; - /* XXX ESourceSelector's underlying tree store has only one - * column: ESource objects. While we're not supposed to - * know this, listening for "row-changed" signals from - * the model is easier to deal with than the selector's - * "selection-changed" signal, which doesn't tell you - * _which_ row changed. */ - selector = e_task_shell_sidebar_get_selector (task_shell_sidebar); - gtk_tree_model_get (tree_model, tree_iter, 0, &source, -1); + source = e_source_selector_get_source_by_path (selector, tree_path); /* XXX This signal gets emitted a lot while the model is being * rebuilt, during which time we won't get a valid ESource. -- cgit v1.2.3