diff options
| author | Ian McKellar <yakk@src.gnome.org> | 2001-03-07 21:48:41 +0000 |
|---|---|---|
| committer | Ian McKellar <yakk@src.gnome.org> | 2001-03-07 21:48:41 +0000 |
| commit | 041e7dc6340f229be43c393f4d1689a9436445c1 (patch) | |
| tree | f0005b43f4e667c04f906d959bce439b9f815460 | |
| parent | 475bc10eaf9ed372d97ac33a732c549d6bbe9e5b (diff) | |
| download | nautilus-041e7dc6340f229be43c393f4d1689a9436445c1.tar.gz | |
reviewed by: Maciej Stachowiak <mjs@eazel.com>
* components/services/install-view/nautilus-service-install-view.c:
(nautilus_install_service_add_menu_launchers):
Fix bug 7429 - don't try to print the menu path if one does not
exist.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | components/services/install-view/nautilus-service-install-view.c | 12 |
2 files changed, 20 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2001-03-06 Ian McKellar <ian@eazel.com> + + reviewed by: Maciej Stachowiak <mjs@eazel.com> + + * components/services/install-view/nautilus-service-install-view.c: + (nautilus_install_service_add_menu_launchers): + Fix bug 7429 - don't try to print the menu path if one does not + exist. + Wed Mar 07 00:35:04 2001 George Lebl <jirka@5z.com> Ramiro Estrugo <ramiro@eazel.com> said without this patch diff --git a/components/services/install-view/nautilus-service-install-view.c b/components/services/install-view/nautilus-service-install-view.c index dfe9fdfc1..cc3c37c5d 100644 --- a/components/services/install-view/nautilus-service-install-view.c +++ b/components/services/install-view/nautilus-service-install-view.c @@ -671,6 +671,17 @@ nautilus_install_service_add_menu_launchers (NautilusServiceInstallView *view, G fname = (char*)(iterator->data); have_icon = FALSE; dentry = gnome_desktop_entry_load (fname); + menu_description = describe_dentry (dentry, fname); + + if (menu_description == NULL) { + /* Hmmm - we can't find where in the menu this lives. + * This probably means its something like an applet. + * We can't show much useable info here. + * Lets just skip this entry. + */ + gnome_desktop_entry_free (dentry); + continue; + } hseparator = gtk_hseparator_new (); gtk_widget_show (hseparator); @@ -693,7 +704,6 @@ nautilus_install_service_add_menu_launchers (NautilusServiceInstallView *view, G } /* set up the text */ - menu_description = describe_dentry (dentry, fname); if (iconwell != NULL) { label_text = g_strdup_printf (_("%sTo start %s, click " "the Launch button below, or to create " |