[totem] Update to compile against latest libpeas
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] Update to compile against latest libpeas
- Date: Mon, 4 Oct 2010 22:54:49 +0000 (UTC)
commit 7f38d5eddf5cfb2e5083c0e6bd6054f5e8368a1f
Author: Bastien Nocera <hadess hadess net>
Date: Mon Oct 4 16:15:54 2010 +0100
Update to compile against latest libpeas
configure.in | 2 +-
src/plugins/totem-plugins-engine.c | 17 +++++------------
2 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/configure.in b/configure.in
index 7776580..170dafa 100644
--- a/configure.in
+++ b/configure.in
@@ -49,7 +49,7 @@ TOTEM_PLPARSER_REQS=2.29.1
GNOMEICON_REQS=2.15.90
DBUS_REQS=0.61
VALA_REQS=0.7.5
-PEAS_REQS=0.5.5
+PEAS_REQS=0.7.0
AC_SUBST(GLIB_REQS)
AC_SUBST(GTK_REQS)
diff --git a/src/plugins/totem-plugins-engine.c b/src/plugins/totem-plugins-engine.c
index 04f58e2..bdb92ad 100644
--- a/src/plugins/totem-plugins-engine.c
+++ b/src/plugins/totem-plugins-engine.c
@@ -100,7 +100,6 @@ totem_plugins_engine_get_default (TotemObject *totem)
{
static TotemPluginsEngine *engine = NULL;
char **paths;
- GPtrArray *array;
guint i;
if (G_LIKELY (engine != NULL))
@@ -114,20 +113,14 @@ totem_plugins_engine_get_default (TotemObject *totem)
paths = totem_get_plugin_paths ();
- /* Totem uses the libdir even for noarch data */
- array = g_ptr_array_new ();
- for (i = 0; paths[i] != NULL; i++) {
- g_ptr_array_add (array, paths[i]);
- g_ptr_array_add (array, paths[i]);
- }
- g_ptr_array_add (array, NULL);
-
engine = TOTEM_PLUGINS_ENGINE (g_object_new (TOTEM_TYPE_PLUGINS_ENGINE,
- "app-name", "Totem",
- "search-paths", array->pdata,
NULL));
+ for (i = 0; paths[i] != NULL; i++) {
+ /* Totem uses the libdir even for noarch data */
+ peas_engine_add_search_path (PEAS_ENGINE (engine),
+ paths[i], paths[i]);
+ }
g_strfreev (paths);
- g_ptr_array_free (array, TRUE);
g_object_add_weak_pointer (G_OBJECT (engine),
(gpointer) &engine);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]