From 196db124723a4045a3b3900fce1bb9b87122009b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 21 Nov 2012 10:41:37 +0000 Subject: Releasing 12.10.6daily12.11.21.1-0ubuntu1, based on r331 --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7c0cd3d..bf30589 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -indicator-messages (12.10.6-0ubuntu1) UNRELEASED; urgency=low +indicator-messages (12.10.6daily12.11.21.1-0ubuntu1) raring; urgency=low + [ Mathieu Trudel-Lapierre ] * debian/rules: - Use autogen.sh for dh_autoreconf. - Drop the override for dh_makeshlibs. @@ -12,7 +13,10 @@ indicator-messages (12.10.6-0ubuntu1) UNRELEASED; urgency=low - Clear the detail (count or time) of a source when another type of detail is set. (LP: #1071640) - -- Mathieu Trudel-Lapierre Tue, 13 Nov 2012 13:37:56 -0500 + [ Automatic PS uploader ] + * Automatic snapshot from revision 331 + + -- Automatic PS uploader Wed, 21 Nov 2012 10:41:37 +0000 indicator-messages (12.10.5-0ubuntu2) raring; urgency=low -- cgit v1.2.3 From b8711e8f8c3c45681ffd6ca3c398b91ab3db1537 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 22 Nov 2012 09:42:27 +0100 Subject: libmessaging-menu: fix crash in _draws_attention The format string passed to g_variant_get calls for four parameters, but only three were given. --- libmessaging-menu/messaging-menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmessaging-menu/messaging-menu.c b/libmessaging-menu/messaging-menu.c index 38883f8..04f8d1d 100644 --- a/libmessaging-menu/messaging-menu.c +++ b/libmessaging-menu/messaging-menu.c @@ -715,7 +715,7 @@ messaging_menu_app_set_draws_attention (MessagingMenuApp *app, return; state = g_action_get_state (G_ACTION (action)); - g_variant_get (state, "(ux&sb)", &count, &time, &string); + g_variant_get (state, "(ux&sb)", &count, &time, &string, NULL); new_state = g_variant_new ("(uxsb)", count, time, string, TRUE); g_simple_action_set_state (action, new_state); -- cgit v1.2.3 From 944cc41564da93fa84a5f2b5533c974406b2fd54 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Thu, 22 Nov 2012 10:02:35 +0000 Subject: Releasing 12.10.6daily12.11.22-0ubuntu1, based on r333 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index bf30589..394470c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +indicator-messages (12.10.6daily12.11.22-0ubuntu1) raring; urgency=low + + [ Lars Uebernickel ] + * Crash in g_variant_valist_get_leaf when highlighted (LP: #1081754) + + [ Automatic PS uploader ] + * Automatic snapshot from revision 333 + + -- Automatic PS uploader Thu, 22 Nov 2012 10:02:35 +0000 + indicator-messages (12.10.6daily12.11.21.1-0ubuntu1) raring; urgency=low [ Mathieu Trudel-Lapierre ] -- cgit v1.2.3 From 156418b432ed3d7f07fd0faae67ce5054defe94a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 22 Jan 2013 14:23:57 -0600 Subject: remove g_type_init() calls, bump glib requirement to 2.35.4 --- doc/reference/Makefile.am | 1 - src/messages-service.c | 7 ++----- test/indicator-messages-service-activate.c | 2 -- test/test-gactionmuxer.cpp | 8 -------- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 023f1e7..814a939 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -4,7 +4,6 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml DOC_SOURCE_DIR = $(top_srcdir)/libmessaging-menu -SCANGOBJ_OPTIONS=--type-init-func="g_type_init()" MKDB_OPTIONS=--xml-mode --output-format=xml # Used for dependencies. The docs will be rebuilt if any of these change. diff --git a/src/messages-service.c b/src/messages-service.c index b36a0a2..48c830e 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -619,11 +619,8 @@ got_bus (GObject *object, int main (int argc, char ** argv) { - GMainLoop * mainloop = NULL; - IndicatorService * service = NULL; - - /* Glib init */ - g_type_init(); + GMainLoop * mainloop; + IndicatorService * service; mainloop = g_main_loop_new (NULL, FALSE); diff --git a/test/indicator-messages-service-activate.c b/test/indicator-messages-service-activate.c index 98c6522..b0ec9b7 100644 --- a/test/indicator-messages-service-activate.c +++ b/test/indicator-messages-service-activate.c @@ -28,8 +28,6 @@ with this program. If not, see . int main (int argc, char ** argv) { - g_type_init(); - guint returnval = 0; GError * error = NULL; diff --git a/test/test-gactionmuxer.cpp b/test/test-gactionmuxer.cpp index 6304853..b80f86d 100644 --- a/test/test-gactionmuxer.cpp +++ b/test/test-gactionmuxer.cpp @@ -25,8 +25,6 @@ strv_contains (gchar **str_array, TEST(GActionMuxerTest, Sanity) { GActionMuxer *muxer; - g_type_init (); - g_action_muxer_insert (NULL, NULL, NULL); g_action_muxer_remove (NULL, NULL); @@ -46,8 +44,6 @@ TEST(GActionMuxerTest, Empty) { GActionMuxer *muxer; gchar **actions; - g_type_init (); - muxer = g_action_muxer_new (); actions = g_action_group_list_actions (G_ACTION_GROUP (muxer)); @@ -67,8 +63,6 @@ TEST(GActionMuxerTest, AddAndRemove) { GActionMuxer *muxer; gchar **actions; - g_type_init (); - group1 = g_simple_action_group_new (); g_simple_action_group_add_entries (group1, entries1, @@ -160,8 +154,6 @@ TEST(GActionMuxerTest, ActionAttributes) { GVariant *state_hint[2]; GVariant *state[2]; - g_type_init (); - group = g_simple_action_group_new (); action = g_simple_action_new ("one", G_VARIANT_TYPE_STRING); g_simple_action_group_insert (group, G_ACTION (action)); -- cgit v1.2.3 From 452605811f41f580edae53e80c3a6881b0bd5996 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 22 Jan 2013 14:30:05 -0600 Subject: add glib requirement to debian/control. bump glib requirement in configure.ac --- configure.ac | 2 +- debian/control | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6dad74c..bcd7b20 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,7 @@ AC_PROG_CXX GTK_REQUIRED_VERSION=3.5.18 GIO_UNIX_REQUIRED_VERSION=2.33.10 INDICATOR_REQUIRED_VERSION=0.3.19 -GLIB_REQUIRED_VERSION=2.33.10 +GLIB_REQUIRED_VERSION=2.35.4 INTROSPECTION_REQUIRED_VERSION=1.32.0 PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK_REQUIRED_VERSION diff --git a/debian/control b/debian/control index 546b5c9..31292c5 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Uploaders: Evgeni Golov Build-Depends: debhelper (>= 9), dh-autoreconf, dh-translations, + libglib2.0-dev (>= 2.35.4), libgtk-3-dev (>= 3.5.12), libdbus-glib-1-dev, intltool, -- cgit v1.2.3 From 4292a7c6abf548c759dff1022119440ebd385c11 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Fri, 25 Jan 2013 02:01:12 +0000 Subject: Releasing 12.10.6daily13.01.25-0ubuntu1, based on r335 --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 394470c..aafa43a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +indicator-messages (12.10.6daily13.01.25-0ubuntu1) raring; urgency=low + + [ Charles Kerr ] + * indicators call deprecated glib function g_type_init() (LP: + #1103087) + + [ Automatic PS uploader ] + * Automatic snapshot from revision 335 + + -- Automatic PS uploader Fri, 25 Jan 2013 02:01:11 +0000 + indicator-messages (12.10.6daily12.11.22-0ubuntu1) raring; urgency=low [ Lars Uebernickel ] -- cgit v1.2.3 From f6d3e793ec923be629f26cab087a6a995a2d0c61 Mon Sep 17 00:00:00 2001 From: Jason Conti Date: Tue, 12 Feb 2013 14:41:16 -0500 Subject: libmessaging-menu: Set correct boolean value in _remove_attention and _set_draws_attention --- libmessaging-menu/messaging-menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmessaging-menu/messaging-menu.c b/libmessaging-menu/messaging-menu.c index 04f8d1d..1fa1033 100644 --- a/libmessaging-menu/messaging-menu.c +++ b/libmessaging-menu/messaging-menu.c @@ -717,7 +717,7 @@ messaging_menu_app_set_draws_attention (MessagingMenuApp *app, state = g_action_get_state (G_ACTION (action)); g_variant_get (state, "(ux&sb)", &count, &time, &string, NULL); - new_state = g_variant_new ("(uxsb)", count, time, string, TRUE); + new_state = g_variant_new ("(uxsb)", count, time, string, draws_attention); g_simple_action_set_state (action, new_state); g_variant_unref (state); @@ -1191,5 +1191,5 @@ void messaging_menu_app_remove_attention (MessagingMenuApp *app, const gchar *source_id) { - messaging_menu_app_set_draws_attention (app, source_id, TRUE); + messaging_menu_app_set_draws_attention (app, source_id, FALSE); } -- cgit v1.2.3 From e2a9f0d3fe72a62db3a1629982fc1af1485fe25d Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Wed, 13 Feb 2013 02:02:12 +0000 Subject: Releasing 12.10.6daily13.02.13-0ubuntu1, based on r337 --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index aafa43a..7802027 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +indicator-messages (12.10.6daily13.02.13-0ubuntu1) raring; urgency=low + + [ Jason Conti ] + * Stuck notifications (blue envolope remains after I've already read + msg) (LP: #1113721) + + [ Automatic PS uploader ] + * Automatic snapshot from revision 337 + + -- Automatic PS uploader Wed, 13 Feb 2013 02:02:11 +0000 + indicator-messages (12.10.6daily13.01.25-0ubuntu1) raring; urgency=low [ Charles Kerr ] -- cgit v1.2.3 From 8249e264e0f426d6702d21a690477be495045f90 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 19 Feb 2013 19:21:43 -0500 Subject: Notify the service when an app unrefs its MessagingMenuApp Prior to this patch, the messaging menu only marked apps as "not running" when they quit (i.e. disappeared from the bus). This was okay, since most applications only ever release the ref to their MessagingMenuApp when they quit, or after calling _unregister explicitely (which removes them from the menu entirely). However, this is according to libmessagingmenu's documentation, and at least indicator-telepathy relies on it. --- libmessaging-menu/messaging-menu.c | 4 ++++ src/messages-service.c | 25 +++++++++++++++++++++++++ src/messages-service.xml | 4 ++++ 3 files changed, 33 insertions(+) diff --git a/libmessaging-menu/messaging-menu.c b/libmessaging-menu/messaging-menu.c index 04f8d1d..a51695a 100644 --- a/libmessaging-menu/messaging-menu.c +++ b/libmessaging-menu/messaging-menu.c @@ -277,6 +277,10 @@ messaging_menu_app_dispose (GObject *object) if (app->messages_service) { + indicator_messages_service_call_application_stopped_running (app->messages_service, + g_app_info_get_id (G_APP_INFO (app->appinfo)), + NULL, NULL, NULL); + g_signal_handlers_disconnect_by_func (app->messages_service, global_status_changed, app); diff --git a/src/messages-service.c b/src/messages-service.c index 48c830e..e48e3f8 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -472,6 +472,29 @@ unregister_application (IndicatorMessagesService *service, indicator_messages_service_complete_unregister_application (service, invocation); } +static void +application_stopped_running (IndicatorMessagesService *service, + GDBusMethodInvocation *invocation, + const gchar *desktop_id, + gpointer user_data) +{ + GDesktopAppInfo *appinfo; + gchar *id; + AppSection *section; + + indicator_messages_service_complete_application_stopped_running (service, invocation); + + if (!(appinfo = g_desktop_app_info_new (desktop_id))) + return; + + id = g_app_info_get_simple_id (G_APP_INFO (appinfo)); + section = g_hash_table_lookup (applications, id); + app_section_unset_object_path (section); + + g_free (id); + g_object_unref (appinfo); +} + static void set_status (IndicatorMessagesService *service, GDBusMethodInvocation *invocation, @@ -648,6 +671,8 @@ main (int argc, char ** argv) G_CALLBACK (register_application), NULL); g_signal_connect (messages_service, "handle-unregister-application", G_CALLBACK (unregister_application), NULL); + g_signal_connect (messages_service, "handle-application-stopped-running", + G_CALLBACK (application_stopped_running), NULL); g_signal_connect (messages_service, "handle-set-status", G_CALLBACK (set_status), NULL); diff --git a/src/messages-service.xml b/src/messages-service.xml index 00ae154..3c3c779 100644 --- a/src/messages-service.xml +++ b/src/messages-service.xml @@ -11,6 +11,10 @@ + + + + -- cgit v1.2.3 From 5c47f6dbe75e413d2acbcef3e9750e937fb18431 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 25 Feb 2013 19:34:56 -0500 Subject: Test libmessaging-menu Use dbusmock to test whether libmessaging-menu calls the right functions on registration and deregistration. --- configure.ac | 18 +++++++++----- debian/control | 1 + test/Makefile.am | 10 ++++++++ test/test-client.py | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 91 insertions(+), 6 deletions(-) create mode 100755 test/test-client.py diff --git a/configure.ac b/configure.ac index bcd7b20..08ac680 100644 --- a/configure.ac +++ b/configure.ac @@ -75,7 +75,7 @@ AC_SUBST(COVERAGE_CXXFLAGS) AC_SUBST(COVERAGE_LDFLAGS) ########################### -# Google Test framework +# Tests ########################### AC_ARG_ENABLE([tests], @@ -85,10 +85,16 @@ AC_ARG_ENABLE([tests], if test "x$enable_tests" != "xno"; then m4_include([m4/gtest.m4]) CHECK_GTEST - if test "x$enable_tests" = "xauto"; then - enable_tests=${have_gtest} - elif test "x$enable_tests" = "xyes" && test "x$have_gtest" != "xyes"; then - AC_MSG_ERROR([tests were requested but gtest is not installed.]) + AM_PATH_PYTHON(3.0,, [:]) + AC_PYTHON_MODULE(dbusmock) + if test "x$have_gtest" = "xyes" -a "x$HAVE_PYMOD_DBUSMOCK" = "xyes"; then + enable_tests="yes" + else + if test "x$enable_tests" = "xyes"; then + AC_MSG_ERROR([tests were requested but gtest or dbusmock are not installed.]) + else + enable_tests="no" + fi fi fi AM_CONDITIONAL([BUILD_TESTS],[test "x$enable_tests" = "xyes"]) @@ -193,7 +199,7 @@ Messaging Indicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR - gtest: $enable_tests + tests: $enable_tests gcov: $use_gcov introspecion: $enable_introspection documentation: $enable_gtk_doc diff --git a/debian/control b/debian/control index 31292c5..efc21cd 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,7 @@ Build-Depends: debhelper (>= 9), libgirepository1.0-dev (>= 0.9.12), gtk-doc-tools, libgtest-dev, + python3-dbusmock, Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-messages # If you aren't a member of ~indicator-applet-developers but need to upload diff --git a/test/Makefile.am b/test/Makefile.am index 4671446..87ae2c3 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -65,3 +65,13 @@ libindicator_messages_service_la_LIBADD = \ libindicator_messages_service_la_LDFLAGS = \ $(COVERAGE_LDFLAGS) + +###################################### +# Test client with dbusmock +###################################### + +TESTS_ENVIRONMENT = \ + export LD_LIBRARY_PATH=$(top_builddir)/libmessaging-menu/.libs; \ + export GI_TYPELIB_PATH=$(top_builddir)/libmessaging-menu; + +TESTS += test-client.py diff --git a/test/test-client.py b/test/test-client.py new file mode 100755 index 0000000..e012d6e --- /dev/null +++ b/test/test-client.py @@ -0,0 +1,68 @@ +#!/usr/bin/env python3 + +import unittest +import dbus +import dbusmock +import subprocess +from gi.repository import GLib, Gio, MessagingMenu + +class MessagingMenuTest(dbusmock.DBusTestCase): + @classmethod + def setUpClass(klass): + klass.start_session_bus() + klass.bus = klass.get_dbus(False) + + def setUp(self): + name = 'com.canonical.indicator.messages' + obj_path = '/com/canonical/indicator/messages/service' + iface = 'com.canonical.indicator.messages.service' + + self.messaging_service = self.spawn_server(name, obj_path, iface, stdout=subprocess.PIPE) + self.mock = dbus.Interface(self.bus.get_object(name, obj_path), dbusmock.MOCK_IFACE) + self.mock.AddMethod('', 'RegisterApplication', 'so', '', '') + self.mock.AddMethod('', 'UnregisterApplication', 's', '', '') + self.mock.AddMethod('', 'ApplicationStoppedRunning', 's', '', '') + self.mock.AddMethod('', 'SetStatus', 'ss', '', '') + + self.loop = GLib.MainLoop() + + def tearDown(self): + self.messaging_service.terminate() + self.messaging_service.wait() + + def spin_loop(self, ms=10): + GLib.timeout_add(ms, lambda: self.loop.quit()) + self.loop.run() + + def assertMethodCalled(self, name, *expected_args): + calls = self.mock.GetMethodCalls(name) + self.assertEqual(len(calls), 1, 'method %s was not called' % name) + args = calls[0][1] + self.assertEqual(len(args), len(expected_args)) + for i in range(len(args)): + if expected_args[i]: + self.assertEqual(args[i], expected_args[i]) + + def test_registration(self): + mmapp = MessagingMenu.App.new('empathy.desktop') + mmapp.register() + self.spin_loop() + self.assertMethodCalled('RegisterApplication', 'empathy.desktop', None) + + mmapp.unregister() + self.spin_loop() + self.assertMethodCalled('UnregisterApplication', 'empathy.desktop') + + # ApplicationStoppedRunning is called when the last ref on mmapp is dropped + del mmapp + self.spin_loop() + self.assertMethodCalled('ApplicationStoppedRunning', 'empathy.desktop') + + def test_status(self): + mmapp = MessagingMenu.App.new('empathy.desktop') + mmapp.register() + mmapp.set_status(MessagingMenu.Status.AWAY) + self.spin_loop() + self.assertMethodCalled('SetStatus', 'empathy.desktop', 'away') + +unittest.main(testRunner=unittest.TextTestRunner()) -- cgit v1.2.3 From d98feb7174b8b66059bce11abe5d2c0fb5c418cb Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 26 Feb 2013 15:17:56 -0500 Subject: debian/control: add autoconf-archive as an explicit build dep Needed for AC_PYTHON_MODULE --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index efc21cd..c0a8290 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,7 @@ Build-Depends: debhelper (>= 9), gtk-doc-tools, libgtest-dev, python3-dbusmock, + autoconf-archive, Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-messages # If you aren't a member of ~indicator-applet-developers but need to upload -- cgit v1.2.3 From 83b5fdc85d50f68722bd1b2cad69e4519ab9b25f Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 26 Feb 2013 19:34:14 -0500 Subject: Use a special desktop file for testing --- test/Makefile.am | 3 ++- test/applications/test.desktop | 2 ++ test/test-client.py | 12 ++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 test/applications/test.desktop diff --git a/test/Makefile.am b/test/Makefile.am index 87ae2c3..4f1a163 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -72,6 +72,7 @@ libindicator_messages_service_la_LDFLAGS = \ TESTS_ENVIRONMENT = \ export LD_LIBRARY_PATH=$(top_builddir)/libmessaging-menu/.libs; \ - export GI_TYPELIB_PATH=$(top_builddir)/libmessaging-menu; + export GI_TYPELIB_PATH=$(top_builddir)/libmessaging-menu; \ + export XDG_DATA_DIRS=$(abs_srcdir); TESTS += test-client.py diff --git a/test/applications/test.desktop b/test/applications/test.desktop new file mode 100644 index 0000000..c2332b9 --- /dev/null +++ b/test/applications/test.desktop @@ -0,0 +1,2 @@ +[Desktop Entry] +Type=Application diff --git a/test/test-client.py b/test/test-client.py index e012d6e..af5d119 100755 --- a/test/test-client.py +++ b/test/test-client.py @@ -44,25 +44,25 @@ class MessagingMenuTest(dbusmock.DBusTestCase): self.assertEqual(args[i], expected_args[i]) def test_registration(self): - mmapp = MessagingMenu.App.new('empathy.desktop') + mmapp = MessagingMenu.App.new('test.desktop') mmapp.register() self.spin_loop() - self.assertMethodCalled('RegisterApplication', 'empathy.desktop', None) + self.assertMethodCalled('RegisterApplication', 'test.desktop', None) mmapp.unregister() self.spin_loop() - self.assertMethodCalled('UnregisterApplication', 'empathy.desktop') + self.assertMethodCalled('UnregisterApplication', 'test.desktop') # ApplicationStoppedRunning is called when the last ref on mmapp is dropped del mmapp self.spin_loop() - self.assertMethodCalled('ApplicationStoppedRunning', 'empathy.desktop') + self.assertMethodCalled('ApplicationStoppedRunning', 'test.desktop') def test_status(self): - mmapp = MessagingMenu.App.new('empathy.desktop') + mmapp = MessagingMenu.App.new('test.desktop') mmapp.register() mmapp.set_status(MessagingMenu.Status.AWAY) self.spin_loop() - self.assertMethodCalled('SetStatus', 'empathy.desktop', 'away') + self.assertMethodCalled('SetStatus', 'test.desktop', 'away') unittest.main(testRunner=unittest.TextTestRunner()) -- cgit v1.2.3 From 701aadff88796f71250442156f6e3385648d7b05 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 27 Feb 2013 12:56:24 -0500 Subject: test-client: wait a bit longer until checking that mock methods were called --- test/test-client.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/test/test-client.py b/test/test-client.py index af5d119..a4ac8d2 100755 --- a/test/test-client.py +++ b/test/test-client.py @@ -30,39 +30,43 @@ class MessagingMenuTest(dbusmock.DBusTestCase): self.messaging_service.terminate() self.messaging_service.wait() - def spin_loop(self, ms=10): - GLib.timeout_add(ms, lambda: self.loop.quit()) - self.loop.run() - - def assertMethodCalled(self, name, *expected_args): - calls = self.mock.GetMethodCalls(name) - self.assertEqual(len(calls), 1, 'method %s was not called' % name) - args = calls[0][1] + def assertArgumentsEqual(self, args, *expected_args): self.assertEqual(len(args), len(expected_args)) for i in range(len(args)): if expected_args[i]: self.assertEqual(args[i], expected_args[i]) + def assertMethodCalled(self, name, *expected_args): + # set a flag on timeout, assertions don't get bubbled up through c functions + self.timed_out = False + def timeout(): self.timed_out = True + timeout_id = GLib.timeout_add_seconds(10, timeout) + while 1: + calls = self.mock.GetMethodCalls(name) + if len(calls) > 0: + GLib.source_remove(timeout_id) + self.assertArgumentsEqual(calls[0][1], *expected_args) + break + GLib.MainContext.default().iteration(True) + if self.timed_out: + raise self.failureException('method %s was not called after 10 seconds' % name) + def test_registration(self): mmapp = MessagingMenu.App.new('test.desktop') mmapp.register() - self.spin_loop() self.assertMethodCalled('RegisterApplication', 'test.desktop', None) mmapp.unregister() - self.spin_loop() self.assertMethodCalled('UnregisterApplication', 'test.desktop') # ApplicationStoppedRunning is called when the last ref on mmapp is dropped del mmapp - self.spin_loop() self.assertMethodCalled('ApplicationStoppedRunning', 'test.desktop') def test_status(self): mmapp = MessagingMenu.App.new('test.desktop') mmapp.register() mmapp.set_status(MessagingMenu.Status.AWAY) - self.spin_loop() self.assertMethodCalled('SetStatus', 'test.desktop', 'away') unittest.main(testRunner=unittest.TextTestRunner()) -- cgit v1.2.3 From 36a89063932aea9ae94bf67d9c51d80c01bebaa8 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 5 Mar 2013 17:54:26 -0500 Subject: Use glib mainloop in dbusmock test --- test/test-client.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/test-client.py b/test/test-client.py index a4ac8d2..a1d503f 100755 --- a/test/test-client.py +++ b/test/test-client.py @@ -2,10 +2,13 @@ import unittest import dbus +from dbus.mainloop.glib import DBusGMainLoop import dbusmock import subprocess from gi.repository import GLib, Gio, MessagingMenu +DBusGMainLoop(set_as_default=True) + class MessagingMenuTest(dbusmock.DBusTestCase): @classmethod def setUpClass(klass): -- cgit v1.2.3 From 39fc49c52e23b9bb0964fc90716e63a3a4129c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 3 Apr 2013 17:38:07 +0200 Subject: ImAppMenu: pass the event timestamp when activating the item --- src/im-app-menu-item.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/im-app-menu-item.c b/src/im-app-menu-item.c index a204631..afd21be 100644 --- a/src/im-app-menu-item.c +++ b/src/im-app-menu-item.c @@ -238,7 +238,10 @@ im_app_menu_item_activate (GtkMenuItem *item) ImAppMenuItemPrivate *priv = IM_APP_MENU_ITEM (item)->priv; if (priv->action && priv->action_group) - g_action_group_activate_action (priv->action_group, priv->action, NULL); + { + guint32 event_time = gtk_get_current_event_time (); + g_action_group_activate_action (priv->action_group, priv->action, g_variant_new_uint32(event_time)); + } } static void -- cgit v1.2.3 From 23d93b9cf3dceac06f26bf741f9128d556244cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 3 Apr 2013 17:40:56 +0200 Subject: AppSection: use the GAppLaunchContext with event timestamp when launching an app --- src/app-section.c | 11 +++++++++-- src/messages-service.c | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app-section.c b/src/app-section.c index 6aac52a..93f59a2 100644 --- a/src/app-section.c +++ b/src/app-section.c @@ -25,6 +25,7 @@ with this program. If not, see . #include "config.h" #endif +#include #include #include #include @@ -390,7 +391,7 @@ app_section_update_menu (AppSection *self) g_simple_action_group_clear (priv->static_shortcuts); is_running = priv->name_watch_id > 0; - launch = g_simple_action_new_stateful ("launch", NULL, g_variant_new_boolean (is_running)); + launch = g_simple_action_new_stateful ("launch", G_VARIANT_TYPE_UINT32, g_variant_new_boolean (is_running)); g_signal_connect (launch, "activate", G_CALLBACK (activate_cb), self); g_signal_connect (launch, "change-state", G_CALLBACK (launch_action_change_state), self); g_simple_action_group_insert (priv->static_shortcuts, G_ACTION (launch)); @@ -506,13 +507,19 @@ activate_cb (GSimpleAction *action, AppSection * mi = APP_SECTION (userdata); AppSectionPrivate * priv = mi->priv; GError *error = NULL; + GdkDisplay *display = gdk_display_get_default(); + GdkAppLaunchContext *launch_context = gdk_display_get_app_launch_context (display); - if (!g_app_info_launch (G_APP_INFO (priv->appinfo), NULL, NULL, &error)) { + gdk_app_launch_context_set_timestamp (launch_context, g_variant_get_uint32 (param)); + + if (!g_app_info_launch (G_APP_INFO (priv->appinfo), NULL, G_APP_LAUNCH_CONTEXT (launch_context), &error)) { g_warning("Unable to execute application for desktop file '%s': %s", g_desktop_app_info_get_filename (priv->appinfo), error->message); g_error_free (error); } + + g_object_unref (launch_context); } static void diff --git a/src/messages-service.c b/src/messages-service.c index 48c830e..f93cf68 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -24,6 +24,7 @@ with this program. If not, see . #include #include #include +#include #include #include #include @@ -622,6 +623,7 @@ main (int argc, char ** argv) GMainLoop * mainloop; IndicatorService * service; + gdk_init(&argc, &argv); mainloop = g_main_loop_new (NULL, FALSE); /* Create the Indicator Service interface */ -- cgit v1.2.3 From 35bf2c9320e7c62a574e80b3ed463c110dce7060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 22 Apr 2013 10:45:52 +0200 Subject: indicator_desktop_shortcuts_nick_exec() is deprecated, use indicator_desktop_shortcuts_nick_exec_with_context() with a NULL context instead - fixes the FTBFS --- src/app-section.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app-section.c b/src/app-section.c index 93f59a2..474e700 100644 --- a/src/app-section.c +++ b/src/app-section.c @@ -303,7 +303,7 @@ nick_activate_cb (GSimpleAction *action, g_return_if_fail(priv->ids != NULL); - if (!indicator_desktop_shortcuts_nick_exec(priv->ids, nick)) { + if (!indicator_desktop_shortcuts_nick_exec_with_context(priv->ids, nick, NULL)) { g_warning("Unable to execute nick '%s' for desktop file '%s'", nick, g_desktop_app_info_get_filename (priv->appinfo)); } -- cgit v1.2.3 From 3cabcaefd84a4ff980d0d2160df099c573d467b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Mon, 22 Apr 2013 17:26:08 +0200 Subject: IdoMenuItem: pass event timestamp to the action if we have no status change --- src/ido-menu-item.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/ido-menu-item.c b/src/ido-menu-item.c index 32044ff..f702828 100644 --- a/src/ido-menu-item.c +++ b/src/ido-menu-item.c @@ -282,10 +282,24 @@ static void ido_menu_item_activate (GtkMenuItem *item) { IdoMenuItemPrivate *priv = IDO_MENU_ITEM (item)->priv; + GVariant *parameter; /* see ido_menu_item_set_active */ if (!priv->in_set_active && priv->action && priv->action_group) - g_action_group_activate_action (priv->action_group, priv->action, priv->target); + { + guint32 event_time = gtk_get_current_event_time (); + + if (priv->target) + { + parameter = priv->target; + } + else + { + parameter = g_variant_new_uint32 (event_time); + } + + g_action_group_activate_action (priv->action_group, priv->action, parameter); + } if (priv->in_set_active) GTK_MENU_ITEM_CLASS (ido_menu_item_parent_class)->activate (item); -- cgit v1.2.3 From 6a3dad7dbe2004c8b3c92f914b01e181b5adb646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Mon, 22 Apr 2013 17:26:51 +0200 Subject: AppSection: use LaunchContext to exec shortcut nicks --- src/app-section.c | 26 +++++++++++++++++++------- src/im-app-menu-item.c | 2 +- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/app-section.c b/src/app-section.c index 474e700..1106c62 100644 --- a/src/app-section.c +++ b/src/app-section.c @@ -291,6 +291,17 @@ app_section_finalize (GObject *object) G_OBJECT_CLASS (app_section_parent_class)->dispose (object); } +static GAppLaunchContext * +get_launch_context (guint32 timestamp) +{ + GdkDisplay *display = gdk_display_get_default(); + GdkAppLaunchContext *launch_context = gdk_display_get_app_launch_context (display); + + gdk_app_launch_context_set_timestamp (launch_context, timestamp); + + return G_APP_LAUNCH_CONTEXT (launch_context); +} + /* Respond to one of the shortcuts getting clicked on. */ static void nick_activate_cb (GSimpleAction *action, @@ -303,10 +314,14 @@ nick_activate_cb (GSimpleAction *action, g_return_if_fail(priv->ids != NULL); - if (!indicator_desktop_shortcuts_nick_exec_with_context(priv->ids, nick, NULL)) { + GAppLaunchContext *context = get_launch_context (g_variant_get_uint32 (param)); + + if (!indicator_desktop_shortcuts_nick_exec_with_context(priv->ids, nick, context)) { g_warning("Unable to execute nick '%s' for desktop file '%s'", nick, g_desktop_app_info_get_filename (priv->appinfo)); } + + g_object_unref (context); } static void @@ -416,7 +431,7 @@ app_section_update_menu (AppSection *self) name = indicator_desktop_shortcuts_nick_get_name(priv->ids, nicks[i]); - action = g_simple_action_new (nicks[i], NULL); + action = g_simple_action_new (nicks[i], G_VARIANT_TYPE_UINT32); g_signal_connect(action, "activate", G_CALLBACK (nick_activate_cb), self); g_simple_action_group_insert (priv->static_shortcuts, G_ACTION (action)); g_object_unref (action); @@ -507,12 +522,9 @@ activate_cb (GSimpleAction *action, AppSection * mi = APP_SECTION (userdata); AppSectionPrivate * priv = mi->priv; GError *error = NULL; - GdkDisplay *display = gdk_display_get_default(); - GdkAppLaunchContext *launch_context = gdk_display_get_app_launch_context (display); - - gdk_app_launch_context_set_timestamp (launch_context, g_variant_get_uint32 (param)); + GAppLaunchContext *launch_context = get_launch_context (g_variant_get_uint32 (param)); - if (!g_app_info_launch (G_APP_INFO (priv->appinfo), NULL, G_APP_LAUNCH_CONTEXT (launch_context), &error)) { + if (!g_app_info_launch (G_APP_INFO (priv->appinfo), NULL, launch_context, &error)) { g_warning("Unable to execute application for desktop file '%s': %s", g_desktop_app_info_get_filename (priv->appinfo), error->message); diff --git a/src/im-app-menu-item.c b/src/im-app-menu-item.c index afd21be..03b11c2 100644 --- a/src/im-app-menu-item.c +++ b/src/im-app-menu-item.c @@ -240,7 +240,7 @@ im_app_menu_item_activate (GtkMenuItem *item) if (priv->action && priv->action_group) { guint32 event_time = gtk_get_current_event_time (); - g_action_group_activate_action (priv->action_group, priv->action, g_variant_new_uint32(event_time)); + g_action_group_activate_action (priv->action_group, priv->action, g_variant_new_uint32 (event_time)); } } -- cgit v1.2.3 From 25671b51aac302f93afcda18232a7c93911643b7 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 2 May 2013 11:13:10 -0700 Subject: releasing version 12.10.6daily13.04.09-0ubuntu1 --- debian/changelog | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7802027..ea87c98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +indicator-messages (12.10.6daily13.04.09-0ubuntu1) raring; urgency=low + + * Automatic snapshot from revision 340 + + -- Ubuntu daily release Tue, 09 Apr 2013 02:02:02 +0000 + +indicator-messages (12.10.6daily13.04.08-0ubuntu1) raring; urgency=low + + [ Marco Trevisan (Treviño) ] + * Window management - Apps raised from indicators sometimes dont have + the focus (LP: #627195) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 339 + + -- Ubuntu daily release Mon, 08 Apr 2013 02:02:06 +0000 + indicator-messages (12.10.6daily13.02.13-0ubuntu1) raring; urgency=low [ Jason Conti ] -- cgit v1.2.3 From 36a03049dd61ae6b4d4407d5990d101db2da34f5 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Thu, 2 May 2013 22:59:04 +0000 Subject: Releasing 12.10.6daily13.05.02-0ubuntu1, based on r342 --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index ea87c98..1e16e4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +indicator-messages (12.10.6daily13.05.02-0ubuntu1) saucy; urgency=low + + [ Marco Trevisan (Treviño) ] + * Opening new-window from quicklist static action does not focus the + newly opened window (LP: #1164483) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 342 + + -- Ubuntu daily release Thu, 02 May 2013 22:59:03 +0000 + indicator-messages (12.10.6daily13.04.09-0ubuntu1) raring; urgency=low * Automatic snapshot from revision 340 -- cgit v1.2.3 From 1312f9108e64a9b4f33986b877a90e418bf5cdfb Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 15 May 2013 12:09:18 -0400 Subject: libmessaging-menu: don't use detailed action names Detailed action names are of the form action::target or action(target), so they can't have colons or parens in them. This restriction does not apply to messaging menu ids. --- libmessaging-menu/messaging-menu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libmessaging-menu/messaging-menu.c b/libmessaging-menu/messaging-menu.c index 1fa1033..acf3d90 100644 --- a/libmessaging-menu/messaging-menu.c +++ b/libmessaging-menu/messaging-menu.c @@ -644,7 +644,8 @@ messaging_menu_app_insert_source_action (MessagingMenuApp *app, g_simple_action_group_insert (app->source_actions, G_ACTION (action)); g_object_unref (action); - menuitem = g_menu_item_new (label, id); + menuitem = g_menu_item_new (label, NULL); + g_menu_item_set_action_and_target_value (menuitem, id, NULL); g_menu_item_set_attribute (menuitem, "x-canonical-type", "s", "ImSourceMenuItem"); if (icon) { -- cgit v1.2.3 From b93c043e375049aef0c032ca18bf984e31c6f951 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Wed, 15 May 2013 16:59:49 +0000 Subject: Releasing 12.10.6daily13.05.15-0ubuntu1, based on r344 --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1e16e4f..82feeef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +indicator-messages (12.10.6daily13.05.15-0ubuntu1) saucy; urgency=low + + [ Lars Uebernickel ] + * libmessaging-menu: don't use detailed action names Detailed action + names are of the form action::target or action(target), so they + can't have colons or parens in them. This restriction does not apply + to messaging menu ids. (LP: #1180302) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 344 + + -- Ubuntu daily release Wed, 15 May 2013 16:59:49 +0000 + indicator-messages (12.10.6daily13.05.02-0ubuntu1) saucy; urgency=low [ Marco Trevisan (Treviño) ] -- cgit v1.2.3 From bc3c2d1d5b6cf8ad2c6b4a64f41361a248f89d90 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Tue, 28 May 2013 19:05:11 +0200 Subject: use gtk_style_context_get instead of deprecated gtk_style_context_get_font --- src/ido-detail-label.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ido-detail-label.c b/src/ido-detail-label.c index 780a2dd..9a163b7 100644 --- a/src/ido-detail-label.c +++ b/src/ido-detail-label.c @@ -140,8 +140,9 @@ gtk_widget_get_font_metrics (GtkWidget *widget, { const PangoFontDescription *font; - font = gtk_style_context_get_font (gtk_widget_get_style_context (widget), - gtk_widget_get_state_flags (widget)); + gtk_style_context_get (gtk_widget_get_style_context (widget), + gtk_widget_get_state_flags (widget), + "font", &font, NULL); return pango_context_get_metrics (context, font, -- cgit v1.2.3 From ebcad53cbfe52dc19462cd6021fe676b493b7a83 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 29 May 2013 09:55:39 -0400 Subject: ido-detail-label.c: free font desc --- src/ido-detail-label.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ido-detail-label.c b/src/ido-detail-label.c index 9a163b7..8b7ef90 100644 --- a/src/ido-detail-label.c +++ b/src/ido-detail-label.c @@ -138,15 +138,19 @@ static PangoFontMetrics * gtk_widget_get_font_metrics (GtkWidget *widget, PangoContext *context) { - const PangoFontDescription *font; + PangoFontDescription *font; + PangoFontMetrics *metrics; gtk_style_context_get (gtk_widget_get_style_context (widget), gtk_widget_get_state_flags (widget), "font", &font, NULL); - return pango_context_get_metrics (context, - font, - pango_context_get_language (context)); + metrics = pango_context_get_metrics (context, + font, + pango_context_get_language (context)); + + pango_font_description_free (font); + return metrics; } static gint -- cgit v1.2.3 From 7af3c34b4fc7642585a77f97e5605463b7e1c99c Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Fri, 7 Jun 2013 08:19:11 -0400 Subject: Have libmessaging-menu-dev depend on gir1.2-messagingmenu-1.0 --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 31292c5..e44b405 100644 --- a/debian/control +++ b/debian/control @@ -68,6 +68,7 @@ Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, + gir1.2-messagingmenu-1.0 (=${binary:Version}), libmessaging-menu0 (=${binary:Version}), libglib2.0-dev, Description: Messaging Menu - library development files @@ -75,7 +76,7 @@ Description: Messaging Menu - library development files the messaging menu. Package: gir1.2-messagingmenu-1.0 -Section: libs +Section: introspection Architecture: any Depends: ${misc:Depends}, ${gir:Depends}, -- cgit v1.2.3 From 014158fd7f63b25840bbcecc92e9ec3f42a7002c Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Fri, 7 Jun 2013 17:35:39 -0400 Subject: Remove autoconf-archive dependency (copied ax_python_module into m4/) --- debian/control | 1 - m4/ax_python_module.m4 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 m4/ax_python_module.m4 diff --git a/debian/control b/debian/control index c0a8290..efc21cd 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,6 @@ Build-Depends: debhelper (>= 9), gtk-doc-tools, libgtest-dev, python3-dbusmock, - autoconf-archive, Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-messages # If you aren't a member of ~indicator-applet-developers but need to upload diff --git a/m4/ax_python_module.m4 b/m4/ax_python_module.m4 new file mode 100644 index 0000000..bd70a06 --- /dev/null +++ b/m4/ax_python_module.m4 @@ -0,0 +1,49 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_python_module.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PYTHON_MODULE(modname[, fatal]) +# +# DESCRIPTION +# +# Checks for Python module. +# +# If fatal is non-empty then absence of a module will trigger an error. +# +# LICENSE +# +# Copyright (c) 2008 Andrew Collier +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 5 + +AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE]) +AC_DEFUN([AX_PYTHON_MODULE],[ + if test -z $PYTHON; + then + PYTHON="python" + fi + PYTHON_NAME=`basename $PYTHON` + AC_MSG_CHECKING($PYTHON_NAME module: $1) + $PYTHON -c "import $1" 2>/dev/null + if test $? -eq 0; + then + AC_MSG_RESULT(yes) + eval AS_TR_CPP(HAVE_PYMOD_$1)=yes + else + AC_MSG_RESULT(no) + eval AS_TR_CPP(HAVE_PYMOD_$1)=no + # + if test -n "$2" + then + AC_MSG_ERROR(failed to find required module $1) + exit 1 + fi + fi +]) -- cgit v1.2.3 From 6e31d99fa67dee56bec9b619b5981ace0d429eb1 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Wed, 19 Jun 2013 02:01:52 +0000 Subject: Releasing 12.10.6daily13.06.19-0ubuntu1, based on r348 --- debian/changelog | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/debian/changelog b/debian/changelog index 82feeef..8b59499 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +indicator-messages (12.10.6daily13.06.19-0ubuntu1) saucy; urgency=low + + [ Sebastien Bacher ] + * use gtk_style_context_get instead of deprecated + gtk_style_context_get_font. + + [ Jeremy Bicha ] + * Have libmessaging-menu-dev depend on gir1.2-messagingmenu-1.0. + + [ Lars Uebernickel ] + * use gtk_style_context_get instead of deprecated + gtk_style_context_get_font. + * Notify the service when an app unrefs its MessagingMenuApp. (LP: + #1154099) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 348 + + -- Ubuntu daily release Wed, 19 Jun 2013 02:01:48 +0000 + indicator-messages (12.10.6daily13.05.15-0ubuntu1) saucy; urgency=low [ Lars Uebernickel ] -- cgit v1.2.3 From 8c3a1e90bf6453b7917bd4aad9e2136f0b30edeb Mon Sep 17 00:00:00 2001 From: Mathias Dietrich Date: Fri, 28 Jun 2013 12:41:38 +0200 Subject: Change abbreviation for minutes from m to min --- src/im-source-menu-item.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/im-source-menu-item.c b/src/im-source-menu-item.c index 775fa91..2577c30 100644 --- a/src/im-source-menu-item.c +++ b/src/im-source-menu-item.c @@ -95,7 +95,7 @@ im_source_menu_item_time_span_string (gint64 timestamp) if (hours == 0) { /* TRANSLATORS: number of minutes that have passed */ - str = g_strdup_printf (ngettext ("%d m", "%d m", minutes), minutes); + str = g_strdup_printf (ngettext ("%d min", "%d min", minutes), minutes); } else { -- cgit v1.2.3 From 493b8ca51a6a6d7c93d45e869ffdcfecce7c4677 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Tue, 2 Jul 2013 02:02:36 +0000 Subject: Releasing 12.10.6+13.10.20130702-0ubuntu1, based on r350 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8b59499..9ce8e81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +indicator-messages (12.10.6+13.10.20130702-0ubuntu1) saucy; urgency=low + + [ Mathias Dietrich ] + * Change abbreviation for minutes from m to min. (LP: #652845) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 350 + + -- Ubuntu daily release Tue, 02 Jul 2013 02:02:36 +0000 + indicator-messages (12.10.6daily13.06.19-0ubuntu1) saucy; urgency=low [ Sebastien Bacher ] -- cgit v1.2.3