aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/calendar-commands.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-03-16 06:51:13 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-03-16 06:51:13 +0800
commitc85ad2279bcfc8e85e6c6b5824e851da92173582 (patch)
treec0e77b54e2ed6a5fece1ff5469f7bd048636a329 /calendar/gui/calendar-commands.c
parent95c4e2623b6f22473ee4a304d485400728ed8b09 (diff)
downloadgsoc2013-evolution-c85ad2279bcfc8e85e6c6b5824e851da92173582.tar.gz
gsoc2013-evolution-c85ad2279bcfc8e85e6c6b5824e851da92173582.tar.zst
gsoc2013-evolution-c85ad2279bcfc8e85e6c6b5824e851da92173582.zip
[Start implementing the new Search Bar design.]
* e-search-bar.c (init): Init various members to NULL. (set_dropdown): Removed. (add_dropdown): Removed. (set_menu): New. (add_menu_items): New. (set_option): No need to setup the dropdown size here anymore. (verb_cb): Function implementing the search menu verbs. (update_bonobo_menus): New. (e_search_bar_set_ui_component): New. * e-search-bar.h: Remove the dropdown button stuff from struct ESearchBar. Add `uic' and `items' members. * e-filter-bar.c (e_filter_bar_new): Get a @uic arg. * folder-browser-factory.c (control_activate): Set the UI component on the search bar. * gui/tasks-control.c (tasks_control_activate): Call `e_tasks_set_ui_component()' here to give it the BonoboUIComponent. (tasks_control_deactivate): Likewise, call it here to unset the BonoboUIComponent. * gui/e-tasks.c (e_tasks_set_ui_component): New. * gui/calendar-commands.c (calendar_control_activate): Call gnome_calendar_set_ui_component() here. (calendar_control_deactivate): ...And here, with a NULL BonoboUIComponent. * gui/gnome-cal.c (gnome_calendar_set_ui_component): New. * gui/component/addressbook.c (control_activate): Call `e_search_bar_set_ui_component()' to set the BonoboUIComponent for the search bar. * gui/component/GNOME_Evolution_Addressbook.oaf.in: Add an icon for the LDAP sources configuration control. svn path=/trunk/; revision=16178
Diffstat (limited to 'calendar/gui/calendar-commands.c')
-rw-r--r--calendar/gui/calendar-commands.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 8eb6a540e8..4165760231 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -686,6 +686,8 @@ calendar_control_activate (BonoboControl *control,
uic = bonobo_control_get_ui_component (control);
g_assert (uic != NULL);
+ gnome_calendar_set_ui_component (gcal, uic);
+
remote_uih = bonobo_control_get_remote_ui_container (control);
bonobo_ui_component_set_container (uic, remote_uih);
bonobo_object_release_unref (remote_uih, NULL);
@@ -735,10 +737,13 @@ void
calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal)
{
FocusData *focus;
+ BonoboUIComponent *uic;
- BonoboUIComponent *uic = bonobo_control_get_ui_component (control);
+ uic = bonobo_control_get_ui_component (control);
g_assert (uic != NULL);
+ gnome_calendar_set_ui_component (gcal, uic);
+
focus = gtk_object_get_data (GTK_OBJECT (control), "focus_data");
g_assert (focus != NULL);