aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-12-02 10:17:34 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-12-02 10:17:34 +0800
commitac0442e31c68ce073e4156bbe47d63da8f7d2523 (patch)
tree937719987d7b438cd4db1b3f0326bde0a622e615 /addressbook
parent9b2e5956080b08da3611996c7f12158fcfe3e06d (diff)
downloadgsoc2013-evolution-ac0442e31c68ce073e4156bbe47d63da8f7d2523.tar
gsoc2013-evolution-ac0442e31c68ce073e4156bbe47d63da8f7d2523.tar.gz
gsoc2013-evolution-ac0442e31c68ce073e4156bbe47d63da8f7d2523.tar.bz2
gsoc2013-evolution-ac0442e31c68ce073e4156bbe47d63da8f7d2523.tar.lz
gsoc2013-evolution-ac0442e31c68ce073e4156bbe47d63da8f7d2523.tar.xz
gsoc2013-evolution-ac0442e31c68ce073e4156bbe47d63da8f7d2523.tar.zst
gsoc2013-evolution-ac0442e31c68ce073e4156bbe47d63da8f7d2523.zip
Pass a label for the status bar control for now.
* gui/component/addressbook-component.c (impl_createControls): Pass a label for the status bar control for now. * gui/calendar-component.c (impl_createControls): Pass a label for the status bar control for now. * gui/tasks-component.c (impl_createControls): Pass a label for the status bar control for now. * mail-component.c (impl_createControls): Pass a label for the status bar control for now. * e-shell.c (struct _EShellPrivate): Remove member activity_handler. (setup_activity_interface): Remove. (e_shell_init): Don't call. (create_window): Don't attach the task bar to the activity handler. * e-shell-window.c (struct _ComponentView): New member statusbar_widget. (struct _EShellWindowPrivate): Remove member task_bar. (init_view): Get the status bar control from createControls and put it in the ComponentView struct. (setup_task_bar): New. (setup_statusbar_notebook): New. (switch_view): Switch the statusbar notebook too. (impl_dispose): Add missing GTK_OBJECT() cast. (e_shell_window_peek_task_bar): Remove. * Evolution-Component.idl (Component::createControls): New out arg "statusbar_control"; this way components can provide their own status bar. * e-activity-handler.c, e-activity-handler.h: Turn into a plain GObject; translate all the CORBA methods into plain C methods. * Makefile.am: Move e-activity-handler to libeshell instead of it being in the shell. svn path=/trunk/; revision=23555
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/component/addressbook-component.c12
2 files changed, 17 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 9bb07f7968..81713aab1b 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-01 Ettore Perazzoli <ettore@ximian.com>
+
+ * gui/component/addressbook-component.c (impl_createControls):
+ Pass a label for the status bar control for now.
+
2003-12-01 Larry Ewing <lewing@ximian.com>
* gui/component/Makefile.am (INCLUDES): remove
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 046b1f5a00..306a1f6e2b 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -39,6 +39,7 @@
#include <gtk/gtkmenu.h>
#include <gtk/gtkimage.h>
#include <gtk/gtkimagemenuitem.h>
+#include <gtk/gtklabel.h> /* FIXME */
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkstock.h>
#include <gconf/gconf-client.h>
@@ -149,6 +150,7 @@ static void
impl_createControls (PortableServer_Servant servant,
Bonobo_Control *corba_sidebar_control,
Bonobo_Control *corba_view_control,
+ Bonobo_Control *corba_statusbar_control,
CORBA_Environment *ev)
{
AddressbookComponent *addressbook_component = ADDRESSBOOK_COMPONENT (bonobo_object_from_servant (servant));
@@ -183,6 +185,16 @@ impl_createControls (PortableServer_Servant servant,
*corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (sidebar_control), ev);
*corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (view_control), ev);
+
+ /* FIXME temporary for testing. */
+ {
+ GtkWidget *label = gtk_label_new ("Hey hey this is the addressbook");
+ BonoboControl *control;
+
+ gtk_widget_show (label);
+ control = bonobo_control_new (label);
+ *corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (control), ev);
+ }
}
static GNOME_Evolution_CreatableItemTypeList *