aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-08-29 05:16:10 +0800
committerDan Winship <danw@src.gnome.org>2002-08-29 05:16:10 +0800
commit9ce6d5fc54463b79975990a61f0af8c9214cdd2d (patch)
tree5f3c6c56075c4393c0f97f5a74b0a5230e0ce7a1 /shell
parent0123f39f495f8bbb4a9ba95ce1be42ea1beee55d (diff)
downloadgsoc2013-evolution-9ce6d5fc54463b79975990a61f0af8c9214cdd2d.tar.gz
gsoc2013-evolution-9ce6d5fc54463b79975990a61f0af8c9214cdd2d.tar.zst
gsoc2013-evolution-9ce6d5fc54463b79975990a61f0af8c9214cdd2d.zip
Pass a selection_order to oaf_query so we get the components back in a
* e-shell.c (setup_components): Pass a selection_order to oaf_query so we get the components back in a consistent order. Hack fix for #28490 for 1.2 by ensuring that Connector gets started before evolution-mail. (get_icon_path_for_component_info): Rename the oaf icon name property to use underscores to match the launch order property (which needs to use underscores because dashes are interpreted as subtraction in the selection_order context). svn path=/trunk/; revision=17904
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog11
-rw-r--r--shell/e-shell.c5
2 files changed, 14 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index f483196b28..e5569ec848 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,14 @@
+2002-08-28 Dan Winship <danw@ximian.com>
+
+ * e-shell.c (setup_components): Pass a selection_order to
+ oaf_query so we get the components back in a consistent order.
+ Hack fix for #28490 for 1.2 by ensuring that Connector gets
+ started before evolution-mail.
+ (get_icon_path_for_component_info): Rename the oaf icon name
+ property to use underscores to match the launch order property
+ (which needs to use underscores because dashes are interpreted as
+ subtraction in the selection_order context).
+
2002-08-27 Ettore Perazzoli <ettore@ximian.com>
* e-shortcuts-view.c (get_shortcut_info): Make sure
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 327241b1bc..09eb7f91cf 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -757,7 +757,7 @@ get_icon_path_for_component_info (const OAF_ServerInfo *info)
/* FIXME: liboaf is not const-safe. */
property = oaf_server_info_prop_find ((OAF_ServerInfo *) info,
- "evolution:shell-component-icon");
+ "evolution:shell_component_icon");
if (property == NULL || property->v._d != OAF_P_STRING)
return gnome_pixmap_file ("gnome-question.png");
@@ -776,6 +776,7 @@ setup_components (EShell *shell,
ESplash *splash)
{
EShellPrivate *priv;
+ char *const selection_order[] = { "0-evolution:shell_component_launch_order", NULL };
OAF_ServerInfoList *info_list;
CORBA_Environment ev;
int i;
@@ -785,7 +786,7 @@ setup_components (EShell *shell,
priv = shell->priv;
priv->component_registry = e_component_registry_new (shell);
- info_list = oaf_query ("repo_ids.has ('IDL:GNOME/Evolution/ShellComponent:1.0')", NULL, &ev);
+ info_list = oaf_query ("repo_ids.has ('IDL:GNOME/Evolution/ShellComponent:1.0')", selection_order, &ev);
if (ev._major != CORBA_NO_EXCEPTION)
g_error ("Eeek! Cannot perform OAF query for Evolution components.");