aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell-window.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2009-03-10 09:06:18 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2009-03-10 09:06:18 +0800
commit7a92d9cc82b7775a0f5cb1fde233119d435a79b6 (patch)
tree0bf446e28f6068a36dc3164725d3c37b05db4f6c /shell/e-shell-window.c
parentf963cc39a7d21f64f578dae50fd08c44181a3bf6 (diff)
downloadgsoc2013-evolution-7a92d9cc82b7775a0f5cb1fde233119d435a79b6.tar
gsoc2013-evolution-7a92d9cc82b7775a0f5cb1fde233119d435a79b6.tar.gz
gsoc2013-evolution-7a92d9cc82b7775a0f5cb1fde233119d435a79b6.tar.bz2
gsoc2013-evolution-7a92d9cc82b7775a0f5cb1fde233119d435a79b6.tar.lz
gsoc2013-evolution-7a92d9cc82b7775a0f5cb1fde233119d435a79b6.tar.xz
gsoc2013-evolution-7a92d9cc82b7775a0f5cb1fde233119d435a79b6.tar.zst
gsoc2013-evolution-7a92d9cc82b7775a0f5cb1fde233119d435a79b6.zip
Add e_lookup_action() and e_lookup_action_group() to e-util, so
I don't have to keep writing the algorithm over and over again. Add EFileActivity, which provides a GCancellable for GIO operations. Cancelling the activity cancels the GIO operation, and vice versa. Also provides a handy GFileProgressCallback function which updates the activity's "percent" property. svn path=/branches/kill-bonobo/; revision=37396
Diffstat (limited to 'shell/e-shell-window.c')
-rw-r--r--shell/e-shell-window.c35
1 files changed, 2 insertions, 33 deletions
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index e16c22cc66..c054d6a8a0 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -555,29 +555,13 @@ e_shell_window_get_action (EShellWindow *shell_window,
const gchar *action_name)
{
GtkUIManager *ui_manager;
- GtkAction *action = NULL;
- GList *iter;
g_return_val_if_fail (E_IS_SHELL_WINDOW (shell_window), NULL);
g_return_val_if_fail (action_name != NULL, NULL);
ui_manager = e_shell_window_get_ui_manager (shell_window);
- iter = gtk_ui_manager_get_action_groups (ui_manager);
- while (iter != NULL) {
- GtkActionGroup *action_group = iter->data;
-
- action = gtk_action_group_get_action (
- action_group, action_name);
- if (action != NULL)
- return action;
-
- iter = g_list_next (iter);
- }
-
- g_critical ("%s: action `%s' not found", G_STRFUNC, action_name);
-
- return NULL;
+ return e_lookup_action (ui_manager, action_name);
}
/**
@@ -596,28 +580,13 @@ e_shell_window_get_action_group (EShellWindow *shell_window,
const gchar *group_name)
{
GtkUIManager *ui_manager;
- GList *iter;
g_return_val_if_fail (E_IS_SHELL_WINDOW (shell_window), NULL);
g_return_val_if_fail (group_name != NULL, NULL);
ui_manager = e_shell_window_get_ui_manager (shell_window);
- iter = gtk_ui_manager_get_action_groups (ui_manager);
-
- while (iter != NULL) {
- GtkActionGroup *action_group = iter->data;
- const gchar *name;
-
- name = gtk_action_group_get_name (action_group);
- if (strcmp (name, group_name) == 0)
- return action_group;
-
- iter = g_list_next (iter);
- }
-
- g_critical ("%s: action group `%s' not found", G_STRFUNC, group_name);
- return NULL;
+ return e_lookup_action_group (ui_manager, group_name);
}
/**