aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog12
-rw-r--r--shell/apps_evolution_shell.schemas2
-rw-r--r--shell/evolution-shell-component.c20
3 files changed, 21 insertions, 13 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 711a05fff9..0913c48ece 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,15 @@
+2003-04-16 Ettore Perazzoli <ettore@ximian.com>
+
+ * apps_evolution_shell.schemas: Increase the default value for
+ /schemas/apps/evolution/shell/view_defaults/folder_bar/width to
+ 200. [#41002]
+
+ * evolution-shell-component.c (owner_ping_callback): Enable this
+ again.
+ (setup_owner_pinging): Same.
+ (impl_setOwner): Check if the shell is in-process and, if so, call
+ setup_owner_pinging().
+
2003-04-15 Hans Petter Jansson <hpj@ximian.com>
* e-setup.c (e_setup_check_config): Free the temporary string.
diff --git a/shell/apps_evolution_shell.schemas b/shell/apps_evolution_shell.schemas
index 14d6c18021..d8ad7802d7 100644
--- a/shell/apps_evolution_shell.schemas
+++ b/shell/apps_evolution_shell.schemas
@@ -230,7 +230,7 @@
<applyto>/apps/evolution/shell/view_defaults/folder_bar/width</applyto>
<owner>evolution</owner>
<type>int</type>
- <default>100</default>
+ <default>200</default>
<locale name="C">
<short>Default width of the folder bar pane</short>
</locale>
diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c
index 84dd2873a4..f15e656be8 100644
--- a/shell/evolution-shell-component.c
+++ b/shell/evolution-shell-component.c
@@ -204,7 +204,6 @@ fill_corba_sequence_from_null_terminated_string_array (CORBA_sequence_CORBA_stri
/* Owner pinging. */
-#if 0
static gboolean
owner_ping_callback (void *data)
{
@@ -267,8 +266,6 @@ setup_owner_pinging (EvolutionShellComponent *shell_component)
priv->ping_timeout_id = g_timeout_add (PING_DELAY, owner_ping_callback, shell_component);
}
-#endif
-
/* CORBA interface implementation. */
@@ -405,12 +402,10 @@ impl_setOwner (PortableServer_Servant servant,
const CORBA_char *evolution_homedir,
CORBA_Environment *ev)
{
- BonoboObject *bonobo_object;
EvolutionShellComponent *shell_component;
EvolutionShellComponentPrivate *priv;
- bonobo_object = bonobo_object_from_servant (servant);
- shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
+ shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object_from_servant (servant));
priv = shell_component->priv;
if (priv->owner_client != NULL) {
@@ -435,15 +430,16 @@ impl_setOwner (PortableServer_Servant servant,
}
if (ev->_major == CORBA_NO_EXCEPTION) {
+ BonoboObject *local_object;
+
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
+ /* Set up pinging of the shell (to realize if it's gone unexpectedly) when in the
+ non-local case. */
+ local_object = bonobo_object (ORBit_small_get_servant (shell));
+ if (local_object == NULL)
+ setup_owner_pinging (shell_component);
}
}