aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/component/addressbook.c60
2 files changed, 7 insertions, 60 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6355319bf0..6afbf30325 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,12 @@
2003-12-03 Ettore Perazzoli <ettore@ximian.com>
+ * gui/component/addressbook.c
+ (retrieve_shell_view_interface_from_control): Remove.
+ (set_folder_bar_label): Remove.
+ (addressbook_new_control): Don't connect.
+
+2003-12-03 Ettore Perazzoli <ettore@ximian.com>
+
* gui/component/addressbook-config.c: Do not depend on
e-folder-list.
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 98afc9cb9b..f415c903e9 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -889,27 +889,6 @@ addressbook_query_changed (ESearchBar *esb, AddressbookView *view)
}
}
-static GNOME_Evolution_ShellView
-retrieve_shell_view_interface_from_control (BonoboControl *control)
-{
- Bonobo_ControlFrame control_frame;
- GNOME_Evolution_ShellView shell_view_interface;
- CORBA_Environment ev;
-
- control_frame = bonobo_control_get_control_frame (control, NULL);
-
- if (control_frame == NULL)
- return CORBA_OBJECT_NIL;
-
- CORBA_exception_init (&ev);
- shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
- "IDL:GNOME/Evolution/ShellView:" BASE_VERSION,
- &ev);
- CORBA_exception_free (&ev);
-
- return shell_view_interface;
-}
-
static void
set_status_message (EABView *eav, const char *message, AddressbookView *view)
{
@@ -979,42 +958,6 @@ search_result (EABView *eav, EBookViewStatus status, AddressbookView *view)
}
}
-static void
-set_folder_bar_label (EABView *eav, const char *message, AddressbookView *view)
-{
- CORBA_Environment ev;
- GNOME_Evolution_ShellView shell_view_interface;
-
- CORBA_exception_init (&ev);
-
- shell_view_interface = retrieve_shell_view_interface_from_control (view->control);
- if (!shell_view_interface) {
- CORBA_exception_free (&ev);
- return;
- }
-
- d(g_message("Updating via ShellView"));
-
- if (message == NULL || message[0] == 0) {
- GNOME_Evolution_ShellView_setFolderBarLabel (shell_view_interface,
- "",
- &ev);
- }
- else {
- GNOME_Evolution_ShellView_setFolderBarLabel (shell_view_interface,
- message,
- &ev);
- }
-
- if (BONOBO_EX (&ev))
- g_warning ("Exception in label update: %s",
- bonobo_exception_get_text (&ev));
-
- CORBA_exception_free (&ev);
-
- bonobo_object_release_unref (shell_view_interface, NULL);
-}
-
static int
compare_subitems (const void *a, const void *b)
{
@@ -1129,9 +1072,6 @@ addressbook_new_control (void)
g_signal_connect (view->view, "search_result",
G_CALLBACK(search_result), view);
- g_signal_connect (view->view, "folder_bar_message",
- G_CALLBACK(set_folder_bar_label), view);
-
g_signal_connect (view->view, "command_state_change",
G_CALLBACK(update_command_state), view);