aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-09-17 10:03:36 -0500
committerTed Gould <ted@canonical.com>2009-09-17 10:03:36 -0500
commit6e72241e9c5805bd0f0b1fae1acdb2e938ea850d (patch)
tree86d933904da55b1a722747b16316f0df40846ade
parent87a4cbf74f50fe3b0093fe230d68eb4646d75e37 (diff)
parentf120bb1aba3424d2afad8648d5f40a3d4ede5661 (diff)
downloadayatana-indicator-messages-6e72241e9c5805bd0f0b1fae1acdb2e938ea850d.tar.gz
ayatana-indicator-messages-6e72241e9c5805bd0f0b1fae1acdb2e938ea850d.tar.bz2
ayatana-indicator-messages-6e72241e9c5805bd0f0b1fae1acdb2e938ea850d.zip
Merging in the desktop branch.
-rw-r--r--debian/changelog46
-rw-r--r--src/messages-service.c3
2 files changed, 14 insertions, 35 deletions
diff --git a/debian/changelog b/debian/changelog
index e791ad0..ff2011d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,43 +1,19 @@
-indicator-messages (0.2.2-0ubuntu1~ppa1) karmic; urgency=low
+indicator-messages (0.2.2-0ubuntu2) karmic; urgency=low
- * Upstream 0.2.2 release
- * Adds in separators between application groups
-
- -- Ted Gould <ted@ubuntu.com> Thu, 10 Sep 2009 09:11:57 -0500
-
-indicator-messages (0.2.1-0ubuntu1~ppa2) karmic; urgency=low
-
- * Merging in the official 0.2.1 tag.
-
- -- Ted Gould <ted@ubuntu.com> Wed, 09 Sep 2009 14:02:26 -0500
-
-indicator-messages (0.2.1-0ubuntu1~ppa1) karmic; urgency=low
-
- * Merging in v2-api stuff which will become 0.2.1
- * debian/control: Requiring > 0.2.0 of libindicate-*
-
- -- Ted Gould <ted@ubuntu.com> Wed, 09 Sep 2009 11:03:47 -0500
+ * src/messages-service.c: initialise the translations
-indicator-messages (0.2.0-0ubuntu3~ppa1) karmic; urgency=low
+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 15 Sep 2009 16:41:03 +0200
- * Bumping version after ~ubuntu-desktop merge.
+indicator-messages (0.2.2-0ubuntu1) karmic; urgency=low
- -- Ted Gould <ted@ubuntu.com> Fri, 04 Sep 2009 13:56:06 -0500
-
-indicator-messages (0.2.0-0ubuntu1~ppa3) karmic; urgency=low
-
- * Upstream usage of new Dbusmenu 0.1.1 defines.
- * debian/control: Increasing Dbusmenu dependencies.
-
- -- Ted Gould <ted@ubuntu.com> Fri, 04 Sep 2009 13:50:50 -0500
-
-indicator-messages (0.2.0-0ubuntu1~ppa2) karmic; urgency=low
-
- * Upstream update to dbusmenu dependency.
- * debian/control: Adding dependency information for libdbusmenu
- to say >= 0.1.0 to match upstream build system.
+ * New release (LP: #427357)
+ * Adds in separators between application groups
+ * Merging in v2-api stuff which will become 0.2.1
+ * debian/control:
+ - Requiring > 0.2.0 of libindicate-*
+ - bump dbusmenu dependencies.
- -- Ted Gould <ted@ubuntu.com> Thu, 27 Aug 2009 14:01:03 -0500
+ -- Ted Gould <ted@ubuntu.com> Thu, 10 Sep 2009 09:11:57 -0500
indicator-messages (0.2.0-0ubuntu2) karmic; urgency=low
diff --git a/src/messages-service.c b/src/messages-service.c
index 575de8e..0ba0deb 100644
--- a/src/messages-service.c
+++ b/src/messages-service.c
@@ -21,6 +21,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
+#include <locale.h>
#include <pango/pango-utils.h>
#include <dbus/dbus-glib-bindings.h>
#include <libindicate/listener.h>
@@ -1219,6 +1220,8 @@ main (int argc, char ** argv)
return 1;
}
+ setlocale(LC_ALL,"");
+
dbus_interface = message_service_dbus_new();
listener = indicate_listener_ref_default();