diff options
author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-21 10:52:05 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-21 10:52:05 +0800 |
commit | ab00f5b08adb1d74a0c70d935a32ffd982e86f34 (patch) | |
tree | 45bfaa44682bc3eee5a2ad8a64112b248767af5b /e-util | |
parent | 5a1c48696363e3f3c7ffe11bdffdcad6557f811a (diff) | |
download | gsoc2013-evolution-ab00f5b08adb1d74a0c70d935a32ffd982e86f34.tar gsoc2013-evolution-ab00f5b08adb1d74a0c70d935a32ffd982e86f34.tar.gz gsoc2013-evolution-ab00f5b08adb1d74a0c70d935a32ffd982e86f34.tar.bz2 gsoc2013-evolution-ab00f5b08adb1d74a0c70d935a32ffd982e86f34.tar.lz gsoc2013-evolution-ab00f5b08adb1d74a0c70d935a32ffd982e86f34.tar.xz gsoc2013-evolution-ab00f5b08adb1d74a0c70d935a32ffd982e86f34.tar.zst gsoc2013-evolution-ab00f5b08adb1d74a0c70d935a32ffd982e86f34.zip |
Merge revisions 37075:37107 from trunk.
svn path=/branches/kill-bonobo/; revision=37112
Diffstat (limited to 'e-util')
-rw-r--r-- | e-util/ChangeLog | 4 | ||||
-rw-r--r-- | e-util/e-plugin.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 365589f575..5fc6526a85 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,7 @@ +2009-01-15 Milan Crha <mcrha@redhat.com> + + * e-plugin.c: (epl_construct): Compiler warning fix. + 2009-01-11 Matthew Barnes <mbarnes@redhat.com> * e-error.c (ee_response): diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index 7d778b59e0..d43238be0a 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -1100,7 +1100,7 @@ epl_construct(EPlugin *ep, xmlNodePtr root) tmp = xmlGetProp(root, (const unsigned char *)"load-on-startup"); if (tmp) { - if (strcmp (tmp, "after-ui") == 0) { + if (strcmp ((const char *)tmp, "after-ui") == 0) { missing_symbols = g_list_prepend (missing_symbols, g_object_ref (ep)); } else { if (epl_loadmodule(ep, FALSE) != 0) { |