[libchamplain] Rename license-text property to extra-text
- From: Jiří Techet <jiritechet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libchamplain] Rename license-text property to extra-text
- Date: Wed, 9 Feb 2011 08:38:59 +0000 (UTC)
commit 7ab516aa66f603d7f889f57b1c095421cca87383
Author: JiÅ?Ã Techet <techet gmail com>
Date: Tue Feb 1 23:26:55 2011 +0100
Rename license-text property to extra-text
champlain/champlain-license.c | 32 ++++++++++++++++----------------
champlain/champlain-license.h | 7 +++----
demos/launcher-gtk.c | 2 +-
3 files changed, 20 insertions(+), 21 deletions(-)
---
diff --git a/champlain/champlain-license.c b/champlain/champlain-license.c
index 0d33826..b3320c2 100644
--- a/champlain/champlain-license.c
+++ b/champlain/champlain-license.c
@@ -50,7 +50,7 @@ enum
struct _ChamplainLicensePrivate
{
- gchar *license_text; /* Extra license text */
+ gchar *extra_text; /* Extra license text */
ClutterActor *license_actor;
ChamplainView *view;
@@ -75,7 +75,7 @@ champlain_license_get_property (GObject *object,
switch (prop_id)
{
case PROP_LICENSE_EXTRA:
- g_value_set_string (value, priv->license_text);
+ g_value_set_string (value, priv->extra_text);
break;
default:
@@ -95,7 +95,7 @@ champlain_license_set_property (GObject *object,
switch (prop_id)
{
case PROP_LICENSE_EXTRA:
- champlain_license_set_text (license, g_value_get_string (value));
+ champlain_license_set_extra_text (license, g_value_get_string (value));
break;
default:
@@ -118,7 +118,7 @@ champlain_license_finalize (GObject *object)
{
ChamplainLicensePrivate *priv = CHAMPLAIN_LICENSE (object)->priv;
- g_free (priv->license_text);
+ g_free (priv->extra_text);
G_OBJECT_CLASS (champlain_license_parent_class)->finalize (object);
}
@@ -146,7 +146,7 @@ champlain_license_class_init (ChamplainLicenseClass *license_class)
*/
g_object_class_install_property (object_class,
PROP_LICENSE_EXTRA,
- g_param_spec_string ("license-text",
+ g_param_spec_string ("extra-text",
"Additional license",
"Additional license text",
"",
@@ -164,9 +164,9 @@ redraw_license (ChamplainLicense *license)
if (!priv->view)
return;
- if (priv->license_text)
+ if (priv->extra_text)
text = g_strjoin ("\n",
- priv->license_text,
+ priv->extra_text,
champlain_view_get_license_text (priv->view),
NULL);
else
@@ -207,7 +207,7 @@ champlain_license_init (ChamplainLicense *license)
ChamplainLicensePrivate *priv = GET_PRIVATE (license);
license->priv = priv;
- priv->license_text = NULL;
+ priv->extra_text = NULL;
priv->view = NULL;
priv->license_actor = NULL;
@@ -245,7 +245,7 @@ champlain_license_connect_view (ChamplainLicense *license,
}
/**
- * champlain_view_set_license_text:
+ * champlain_view_set_extra_text:
* @view: a #ChamplainView
* @text: a license
*
@@ -255,22 +255,22 @@ champlain_license_connect_view (ChamplainLicense *license,
* Since: 0.4.3
*/
void
-champlain_license_set_text (ChamplainLicense *license,
+champlain_license_set_extra_text (ChamplainLicense *license,
const gchar *text)
{
g_return_if_fail (CHAMPLAIN_IS_LICENSE (license));
ChamplainLicensePrivate *priv = license->priv;
- if (priv->license_text)
- g_free (priv->license_text);
+ if (priv->extra_text)
+ g_free (priv->extra_text);
- priv->license_text = g_strdup (text);
+ priv->extra_text = g_strdup (text);
redraw_license (license);
}
/**
- * champlain_view_get_license_text:
+ * champlain_view_get_extra_text:
* @view: The view
*
* Gets the additional license text.
@@ -280,11 +280,11 @@ champlain_license_set_text (ChamplainLicense *license,
* Since: 0.4.3
*/
const gchar *
-champlain_license_get_text (ChamplainLicense *license)
+champlain_license_get_extra_text (ChamplainLicense *license)
{
g_return_val_if_fail (CHAMPLAIN_IS_LICENSE (license), FALSE);
- return license->priv->license_text;
+ return license->priv->extra_text;
}
diff --git a/champlain/champlain-license.h b/champlain/champlain-license.h
index dd355c3..38144e9 100644
--- a/champlain/champlain-license.h
+++ b/champlain/champlain-license.h
@@ -69,13 +69,12 @@ GType champlain_license_get_type (void);
ClutterActor *champlain_license_new (void);
-void champlain_license_set_text (ChamplainLicense *license,
+void champlain_license_set_extra_text (ChamplainLicense *license,
const gchar *text);
-const gchar *champlain_license_get_text (ChamplainLicense *license);
+const gchar *champlain_license_get_extra_text (ChamplainLicense *license);
-void
-champlain_license_connect_view (ChamplainLicense *license,
+void champlain_license_connect_view (ChamplainLicense *license,
ChamplainView *view);
G_END_DECLS
diff --git a/demos/launcher-gtk.c b/demos/launcher-gtk.c
index 32250a9..c70cc4a 100644
--- a/demos/launcher-gtk.c
+++ b/demos/launcher-gtk.c
@@ -267,7 +267,7 @@ main (int argc,
CLUTTER_BIN_ALIGNMENT_END);
license_actor = champlain_view_get_license_actor (view);
- champlain_license_set_text (license_actor, "Don't eat cereals with orange juice\nIt tastes bad");
+ champlain_license_set_extra_text (license_actor, "Don't eat cereals with orange juice\nIt tastes bad");
champlain_view_center_on (CHAMPLAIN_VIEW (view), 45.466, -73.75);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]