aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-09-30 00:14:46 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-09-30 00:14:46 +0800
commit098ea8aad8d3249d9faca5df5b4fe67b94ba660f (patch)
treec39d278f71283c9ebded47c606970404276b020f /addressbook/gui
parentcb78b84aecf1c011e0b013cc94a079e2dc0eabbc (diff)
downloadgsoc2013-evolution-098ea8aad8d3249d9faca5df5b4fe67b94ba660f.tar.gz
gsoc2013-evolution-098ea8aad8d3249d9faca5df5b4fe67b94ba660f.tar.zst
gsoc2013-evolution-098ea8aad8d3249d9faca5df5b4fe67b94ba660f.zip
Get Memos to come up. Doesn't really work yet, but the widgets are all there.
svn path=/branches/kill-bonobo/; revision=36491
Diffstat (limited to 'addressbook/gui')
-rw-r--r--addressbook/gui/component/e-book-shell-module.c7
-rw-r--r--addressbook/gui/component/e-book-shell-view-actions.c2
-rw-r--r--addressbook/gui/component/e-book-shell-view-private.c8
-rw-r--r--addressbook/gui/component/e-book-shell-view.c16
4 files changed, 5 insertions, 28 deletions
diff --git a/addressbook/gui/component/e-book-shell-module.c b/addressbook/gui/component/e-book-shell-module.c
index 480320185e..a1e5c96e51 100644
--- a/addressbook/gui/component/e-book-shell-module.c
+++ b/addressbook/gui/component/e-book-shell-module.c
@@ -214,12 +214,9 @@ book_module_book_loaded_cb (EBook *book,
GtkAction *action;
const gchar *action_name;
- if (status != E_BOOK_ERROR_OK) {
- /* XXX We really need a dialog here, but we don't
- * have access to the ESource so we can't use
- * eab_load_error_dialog. Fun! */
+ /* XXX Handle errors better. */
+ if (status != E_BOOK_ERROR_OK)
return;
- }
contact = e_contact_new ();
action = GTK_ACTION (user_data);
diff --git a/addressbook/gui/component/e-book-shell-view-actions.c b/addressbook/gui/component/e-book-shell-view-actions.c
index 5dd1484c7a..f0acab8138 100644
--- a/addressbook/gui/component/e-book-shell-view-actions.c
+++ b/addressbook/gui/component/e-book-shell-view-actions.c
@@ -793,8 +793,6 @@ e_book_shell_view_actions_init (EBookShellView *book_shell_view)
ui_manager = e_shell_window_get_ui_manager (shell_window);
domain = GETTEXT_PACKAGE;
- e_load_ui_definition (ui_manager, "evolution-contacts.ui");
-
/* Contact Actions */
action_group = book_shell_view->priv->contact_actions;
gtk_action_group_set_translation_domain (action_group, domain);
diff --git a/addressbook/gui/component/e-book-shell-view-private.c b/addressbook/gui/component/e-book-shell-view-private.c
index 2cd5378c79..8ae0be5f2f 100644
--- a/addressbook/gui/component/e-book-shell-view-private.c
+++ b/addressbook/gui/component/e-book-shell-view-private.c
@@ -30,15 +30,13 @@ popup_event (EBookShellView *book_shell_view,
GdkEventButton *event)
{
EShellView *shell_view;
- EShellWindow *shell_window;
const gchar *widget_path;
widget_path = "/contact-popup";
shell_view = E_SHELL_VIEW (book_shell_view);
- shell_window = e_shell_view_get_shell_window (shell_view);
e_book_shell_view_actions_update (book_shell_view);
- e_shell_window_show_popup_menu (shell_window, widget_path, event);
+ e_shell_view_show_popup_menu (shell_view, widget_path, event);
}
static void
@@ -260,12 +258,10 @@ static gboolean
book_shell_view_show_popup_menu (GdkEventButton *event,
EShellView *shell_view)
{
- EShellWindow *shell_window;
const gchar *widget_path;
widget_path = "/address-book-popup";
- shell_window = e_shell_view_get_shell_window (shell_view);
- e_shell_window_show_popup_menu (shell_window, widget_path, event);
+ e_shell_view_show_popup_menu (shell_view, widget_path, event);
return TRUE;
}
diff --git a/addressbook/gui/component/e-book-shell-view.c b/addressbook/gui/component/e-book-shell-view.c
index d43ef0bd96..697f3def7b 100644
--- a/addressbook/gui/component/e-book-shell-view.c
+++ b/addressbook/gui/component/e-book-shell-view.c
@@ -130,20 +130,6 @@ book_shell_view_constructed (GObject *object)
}
static void
-book_shell_view_changed (EShellView *shell_view)
-{
- EBookShellViewPrivate *priv;
- GtkActionGroup *action_group;
- gboolean visible;
-
- priv = E_BOOK_SHELL_VIEW_GET_PRIVATE (shell_view);
-
- action_group = priv->contact_actions;
- visible = e_shell_view_is_active (shell_view);
- gtk_action_group_set_visible (action_group, visible);
-}
-
-static void
book_shell_view_class_init (EBookShellViewClass *class,
GTypeModule *type_module)
{
@@ -162,11 +148,11 @@ book_shell_view_class_init (EBookShellViewClass *class,
shell_view_class = E_SHELL_VIEW_CLASS (class);
shell_view_class->label = N_("Contacts");
shell_view_class->icon_name = "x-office-address-book";
+ shell_view_class->ui_definition = "evolution-contacts.ui";
shell_view_class->search_options = "/contact-search-options";
shell_view_class->type_module = type_module;
shell_view_class->new_shell_content = e_book_shell_content_new;
shell_view_class->new_shell_sidebar = e_book_shell_sidebar_new;
- shell_view_class->changed = book_shell_view_changed;
g_object_class_install_property (
object_class,