From bd2f1603e5eb577e9b57ecf02701e5bfbfebb9b0 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sun, 5 Aug 2001 04:33:57 +0000 Subject: Add some padding to the label so that the title doesn't move around when * e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct): Add some padding to the label so that the title doesn't move around when you switch between pop-up and non-pop-up folder bar. Also, change all the GtkLabels to be GtkClippedLabels instead. (e_shell_folder_title_bar_set_title): Updated to use EClippedLabels instead of GtkLabels. (e_shell_folder_title_bar_set_folder_bar_label): Likewise. * e-shell.c (impl_Shell__get_displayName): New, implementation for the `displayName' attribute. * Evolution-Shell.idl: Added readonly attribute `displayName' to get the canonicalized X11 display name for the shell. * e-shell.c (e_shell_construct): Ooops. Return `E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER' if the OAF registration fails, not `E_SHELL_CONSTRUCT_RESULT_GENERICERROR'. * e-shortcuts-view.c (rename_group_cb): Get the toplevel from the shortcuts view, not the widget. (rename_shortcut_cb): Likewise. (show_new_group_dialog): Changed to use `e_request_string()'. * evolution-test-component.c: Add the %FALSE value for the `user_creatable' field in the `folder_types' entry. * evolution-shell-client.c: New member `shortcuts_interface' in `EvolutionShellClientPrivate'. (destroy): Unref it if not CORBA_OBJECT_NIL. (init): Init to CORBA_OBJECT_NIL. (query_shell_interface): New helper function to query an interface on the shell and spit out warnings if it fails. (evolution_shell_client_construct): Use it to query the ::Activity interface. Also query the ::Shortcuts interface and set the `shortcuts_interface' member to point to it. * e-shell.c: New member `corba_shortcuts' in `EShellPrivate'. (init): Init to NULL. (setup_shortcuts_interface): Helper function to add the ::Shortcuts CORBA interface to the shell. (e_shell_construct): Call it. * e-corba-shortcuts.c, e-corba-shortcuts.h: New objects implementing the `Evolution::Shortcuts' CORBA interface. * Evolution-Shortcuts.idl: New interface for accessing the shortcuts in the shell. * e-shell.c (e_shell_get_config_db): Moved down. svn path=/trunk/; revision=11689 --- shell/e-corba-shortcuts.c | 317 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 317 insertions(+) create mode 100644 shell/e-corba-shortcuts.c (limited to 'shell/e-corba-shortcuts.c') diff --git a/shell/e-corba-shortcuts.c b/shell/e-corba-shortcuts.c new file mode 100644 index 0000000000..20458f587a --- /dev/null +++ b/shell/e-corba-shortcuts.c @@ -0,0 +1,317 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +/* e-corba-shortcuts.c + * + * Copyright (C) 2001 Ximian, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Ettore Perazzoli + */ + +/* FIXME: Doesn't throw exceptions properly. */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "e-corba-shortcuts.h" + +#include "e-util/e-corba-utils.h" + +#include + + +#define PARENT_TYPE bonobo_x_object_get_type () +static BonoboXObjectClass *parent_class = NULL; + +struct _ECorbaShortcutsPrivate { + EShortcuts *shortcuts; +}; + + +/* Utility functions. */ + +static const char * +string_from_corba (CORBA_char *corba_string) +{ + if (corba_string[0] == '\0') + return NULL; + + return corba_string; +} + +static void +shortcut_list_to_corba (const GSList *shortcut_list, + GNOME_Evolution_Shortcuts_ShortcutList *shortcut_list_return) +{ + GNOME_Evolution_Shortcuts_Shortcut *buffer; + const GSList *p; + int num_shortcuts; + int i; + + num_shortcuts = g_slist_length ((GSList *) shortcut_list); /* safe cast, GLib sucks */ + + shortcut_list_return->_maximum = num_shortcuts; + shortcut_list_return->_length = num_shortcuts; + + buffer = CORBA_sequence_GNOME_Evolution_Shortcuts_Shortcut_allocbuf (num_shortcuts); + shortcut_list_return->_buffer = buffer; + + for (p = shortcut_list, i = 0; p != NULL; p = p->next, i++) { + const EShortcutItem *item; + + item = (const EShortcutItem *) p->data; + + buffer[i].uri = CORBA_string_dup (e_safe_corba_string (item->uri)); + buffer[i].name = CORBA_string_dup (e_safe_corba_string (item->name)); + buffer[i].type = CORBA_string_dup (e_safe_corba_string (item->type)); + } +} + + +/* GtkObject methods. */ + +static void +impl_destroy (GtkObject *object) +{ + ECorbaShortcuts *corba_shortcuts; + ECorbaShortcutsPrivate *priv; + + corba_shortcuts = E_CORBA_SHORTCUTS (object); + priv = corba_shortcuts->priv; + + gtk_object_unref (GTK_OBJECT (priv->shortcuts)); + + g_free (priv); + + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); +} + + +static void +impl_add (PortableServer_Servant servant, + const CORBA_short group_num, + const CORBA_short position, + const GNOME_Evolution_Shortcuts_Shortcut *shortcut, + CORBA_Environment *ev) +{ + ECorbaShortcuts *corba_shortcuts; + ECorbaShortcutsPrivate *priv; + + corba_shortcuts = E_CORBA_SHORTCUTS (bonobo_object_from_servant (servant)); + priv = corba_shortcuts->priv; + + e_shortcuts_add_shortcut (priv->shortcuts, group_num, position, + string_from_corba (shortcut->uri), + string_from_corba (shortcut->name), + 0, + string_from_corba (shortcut->type)); +} + +static void +impl_remove (PortableServer_Servant servant, + const CORBA_short group_num, + const CORBA_short item_num, + CORBA_Environment *ev) +{ + ECorbaShortcuts *corba_shortcuts; + ECorbaShortcutsPrivate *priv; + + corba_shortcuts = E_CORBA_SHORTCUTS (bonobo_object_from_servant (servant)); + priv = corba_shortcuts->priv; + + e_shortcuts_remove_shortcut (priv->shortcuts, group_num, item_num); +} + +static GNOME_Evolution_Shortcuts_Shortcut * +impl_get (PortableServer_Servant servant, + const CORBA_short group_num, + const CORBA_short item_num, + CORBA_Environment *ev) +{ + ECorbaShortcuts *corba_shortcuts; + ECorbaShortcutsPrivate *priv; + GNOME_Evolution_Shortcuts_Shortcut *retval; + const EShortcutItem *item; + + corba_shortcuts = E_CORBA_SHORTCUTS (bonobo_object_from_servant (servant)); + priv = corba_shortcuts->priv; + + item = e_shortcuts_get_shortcut (priv->shortcuts, group_num, item_num); + if (item == NULL) { + CORBA_exception_set (ev, CORBA_USER_EXCEPTION, + ex_GNOME_Evolution_Shortcuts_NotFound, NULL); + return NULL; + } + + retval = GNOME_Evolution_Shortcuts_Shortcut__alloc (); + retval->uri = CORBA_string_dup (e_safe_corba_string (item->uri)); + retval->name = CORBA_string_dup (e_safe_corba_string (item->name)); + retval->type = CORBA_string_dup (e_safe_corba_string (item->type)); + + return retval; +} + +static void +impl_addGroup (PortableServer_Servant servant, + const CORBA_short position, + const CORBA_char *name, + CORBA_Environment *ev) +{ + ECorbaShortcuts *corba_shortcuts; + ECorbaShortcutsPrivate *priv; + + corba_shortcuts = E_CORBA_SHORTCUTS (bonobo_object_from_servant (servant)); + priv = corba_shortcuts->priv; + + e_shortcuts_add_group (priv->shortcuts, position, name); +} + +static void +impl_removeGroup (PortableServer_Servant servant, + const CORBA_short group_num, + CORBA_Environment *ev) +{ + ECorbaShortcuts *corba_shortcuts; + ECorbaShortcutsPrivate *priv; + + corba_shortcuts = E_CORBA_SHORTCUTS (bonobo_object_from_servant (servant)); + priv = corba_shortcuts->priv; + + e_shortcuts_remove_group (priv->shortcuts, group_num); +} + +static GNOME_Evolution_Shortcuts_Group * +impl_getGroup (PortableServer_Servant servant, + const CORBA_short group_num, + CORBA_Environment *ev) +{ + ECorbaShortcuts *corba_shortcuts; + ECorbaShortcutsPrivate *priv; + GNOME_Evolution_Shortcuts_Group *group; + const GSList *list; + + corba_shortcuts = E_CORBA_SHORTCUTS (bonobo_object_from_servant (servant)); + priv = corba_shortcuts->priv; + + list = e_shortcuts_get_shortcuts_in_group (priv->shortcuts, group_num); + + group = GNOME_Evolution_Shortcuts_Group__alloc (); + + group->name = CORBA_string_dup (e_shortcuts_get_group_title (priv->shortcuts, group_num)); + + shortcut_list_to_corba (list, & group->shortcuts); + + return group; +} + +static CORBA_sequence_GNOME_Evolution_Shortcuts_Group * +impl__get_groups (PortableServer_Servant servant, + CORBA_Environment *ev) +{ + GNOME_Evolution_Shortcuts_GroupList *list; + ECorbaShortcuts *corba_shortcuts; + ECorbaShortcutsPrivate *priv; + GSList *group_titles; + const GSList *p; + int i; + + corba_shortcuts = E_CORBA_SHORTCUTS (bonobo_object_from_servant (servant)); + priv = corba_shortcuts->priv; + + list = GNOME_Evolution_Shortcuts_GroupList__alloc (); + list->_length = e_shortcuts_get_num_groups (priv->shortcuts); + list->_maximum = list->_length; + list->_buffer = CORBA_sequence_GNOME_Evolution_Shortcuts_Group_allocbuf (list->_maximum); + + CORBA_sequence_set_release (list, TRUE); + + group_titles = e_shortcuts_get_group_titles (priv->shortcuts); + for (p = group_titles, i = 0; p != NULL; p = p->next, i ++) { + char *group_title; + const GSList *shortcuts; + + group_title = (char *) p->data; + + shortcuts = e_shortcuts_get_shortcuts_in_group (priv->shortcuts, i); + + list->_buffer[i].name = CORBA_string_dup (group_title); + shortcut_list_to_corba (shortcuts, &list->_buffer[i].shortcuts); + + g_free (group_title); + } + + g_slist_free (group_titles); + + return list; +} + + +static void +class_init (GtkObjectClass *object_class) +{ + ECorbaShortcutsClass *corba_shortcuts_class; + POA_GNOME_Evolution_Shortcuts__epv *epv; + + parent_class = gtk_type_class (PARENT_TYPE); + + object_class->destroy = impl_destroy; + + corba_shortcuts_class = E_CORBA_SHORTCUTS_CLASS (object_class); + + epv = & corba_shortcuts_class->epv; + epv->add = impl_add; + epv->remove = impl_remove; + epv->get = impl_get; + epv->addGroup = impl_addGroup; + epv->removeGroup = impl_removeGroup; + epv->getGroup = impl_getGroup; + epv->_get_groups = impl__get_groups; +} + +static void +init (ECorbaShortcuts *corba_shortcuts) +{ + ECorbaShortcutsPrivate *priv; + + priv = g_new (ECorbaShortcutsPrivate, 1); + priv->shortcuts = NULL; + + corba_shortcuts->priv = priv; +} + + +ECorbaShortcuts * +e_corba_shortcuts_new (EShortcuts *shortcuts) +{ + ECorbaShortcuts *corba_shortcuts; + + g_return_val_if_fail (shortcuts != NULL, NULL); + g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), NULL); + + corba_shortcuts = gtk_type_new (e_corba_shortcuts_get_type ()); + + gtk_object_ref (GTK_OBJECT (shortcuts)); + corba_shortcuts->priv->shortcuts = shortcuts; + + return corba_shortcuts; +} + + +E_MAKE_X_TYPE (e_corba_shortcuts, "ECorbaShortcuts", ECorbaShortcuts, + class_init, init, PARENT_TYPE, + POA_GNOME_Evolution_Shortcuts__init, + GTK_STRUCT_OFFSET (ECorbaShortcutsClass, epv)) -- cgit v1.2.3