aboutsummaryrefslogtreecommitdiff
path: root/src/libcustomindicator
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2009-11-24 16:40:47 -0600
committerTed Gould <ted@gould.cx>2009-11-24 16:40:47 -0600
commitacbab334ce6b9cef6d80c94d29aac7fb35534b4d (patch)
treecd5cbf08a4b4a6acd7c4d6b31d91f36ce805e996 /src/libcustomindicator
parent4b23fc39d2fed996dd651d101dc1fb0a5b76d8f0 (diff)
parentf23c54ff5fee5587c31ecb8bf176b58fa3d4be1d (diff)
downloadayatana-indicator-application-acbab334ce6b9cef6d80c94d29aac7fb35534b4d.tar.gz
ayatana-indicator-application-acbab334ce6b9cef6d80c94d29aac7fb35534b4d.tar.bz2
ayatana-indicator-application-acbab334ce6b9cef6d80c94d29aac7fb35534b4d.zip
Merging in changes on trunk. Resolving a conflict.
Diffstat (limited to 'src/libcustomindicator')
-rw-r--r--src/libcustomindicator/custom-indicator.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/libcustomindicator/custom-indicator.c b/src/libcustomindicator/custom-indicator.c
index b2d1384..6ade629 100644
--- a/src/libcustomindicator/custom-indicator.c
+++ b/src/libcustomindicator/custom-indicator.c
@@ -261,7 +261,6 @@ static void
custom_indicator_init (CustomIndicator *self)
{
CustomIndicatorPrivate * priv = CUSTOM_INDICATOR_GET_PRIVATE(self);
- g_return_if_fail(priv != NULL);
priv->id = NULL;
priv->category = CUSTOM_INDICATOR_CATEGORY_OTHER;
@@ -311,7 +310,6 @@ custom_indicator_dispose (GObject *object)
g_return_if_fail(self != NULL);
CustomIndicatorPrivate * priv = CUSTOM_INDICATOR_GET_PRIVATE(self);
- g_return_if_fail(priv != NULL);
if (priv->status != CUSTOM_INDICATOR_STATUS_PASSIVE) {
custom_indicator_set_status(self, CUSTOM_INDICATOR_STATUS_PASSIVE);
@@ -342,7 +340,6 @@ custom_indicator_finalize (GObject *object)
g_return_if_fail(self != NULL);
CustomIndicatorPrivate * priv = CUSTOM_INDICATOR_GET_PRIVATE(self);
- g_return_if_fail(priv != NULL);
if (priv->status != CUSTOM_INDICATOR_STATUS_PASSIVE) {
g_warning("Finalizing Custom Status with the status set to: %d", priv->status);
@@ -377,7 +374,6 @@ custom_indicator_set_property (GObject * object, guint prop_id, const GValue * v
g_return_if_fail(self != NULL);
CustomIndicatorPrivate * priv = CUSTOM_INDICATOR_GET_PRIVATE(self);
- g_return_if_fail(priv != NULL);
switch (prop_id) {
/* *********************** */
@@ -495,7 +491,6 @@ custom_indicator_get_property (GObject * object, guint prop_id, GValue * value,
g_return_if_fail(self != NULL);
CustomIndicatorPrivate * priv = CUSTOM_INDICATOR_GET_PRIVATE(self);
- g_return_if_fail(priv != NULL);
switch (prop_id) {
/* *********************** */