aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/device-provider.c2
-rw-r--r--src/device.c2
-rw-r--r--src/service.c2
-rw-r--r--tests/test-dbus-listener.cc22
-rw-r--r--tests/test-device.cc22
-rw-r--r--tests/test-service.cc6
6 files changed, 28 insertions, 28 deletions
diff --git a/src/device-provider.c b/src/device-provider.c
index 5ccf588..81a8eec 100644
--- a/src/device-provider.c
+++ b/src/device-provider.c
@@ -54,7 +54,7 @@ indicator_power_device_provider_default_init (IndicatorPowerDeviceProviderInterf
* An easy way to free the list properly in one step is as follows:
*
* g_slist_free_full (list, (GDestroyNotify)g_object_unref);
- *
+ *
* Return value: (element-type IndicatorPowerDevice)
* (transfer full):
* list of devices
diff --git a/src/device.c b/src/device.c
index 69336eb..4777675 100644
--- a/src/device.c
+++ b/src/device.c
@@ -484,7 +484,7 @@ get_timestring (guint64 time_secs,
if (minutes == 0)
{
- *accessible_timestring = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE,
+ *accessible_timestring = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE,
"%i hour",
"%i hours",
hours), hours);
diff --git a/src/service.c b/src/service.c
index 8269448..9484e65 100644
--- a/src/service.c
+++ b/src/service.c
@@ -937,7 +937,7 @@ my_get_property (GObject * o,
{
IndicatorPowerService * self = INDICATOR_POWER_SERVICE (o);
priv_t * p = self->priv;
-
+
switch (property_id)
{
case PROP_DEVICE_PROVIDER:
diff --git a/tests/test-dbus-listener.cc b/tests/test-dbus-listener.cc
index 7764498..4d44e97 100644
--- a/tests/test-dbus-listener.cc
+++ b/tests/test-dbus-listener.cc
@@ -4,16 +4,16 @@ Copyright 2012 Canonical Ltd.
Authors:
Charles Kerr <charles.kerr@canonical.com>
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 3, as published
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3, as published
by the Free Software Foundation.
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranties of
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -40,7 +40,7 @@ class DbusListenerTest : public ::testing::Test
int gsd_name_ownership_id;
int gsd_power_registration_id;
char * gsd_power_error_string;
-
+
protected:
static void
@@ -234,7 +234,7 @@ TEST_F(DbusListenerTest, GSDHasPowerAndBattery)
// cleanup
g_object_run_dispose (o); // used to get coverage of both branches in the object's dispose func's g_clear_*() calls
- g_object_unref (o);
+ g_object_unref (o);
}
TEST_F(DbusListenerTest, GSDHasNoDevices)
@@ -261,7 +261,7 @@ TEST_F(DbusListenerTest, GSDHasNoDevices)
// cleanup
g_object_run_dispose (o); // used to get coverage of both branches in the object's dispose func's g_clear_*() calls
- g_object_unref (o);
+ g_object_unref (o);
}
TEST_F(DbusListenerTest, GSDReturnsError)
@@ -285,7 +285,7 @@ TEST_F(DbusListenerTest, GSDReturnsError)
// cleanup
g_object_run_dispose (o); // used to get coverage of both branches in the object's dispose func's g_clear_*() calls
- g_object_unref (o);
+ g_object_unref (o);
}
/* This test emits a PropertiesChanged signal and confirms that
@@ -347,5 +347,5 @@ TEST_F(DbusListenerTest, GSDPropChanged)
ASSERT_EQ (g_slist_length(devices), 2);
// cleanup
- g_object_unref (o);
+ g_object_unref (o);
}
diff --git a/tests/test-device.cc b/tests/test-device.cc
index e9a439d..130ef16 100644
--- a/tests/test-device.cc
+++ b/tests/test-device.cc
@@ -4,16 +4,16 @@ Copyright 2012 Canonical Ltd.
Authors:
Charles Kerr <charles.kerr@canonical.com>
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 3, as published
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3, as published
by the Free Software Foundation.
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranties of
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -291,7 +291,7 @@ TEST_F(DeviceTest, IconNames)
g_object_set (o, INDICATOR_POWER_DEVICE_KIND, kind,
INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_EMPTY,
NULL);
-
+
g_string_append_printf (expected, "%s-empty-symbolic;", kind_str);
g_string_append_printf (expected, "gpm-%s-empty;", kind_str);
g_string_append_printf (expected, "gpm-%s-000;", kind_str);
@@ -459,7 +459,7 @@ TEST_F(DeviceTest, IconNames)
// state unknown
g_object_set (o, INDICATOR_POWER_DEVICE_KIND, kind,
- INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_UNKNOWN,
+ INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_UNKNOWN,
NULL);
g_string_append_printf (expected, "%s-missing-symbolic;", kind_str);
g_string_append_printf (expected, "gpm-%s-missing;", kind_str);
@@ -495,7 +495,7 @@ TEST_F(DeviceTest, Labels)
/**
***
**/
-
+
IndicatorPowerDevice * device = INDICATOR_POWER_DEVICE (g_object_new (INDICATOR_POWER_DEVICE_TYPE, NULL));
o = G_OBJECT(device);
@@ -531,7 +531,7 @@ TEST_F(DeviceTest, Labels)
INDICATOR_POWER_DEVICE_TIME, guint64(60*60*13),
NULL);
check_label (device, "Battery");
- check_header (device, "(50%)",
+ check_header (device, "(50%)",
"",
"(50%)",
"Battery (50%)");
@@ -651,7 +651,7 @@ TEST_F(DeviceTest, ChoosePrimary)
ASSERT_EQ (a, indicator_power_service_choose_primary_device(device_list));
}
}
-
+
// cleanup
g_list_free_full (device_list, g_object_unref);
}
diff --git a/tests/test-service.cc b/tests/test-service.cc
index cae3021..b2d4dc4 100644
--- a/tests/test-service.cc
+++ b/tests/test-service.cc
@@ -65,7 +65,7 @@ class IndicatorTest : public ::testing::Test
virtual void SetUp()
{
ensure_glib_initialized ();
-
+
g_setenv( "GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE);
ac_device = indicator_power_device_new (
@@ -90,7 +90,7 @@ class IndicatorTest : public ::testing::Test
const char* GetAccessibleDesc (IndicatorPower * power) const
{
GList * entries = indicator_object_get_entries (INDICATOR_OBJECT(power));
- g_assert (g_list_length(entries) == 1);
+ g_assert (g_list_length(entries) == 1);
IndicatorObjectEntry * entry = static_cast<IndicatorObjectEntry*>(entries->data);
const char * ret = entry->accessible_desc;
g_list_free (entries);
@@ -120,7 +120,7 @@ TEST_F(IndicatorTest, SetDevices)
devices = g_slist_append (devices, ac_device);
devices = g_slist_append (devices, battery_device);
indicator_power_set_devices (power, devices);
- g_slist_free (devices);
+ g_slist_free (devices);
g_object_unref (power);
}