[libpeas] Rename helpers to utils
- From: Garrett Regier <gregier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libpeas] Rename helpers to utils
- Date: Tue, 4 Nov 2014 13:50:43 +0000 (UTC)
commit ec00df775e6225de1087ac156ba950544215285b
Author: Garrett Regier <garrett regier riftio com>
Date: Tue Oct 28 10:46:52 2014 -0700
Rename helpers to utils
docs/reference/Makefile.am | 4 ++--
libpeas/Makefile.am | 8 ++++----
libpeas/peas-engine.c | 7 ++++---
libpeas/peas-extension-set.c | 7 ++++---
libpeas/{peas-helpers.c => peas-utils.c} | 16 ++++++++--------
libpeas/{peas-helpers.h => peas-utils.h} | 18 +++++++++---------
6 files changed, 31 insertions(+), 29 deletions(-)
---
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 63eb00a..4d662b6 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -50,13 +50,13 @@ IGNORE_HFILES= \
peas-engine-priv.h \
peas-gtk-disable-plugins-dialog.h \
peas-gtk-plugin-manager-store.h \
- peas-helpers.h \
peas-i18n.h \
peas-introspection.h \
peas-marshal.h \
peas-plugin-info-priv.h \
peas-plugin-loader.h \
- peas-plugin-loader-c.h
+ peas-plugin-loader-c.h \
+ peas-utils.h
# Images to copy into HTML directory.
HTML_IMAGES = \
diff --git a/libpeas/Makefile.am b/libpeas/Makefile.am
index b9b9780..31213d3 100644
--- a/libpeas/Makefile.am
+++ b/libpeas/Makefile.am
@@ -37,12 +37,12 @@ NOINST_H_FILES = \
peas-debug.h \
peas-dirs.h \
peas-engine-priv.h \
- peas-helpers.h \
peas-i18n.h \
peas-introspection.h \
peas-plugin-info-priv.h \
peas-plugin-loader.h \
- peas-plugin-loader-c.h
+ peas-plugin-loader-c.h \
+ peas-utils.h
C_FILES = \
peas-activatable.c \
@@ -52,13 +52,13 @@ C_FILES = \
peas-extension.c \
peas-extension-base.c \
peas-extension-set.c \
- peas-helpers.c \
peas-i18n.c \
peas-introspection.c \
peas-object-module.c \
peas-plugin-info.c \
peas-plugin-loader.c \
- peas-plugin-loader-c.c
+ peas-plugin-loader-c.c \
+ peas-utils.c
BUILT_SOURCES = \
peas-marshal.c \
diff --git a/libpeas/peas-engine.c b/libpeas/peas-engine.c
index dd07722..37fc12b 100644
--- a/libpeas/peas-engine.c
+++ b/libpeas/peas-engine.c
@@ -36,7 +36,7 @@
#include "peas-extension.h"
#include "peas-dirs.h"
#include "peas-debug.h"
-#include "peas-helpers.h"
+#include "peas-utils.h"
/**
* SECTION:peas-engine
@@ -1116,8 +1116,9 @@ peas_engine_create_extension_valist (PeasEngine *engine,
g_return_val_if_fail (peas_plugin_info_is_loaded (info), NULL);
g_return_val_if_fail (G_TYPE_IS_INTERFACE (extension_type), FALSE);
- if (!_valist_to_parameter_list (extension_type, first_property,
- var_args, ¶meters, &n_parameters))
+ if (!peas_utils_valist_to_parameter_list (extension_type, first_property,
+ var_args, ¶meters,
+ &n_parameters))
{
/* Already warned */
return NULL;
diff --git a/libpeas/peas-extension-set.c b/libpeas/peas-extension-set.c
index 6cd7b2c..938d411 100644
--- a/libpeas/peas-extension-set.c
+++ b/libpeas/peas-extension-set.c
@@ -28,7 +28,7 @@
#include "peas-extension-set.h"
#include "peas-plugin-info.h"
#include "peas-marshal.h"
-#include "peas-helpers.h"
+#include "peas-utils.h"
#include "peas-introspection.h"
/**
@@ -663,8 +663,9 @@ peas_extension_set_new_valist (PeasEngine *engine,
g_return_val_if_fail (engine == NULL || PEAS_IS_ENGINE (engine), NULL);
g_return_val_if_fail (G_TYPE_IS_INTERFACE (exten_type), NULL);
- if (!_valist_to_parameter_list (exten_type, first_property,
- var_args, ¶meters, &n_parameters))
+ if (!peas_utils_valist_to_parameter_list (exten_type, first_property,
+ var_args, ¶meters,
+ &n_parameters))
{
/* Already warned */
return NULL;
diff --git a/libpeas/peas-helpers.c b/libpeas/peas-utils.c
similarity index 90%
rename from libpeas/peas-helpers.c
rename to libpeas/peas-utils.c
index af30eec..5e738c9 100644
--- a/libpeas/peas-helpers.c
+++ b/libpeas/peas-utils.c
@@ -1,5 +1,5 @@
/*
- * peas-helpers.c
+ * peas-utils.c
* This file is part of libpeas
*
* Copyright (C) 2010 Steve Frécinaux
@@ -27,7 +27,7 @@
#include <gobject/gvaluecollector.h>
-#include "peas-helpers.h"
+#include "peas-utils.h"
static void
add_all_interfaces (GType iface_type,
@@ -72,11 +72,11 @@ find_param_spec_in_interfaces (GPtrArray *type_structs,
}
gboolean
-_valist_to_parameter_list (GType iface_type,
- const gchar *first_property_name,
- va_list args,
- GParameter **params,
- guint *n_params)
+peas_utils_valist_to_parameter_list (GType iface_type,
+ const gchar *first_property,
+ va_list args,
+ GParameter **params,
+ guint *n_params)
{
GPtrArray *type_structs;
const gchar *name;
@@ -93,7 +93,7 @@ _valist_to_parameter_list (GType iface_type,
n_allocated_params = 16;
*params = g_new0 (GParameter, n_allocated_params);
- name = first_property_name;
+ name = first_property;
while (name)
{
gchar *error_msg = NULL;
diff --git a/libpeas/peas-helpers.h b/libpeas/peas-utils.h
similarity index 65%
rename from libpeas/peas-helpers.h
rename to libpeas/peas-utils.h
index c1db7c7..df852b2 100644
--- a/libpeas/peas-helpers.h
+++ b/libpeas/peas-utils.h
@@ -1,5 +1,5 @@
/*
- * peas-helpers.h
+ * peas-utils.h
* This file is part of libpeas
*
* Copyright (C) 2010 Steve Frécinaux
@@ -19,15 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __PEAS_HELPERS_H__
-#define __PEAS_HELPERS_H__
+#ifndef __PEAS_UTILS_H__
+#define __PEAS_UTILS_H__
#include <glib-object.h>
-gboolean _valist_to_parameter_list (GType iface_type,
- const gchar *first_property_name,
- va_list var_args,
- GParameter **params,
- guint *n_params);
+gboolean peas_utils_valist_to_parameter_list (GType iface_type,
+ const gchar *first_property,
+ va_list var_args,
+ GParameter **params,
+ guint *n_params);
-#endif /* __PEAS_HELPERS_H__ */
+#endif /* __PEAS_UTILS_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
