diff options
| -rw-r--r-- | shell/ChangeLog | 10 | ||||
| -rw-r--r-- | shell/e-shell-user-creatable-items-handler.c | 2 | ||||
| -rw-r--r-- | shell/evolution-shell-component.c | 11 |
3 files changed, 22 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index d217493014..3b3defa968 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,13 @@ +2003-01-27 Ettore Perazzoli <ettore@ximian.com> + + * evolution-shell-component.c (owner_ping_callback): #if 0'ed out + for now, since it seems to cause trouble for local components. + (setup_owner_pinging): Likewise. + + * e-shell-user-creatable-items-handler.c + (get_default_action_for_view): Return default_menu_item [instead + of NULL] if there is no view displayed. [#32736] + 2003-01-23 Ettore Perazzoli <ettore@ximian.com> * e-shell-folder-title-bar.c (get_max_clipped_label_width): Use diff --git a/shell/e-shell-user-creatable-items-handler.c b/shell/e-shell-user-creatable-items-handler.c index c2cc6b8877..ebd5be0911 100644 --- a/shell/e-shell-user-creatable-items-handler.c +++ b/shell/e-shell-user-creatable-items-handler.c @@ -270,7 +270,7 @@ get_default_action_for_view (EShellUserCreatableItemsHandler *handler, view_component_id = e_shell_view_get_current_component_id (shell_view); if (view_component_id == NULL) - return NULL; + return priv->default_menu_item; for (p = priv->menu_items; p != NULL; p = p->next) { const MenuItem *item; diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c index e4038b7fe3..1a517b2910 100644 --- a/shell/evolution-shell-component.c +++ b/shell/evolution-shell-component.c @@ -202,6 +202,7 @@ fill_corba_sequence_from_null_terminated_string_array (CORBA_sequence_CORBA_stri /* Owner pinging. */ +#if 0 static gboolean owner_ping_callback (void *data) { @@ -252,15 +253,20 @@ static void setup_owner_pinging (EvolutionShellComponent *shell_component) { EvolutionShellComponentPrivate *priv; + GNOME_Evolution_Shell shell_corba_objref; priv = shell_component->priv; + shell_corba_objref = evolution_shell_client_corba_objref (priv->owner_client); + if (priv->ping_timeout_id != -1) g_source_remove (priv->ping_timeout_id); priv->ping_timeout_id = g_timeout_add (PING_DELAY, owner_ping_callback, shell_component); } +#endif + /* CORBA interface implementation. */ @@ -430,7 +436,12 @@ impl_setOwner (PortableServer_Servant servant, priv->owner_client = evolution_shell_client_new (shell); g_signal_emit (shell_component, signals[OWNER_SET], 0, priv->owner_client, evolution_homedir); +#if 0 + /* Disable this for now, it seems to cause trouble for local + components. We should be checking wether the component is + local, and disable the pinging in that case. */ setup_owner_pinging (shell_component); +#endif } } |