aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/alarm-queue-simple.cpp2
-rw-r--r--src/awake.cpp6
-rw-r--r--src/clock-live.cpp2
-rw-r--r--src/com.ubuntu.touch.AccountsService.Sound.xml4
-rw-r--r--src/engine-eds.cpp4
-rw-r--r--src/formatter-desktop.cpp2
-rw-r--r--src/haptic.cpp2
-rw-r--r--src/menu.cpp6
-rw-r--r--src/notifications.cpp6
-rw-r--r--src/planner.cpp2
-rw-r--r--src/sound.cpp4
-rw-r--r--src/timezone-geoclue.cpp2
-rw-r--r--src/utils.c6
13 files changed, 24 insertions, 24 deletions
diff --git a/src/alarm-queue-simple.cpp b/src/alarm-queue-simple.cpp
index 652d744..b535603 100644
--- a/src/alarm-queue-simple.cpp
+++ b/src/alarm-queue-simple.cpp
@@ -95,7 +95,7 @@ private:
// idle until the next alarm
if ((alarm = find_next_alarm(appointments)))
{
- g_debug ("setting timer to wake up for next appointment '%s' at %s",
+ g_debug ("setting timer to wake up for next appointment '%s' at %s",
alarm->text.c_str(),
alarm->time.format("%F %T").c_str());
diff --git a/src/awake.cpp b/src/awake.cpp
index 5f7e2e0..da69c44 100644
--- a/src/awake.cpp
+++ b/src/awake.cpp
@@ -59,7 +59,7 @@ public:
unforce_awake ();
remove_display_on_request ();
g_object_unref (m_system_bus);
- }
+ }
}
private:
@@ -147,7 +147,7 @@ private:
g_clear_pointer (&self->m_awake_cookie, g_free);
g_variant_get (args, "(s)", &self->m_awake_cookie);
g_debug ("m_awake_cookie is now '%s'", self->m_awake_cookie);
-
+
g_variant_unref (args);
}
}
@@ -184,7 +184,7 @@ private:
self->m_display_on_timer = g_timeout_add_seconds (self->m_display_on_seconds,
on_display_on_timer,
gself);
-
+
g_variant_unref (args);
}
}
diff --git a/src/clock-live.cpp b/src/clock-live.cpp
index 0ff60a8..0e6ddc3 100644
--- a/src/clock-live.cpp
+++ b/src/clock-live.cpp
@@ -150,7 +150,7 @@ private:
// reset the timer in case someone changed the system clock
self->reset_timer();
}
-
+
self->refresh();
return G_SOURCE_CONTINUE;
}
diff --git a/src/com.ubuntu.touch.AccountsService.Sound.xml b/src/com.ubuntu.touch.AccountsService.Sound.xml
index 6e2ca5f..781a52f 100644
--- a/src/com.ubuntu.touch.AccountsService.Sound.xml
+++ b/src/com.ubuntu.touch.AccountsService.Sound.xml
@@ -9,12 +9,12 @@
</property>
<property name="IncomingCallSound" type="s" access="readwrite">
- <annotation name="org.freedesktop.Accounts.DefaultValue.String"
+ <annotation name="org.freedesktop.Accounts.DefaultValue.String"
value="/usr/share/sounds/ubuntu/ringtones/Ubuntu.ogg"/>
</property>
<property name="IncomingMessageSound" type="s" access="readwrite">
- <annotation name="org.freedesktop.Accounts.DefaultValue.String"
+ <annotation name="org.freedesktop.Accounts.DefaultValue.String"
value="/usr/share/sounds/ubuntu/notifications/Xylo.ogg"/>
</property>
diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp
index 0c833c6..30aad1a 100644
--- a/src/engine-eds.cpp
+++ b/src/engine-eds.cpp
@@ -110,7 +110,7 @@ public:
auto gtz = default_timezone != nullptr
? g_time_zone_new(icaltimezone_get_location(default_timezone))
- : g_time_zone_new_local();
+ : g_time_zone_new_local();
auto main_task = std::make_shared<Task>(this, func, default_timezone, gtz, begin, end);
for (auto& kv : m_clients)
@@ -1026,7 +1026,7 @@ private:
/***
****
***/
-
+
core::Signal<> m_changed;
std::set<ESource*> m_sources;
std::map<ESource*,ECalClient*> m_clients;
diff --git a/src/formatter-desktop.cpp b/src/formatter-desktop.cpp
index dd4ff5b..fcf9cdb 100644
--- a/src/formatter-desktop.cpp
+++ b/src/formatter-desktop.cpp
@@ -165,7 +165,7 @@ const gchar* DesktopFormatter::getDateFormat(bool show_day, bool show_date, bool
else if (show_date)
/* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
That will fix bug #1001595 for your locale and make the date/time in the upper-right corner of your screen look beautiful :)
- This format string shows the abbreviated month and day.
+ This format string shows the abbreviated month and day.
en_US example: "%b %e" --> "Mar 27"
en_GB example: "%e %b" --> "27 Mar"
zh_CN example(?): "%m月%d日" --> "03月27日" */
diff --git a/src/haptic.cpp b/src/haptic.cpp
index cc8ea0b..7430c04 100644
--- a/src/haptic.cpp
+++ b/src/haptic.cpp
@@ -121,7 +121,7 @@ private:
a running loop -- we could keep vibrating even after "this" was
destructed */
auto repeat_count = g_variant_new_uint32 (1u);
-
+
g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&builder, pattern_array);
g_variant_builder_add_value (&builder, repeat_count);
diff --git a/src/menu.cpp b/src/menu.cpp
index 9d229c6..c778963 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -160,7 +160,7 @@ protected:
for(const auto& a : m_state->calendar_upcoming->appointments().get())
if (begin <= a.begin)
upcoming.push_back(a);
-
+
if (m_upcoming != upcoming)
{
m_upcoming.swap(upcoming);
@@ -324,7 +324,7 @@ private:
if (appt.is_ubuntu_alarm())
{
- g_menu_item_set_attribute (menu_item, "x-canonical-type", "s", "com.canonical.indicator.alarm");
+ g_menu_item_set_attribute (menu_item, "x-canonical-type", "s", "org.ayatana.indicator.alarm");
g_menu_item_set_attribute_value(menu_item, G_MENU_ATTRIBUTE_ICON, get_serialized_alarm_icon());
}
else
@@ -605,7 +605,7 @@ MenuFactory::buildMenu(Menu::Profile profile)
g_warn_if_reached();
break;
}
-
+
return menu;
}
diff --git a/src/notifications.cpp b/src/notifications.cpp
index 4856546..051653d 100644
--- a/src/notifications.cpp
+++ b/src/notifications.cpp
@@ -58,7 +58,7 @@ Builder::Builder():
Builder::~Builder()
{
}
-
+
void
Builder::set_title (const std::string& title)
{
@@ -163,7 +163,7 @@ public:
g_warning ("Unable to close notification %d: %s", key, error->message);
g_error_free (error);
}
-
+
// call the user callback and remove it from our bookkeeping
remove_closed_notification (key);
}
@@ -220,7 +220,7 @@ public:
m_notifications[key] = { nn, info.m_closed_callback };
g_signal_connect (nn.get(), "closed",
G_CALLBACK(on_notification_closed), this);
-
+
GError * error = nullptr;
if (notify_notification_show(nn.get(), &error))
{
diff --git a/src/planner.cpp b/src/planner.cpp
index 91bfe10..d4ef3f2 100644
--- a/src/planner.cpp
+++ b/src/planner.cpp
@@ -19,7 +19,7 @@
#include <datetime/planner.h>
-#include <algorithm>
+#include <algorithm>
namespace ayatana {
namespace indicator {
diff --git a/src/sound.cpp b/src/sound.cpp
index 51b410a..4bc3ab2 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -92,8 +92,8 @@ private:
const double in = CLAMP(m_volume, in_range_lo, in_range_hi);
const double pct = (in - in_range_lo) / (in_range_hi - in_range_lo);
- constexpr double out_range_lo = 0.0;
- constexpr double out_range_hi = 1.0;
+ constexpr double out_range_lo = 0.0;
+ constexpr double out_range_hi = 1.0;
return out_range_lo + (pct * (out_range_hi - out_range_lo));
}
diff --git a/src/timezone-geoclue.cpp b/src/timezone-geoclue.cpp
index 9f8b4c4..50ebbcd 100644
--- a/src/timezone-geoclue.cpp
+++ b/src/timezone-geoclue.cpp
@@ -173,7 +173,7 @@ private:
self->m_cancellable,
on_address_started,
self);
-
+
g_variant_unref(result);
}
}
diff --git a/src/utils.c b/src/utils.c
index 23c7f7c..69ca7a2 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -95,7 +95,7 @@ split_settings_location(const gchar* location, gchar** zone, gchar** name)
* "America/Chicago Oklahoma City"), this function tries to make a
* more human-readable name by using the user-provided name if the guessed
* timezone matches the last one the user manually clicked on.
- *
+ *
* In the example above, this allows the menuitem for the system-guessed
* timezone ("America/Chicago") to read "Oklahoma City" after the user clicks
* on the "Oklahoma City" menuitem.
@@ -250,10 +250,10 @@ T_(const char *msg)
* _ a time after this week should be shown as the short version of the day,
* date, and time (e.g. “Wed 21 Apr 3:55 PM”)
* _ a full-day event after this week should be shown as the short version of
- * the day and date (e.g. “Wed 21 Apr”).
+ * the day and date (e.g. “Wed 21 Apr”).
* _ in addition, when presenting the times of upcoming events, the time should
* be followed by the timezone if it is different from the one the computer
- * is currently set to. For example, “Wed 3:55 PM UTC−5”.
+ * is currently set to. For example, “Wed 3:55 PM UTC−5”.
*/
char* generate_full_format_string_at_time (GDateTime* now,
GDateTime* then,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 18:35:24 +0000