[libpeas] Fix some missing renames.



commit 8076f6e9910931716e4bb762b625558b7a363edf
Author: Steve Frécinaux <code istique net>
Date:   Wed Jun 16 20:21:47 2010 +0200

    Fix some missing renames.

 libpeas/peas-extension-set.c     |   12 ++++++------
 loaders/c/peas-plugin-loader-c.c |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/libpeas/peas-extension-set.c b/libpeas/peas-extension-set.c
index be76da3..8698877 100644
--- a/libpeas/peas-extension-set.c
+++ b/libpeas/peas-extension-set.c
@@ -53,8 +53,8 @@ struct _PeasExtensionSetPrivate {
   GType exten_type;
   GList *extensions;
 
-  gulong activate_handler_id;
-  gulong deactivate_handler_id;
+  gulong load_handler_id;
+  gulong unload_handler_id;
 };
 
 typedef struct {
@@ -150,11 +150,11 @@ peas_extension_set_set_internal_data (PeasExtensionSet *set,
   for (l = plugins; l; l = l->next)
     add_extension (set, (PeasPluginInfo *) l->data);
 
-  set->priv->activate_handler_id =
+  set->priv->load_handler_id =
           g_signal_connect_data (engine, "load-plugin",
                                  G_CALLBACK (add_extension), set,
                                  NULL, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
-  set->priv->deactivate_handler_id =
+  set->priv->unload_handler_id =
           g_signal_connect_data (engine, "unload-plugin",
                                  G_CALLBACK (remove_extension), set,
                                  NULL, G_CONNECT_SWAPPED);
@@ -166,8 +166,8 @@ peas_extension_set_finalize (GObject *object)
   PeasExtensionSet *set = PEAS_EXTENSION_SET (object);
   GList *l;
 
-  g_signal_handler_disconnect (set->priv->engine, set->priv->activate_handler_id);
-  g_signal_handler_disconnect (set->priv->engine, set->priv->deactivate_handler_id);
+  g_signal_handler_disconnect (set->priv->engine, set->priv->load_handler_id);
+  g_signal_handler_disconnect (set->priv->engine, set->priv->unload_handler_id);
 
   for (l = set->priv->extensions; l;)
     {
diff --git a/loaders/c/peas-plugin-loader-c.c b/loaders/c/peas-plugin-loader-c.c
index c8f7bc8..5fc3112 100644
--- a/loaders/c/peas-plugin-loader-c.c
+++ b/loaders/c/peas-plugin-loader-c.c
@@ -170,7 +170,7 @@ peas_plugin_loader_c_finalize (GObject *object)
     {
       PeasPluginInfo *info = (PeasPluginInfo *) item->data;
 
-      if (peas_plugin_info_is_active (info))
+      if (peas_plugin_info_is_loaded (info))
         {
           g_warning ("There are still C plugins loaded during destruction");
           break;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]