aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell-window-actions.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-05-10 11:50:43 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-05-10 11:50:43 +0800
commit92e942499bffca812dcbc229f6c88ebb640e403a (patch)
tree88eff8cf45f83728f264c4f90582950452dee497 /shell/e-shell-window-actions.c
parente18f9eb725e0be78db138e9eb0d58ed4d3370c82 (diff)
downloadgsoc2013-evolution-92e942499bffca812dcbc229f6c88ebb640e403a.tar
gsoc2013-evolution-92e942499bffca812dcbc229f6c88ebb640e403a.tar.gz
gsoc2013-evolution-92e942499bffca812dcbc229f6c88ebb640e403a.tar.bz2
gsoc2013-evolution-92e942499bffca812dcbc229f6c88ebb640e403a.tar.lz
gsoc2013-evolution-92e942499bffca812dcbc229f6c88ebb640e403a.tar.xz
gsoc2013-evolution-92e942499bffca812dcbc229f6c88ebb640e403a.tar.zst
gsoc2013-evolution-92e942499bffca812dcbc229f6c88ebb640e403a.zip
Fix bugs caused by EShellBackend changes.
Diffstat (limited to 'shell/e-shell-window-actions.c')
-rw-r--r--shell/e-shell-window-actions.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 9c8c8d46df..846bb82d98 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -1965,26 +1965,28 @@ e_shell_window_create_switcher_actions (EShellWindow *shell_window)
for (iter = list; iter != NULL; iter = iter->next) {
EShellBackend *shell_backend = iter->data;
+ EShellBackendClass *backend_class;
EShellViewClass *class;
- GType type;
+ GType view_type;
const gchar *view_name;
gchar *accelerator;
gchar *action_name;
gchar *tooltip;
/* The backend name is also the view name. */
- view_name = E_SHELL_BACKEND_GET_CLASS (shell_backend)->name;
- type = E_SHELL_BACKEND_GET_CLASS (shell_backend)->view_type;
+ backend_class = E_SHELL_BACKEND_GET_CLASS (shell_backend);
+ view_type = backend_class->shell_view_type;
+ view_name = backend_class->name;
- if (!g_type_is_a (type, E_TYPE_SHELL_VIEW)) {
+ if (!g_type_is_a (view_type, E_TYPE_SHELL_VIEW)) {
g_critical (
"%s is not a subclass of %s",
- g_type_name (type),
+ g_type_name (view_type),
g_type_name (E_TYPE_SHELL_VIEW));
continue;
}
- class = g_type_class_ref (type);
+ class = g_type_class_ref (view_type);
if (class->label == NULL) {
g_critical (