diff options
author | Not Zed <NotZed@Ximian.com> | 2004-10-07 16:20:31 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2004-10-07 16:20:31 +0800 |
commit | d3dd1bc0de03714617d713985e5315b789c84678 (patch) | |
tree | 33f3f71e702b99aaef04b530d44886d10f832520 /e-util/e-menu.c | |
parent | eb114d32c827f54d0c752ee022f78fb35d5ee4ef (diff) | |
download | gsoc2013-evolution-d3dd1bc0de03714617d713985e5315b789c84678.tar.gz gsoc2013-evolution-d3dd1bc0de03714617d713985e5315b789c84678.tar.zst gsoc2013-evolution-d3dd1bc0de03714617d713985e5315b789c84678.zip |
show the toplevel notebook if we had to create one, always.
2004-10-07 Not Zed <NotZed@Ximian.com>
* e-config.c (ec_rebuild): show the toplevel notebook if we
had to create one, always.
* e-menu.c (e_menu_add_items): initialise node->menu properly.
* e-plugin.c (ep_load): read/initialise a unique id for all
plugins and track them in a hashtable.
(ep_construct): refactor so we have more control over what
happens. if the hook handling class isn't registered yet, just
note it and keep going.
(e_plugin_hook_new): remove this, its handled internally by above.
svn path=/trunk/; revision=27490
Diffstat (limited to 'e-util/e-menu.c')
-rw-r--r-- | e-util/e-menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/e-util/e-menu.c b/e-util/e-menu.c index 209f0816a0..9ce1a4f3dd 100644 --- a/e-util/e-menu.c +++ b/e-util/e-menu.c @@ -236,7 +236,7 @@ e_menu_add_items(EMenu *emp, GSList *items, GSList *uifiles, GSList *pixmaps, EM struct _menu_node *node; GSList *l; - node = g_malloc(sizeof(*node)); + node = g_malloc0(sizeof(*node)); node->parent = emp; node->items = items; node->uis = uifiles; @@ -489,7 +489,7 @@ e_menu_class_add_factory(EMenuClass *klass, const char *menuid, EMenuFactoryFunc { struct _EMenuFactory *f = g_malloc0(sizeof(*f)); - printf("%p adding factory '%s' to class '%s'\n", klass, menuid, g_type_name(((GObjectClass *)klass)->g_type_class.g_type)); + printf("%p adding factory '%s' to class '%s'\n", klass, menuid?menuid:"<all menus>", g_type_name(((GObjectClass *)klass)->g_type_class.g_type)); f->menuid = g_strdup(menuid); f->factory = func; |