aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-component-registry.c6
-rw-r--r--shell/e-shell-window.c3
3 files changed, 11 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 2f78396310..025bbba526 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-21 Sarfraaz Ahmed <asarfraaz@novell.com>
+
+ * e-component-registry.c (query_components): Dont enter default values
+ for button label and menu label
+ * e-shell-window.c (setup_widgets): Dont add the sidebar button when
+ there is no label.
+
2005-07-22 Sankar P <psankar@novell.com>
* shell.error.xml : Changed the strings to be more interactive
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 218da86015..2545b21f22 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -201,14 +201,10 @@ query_components (EComponentRegistry *registry)
}
label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", language_list);
- if (label == NULL)
- label = g_strdup (_("Unknown"));
-
+
tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", language_list);
menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", language_list);
- if (menu_label == NULL)
- menu_label = g_strdup (_("Unknown"));
menu_accelerator = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_accelerator", language_list);
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index b4047bc79a..cc05844668 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -695,6 +695,9 @@ setup_widgets (EShellWindow *window)
ComponentView *view = component_view_new (info->id, info->alias, button_id);
window->priv->component_views = g_slist_prepend (window->priv->component_views, view);
+
+ if (!info->button_label || !info->menu_label)
+ continue;
e_sidebar_add_button (E_SIDEBAR (priv->sidebar), info->button_label, info->button_tooltips, info->button_icon, button_id);
g_string_printf(xml, "SwitchComponent-%s", info->alias);