aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog15
-rw-r--r--debian/control5
-rwxr-xr-xdebian/rules5
-rw-r--r--include/notifications/notifications.h9
-rw-r--r--src/snap.cpp1
-rw-r--r--src/sound.cpp2
6 files changed, 30 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 21e1db3..121bbf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+indicator-datetime (13.10.0+14.10.20140725-0ubuntu1) utopic; urgency=low
+
+ [ Mirco Müller ]
+ * Make use of the x-canonical-non-shaped-icon hint to suppress masking
+ the symbolic icon with an UbuntuShape. (LP: #1346925)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 25 Jul 2014 08:55:41 +0000
+
+indicator-datetime (13.10.0+14.10.20140718-0ubuntu1) utopic; urgency=low
+
+ [ Charles Kerr ]
+ * make the gcc version explicit in debian/control and debian/rules.
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 18 Jul 2014 12:06:28 +0000
+
indicator-datetime (13.10.0+14.10.20140716-0ubuntu1) utopic; urgency=low
[ Charles Kerr ]
diff --git a/debian/control b/debian/control
index dab9096..15b981a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,11 @@ Source: indicator-datetime
Section: misc
Priority: optional
Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
-# language-pack-en-base is for the unit tests s.t. we can test in 12h and 24h locales
+# g++-4.9: since we use c++11 features, explicitly select a g++ version
+# to protect from ABI breaks in libstdc++
+# language-pack-en-base: needed so unit tests can use 12h and 24h locales
Build-Depends: cmake,
+ g++-4.9,
dbus,
dbus-test-runner,
python3-dbusmock,
diff --git a/debian/rules b/debian/rules
index d2889aa..cf940f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,10 @@
#!/usr/bin/make -f
+# Explicitly selecting a G{CC,++}-version here to avoid accidental
+# ABI breaks introduced by toolchain updates.
+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
+
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
%:
diff --git a/include/notifications/notifications.h b/include/notifications/notifications.h
index c2e2d85..260b466 100644
--- a/include/notifications/notifications.h
+++ b/include/notifications/notifications.h
@@ -60,6 +60,7 @@ public:
void add_hint (const std::string& name);
static constexpr char const * HINT_SNAP {"x-canonical-snap-decisions"};
static constexpr char const * HINT_TINT {"x-canonical-private-button-tint"};
+ static constexpr char const * HINT_NONSHAPEDICON {"x-canonical-non-shaped-icon"};
/* Add an action button.
This may fail if the Engine doesn't support actions.
@@ -91,16 +92,14 @@ public:
bool supports_actions() const;
/** Show a notification.
- @return nonzero on success, zero on failure. */
+ @return zero on failure, or a key that can be passed to close() */
int show(const Builder& builder);
/** Close a notification.
- @param key the int returned by show()
- @return true if the notification was closed. */
+ @param key the int returned by show() */
void close(int key);
- /** Close all remaining notifications.
- *@return true if all closed successfully. */
+ /** Close all remaining notifications. */
void close_all();
const std::string& app_name() const;
diff --git a/src/snap.cpp b/src/snap.cpp
index f3e0f20..beefa94 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -88,6 +88,7 @@ public:
b.set_icon_name ("alarm-clock");
b.add_hint (uin::Builder::HINT_SNAP);
b.add_hint (uin::Builder::HINT_TINT);
+ b.add_hint (uin::Builder::HINT_NONSHAPEDICON);
const auto timestr = appointment.begin.format (_("%a, %X"));
auto title = g_strdup_printf (_("Alarm %s"), timestr.c_str());
b.set_title (title);
diff --git a/src/sound.cpp b/src/sound.cpp
index 7658658..d13c854 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -46,7 +46,7 @@ public:
m_loop(loop)
{
// init GST once
- static std::once_flag once;
+ static std::once_flag once;
std::call_once(once, [](){
GError* error = nullptr;
if (!gst_init_check (nullptr, nullptr, &error))