diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-08 12:26:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-08 12:26:12 +0800 |
| commit | cea054cd54d84479352a43bbabc19c9ce9af5efb (patch) | |
| tree | ba02763209ba0f22989024004f57689071603ec5 /e-util | |
| parent | 91a6b6899e5568ed34f913bedb538dd6c9e35b32 (diff) | |
| download | gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.gz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.bz2 gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.lz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.xz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.zst gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.zip | |
Merge revisions 35747:35930 from trunk.
svn path=/branches/kill-bonobo/; revision=35931
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/ChangeLog | 7 | ||||
| -rw-r--r-- | e-util/e-plugin.c | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index ca1e193c40..785383c11b 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2008-07-31 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #545568 + + * e-plugin.c (ep_load): + Make sure system plugins are enabled on startup. + 2008-07-01 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #540282 diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index b22c59b5f9..85c1edb060 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -470,9 +470,10 @@ ep_load(const char *filename, int load_level) /* README: May be we can use load_levels to achieve the same thing. But it may be confusing for a plugin writer */ is_system_plugin = e_plugin_xml_prop (root, "system_plugin"); - if (is_system_plugin && !strcmp (is_system_plugin, "true")) + if (is_system_plugin && !strcmp (is_system_plugin, "true")) { + e_plugin_enable (ep, TRUE); ep->flags |= E_PLUGIN_FLAGS_SYSTEM_PLUGIN; - else + } else ep->flags &= ~E_PLUGIN_FLAGS_SYSTEM_PLUGIN; g_free (is_system_plugin); |