aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-component-registry.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index eef99c1fe6..58d6b7831a 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-23 Chris Toshok <toshok@ximian.com>
+
+ * e-component-registry.c (query_components): handle the case where
+ label == NULL, and set it to _("Unknown").
+
2003-10-22 Ettore Perazzoli <ettore@ximian.com>
* e-sidebar.c (e_sidebar_add_button): Add a little border to the
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index e5e48aadc4..66d23a2f35 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -30,6 +30,7 @@
#include "e-util/e-lang-utils.h"
+#include <libgnome/gnome-i18n.h>
#include <gal/util/e-util.h>
#include <bonobo/bonobo-object.h>
@@ -124,6 +125,10 @@ query_components (EComponentRegistry *registry)
id = info_list->_buffer[i].iid;
label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", language_list);
+ if (label == NULL) {
+ g_print ("no label for %s\n", id);
+ label = g_strdup (_("Unknown"));
+ }
icon_name = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_icon", NULL);
if (icon_name == NULL) {