From d77f364df4d13f1d9cac8cf3bb7a04c68351da9d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jun 2012 10:48:01 -0500 Subject: Making the headers match independent of build directory --- libdbusmenu-glib/enum-types.h.in | 2 +- libdbusmenu-gtk/genericmenuitem-enum-types.h.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-glib/enum-types.h.in b/libdbusmenu-glib/enum-types.h.in index 5758438..afd9132 100644 --- a/libdbusmenu-glib/enum-types.h.in +++ b/libdbusmenu-glib/enum-types.h.in @@ -43,7 +43,7 @@ G_END_DECLS /*** END file-tail ***/ /*** BEGIN file-production ***/ -/* Enumerations from file: "@filename@" */ +/* Enumerations from file: "@basename@" */ #include "@basename@" /*** END file-production ***/ diff --git a/libdbusmenu-gtk/genericmenuitem-enum-types.h.in b/libdbusmenu-gtk/genericmenuitem-enum-types.h.in index 5758438..afd9132 100644 --- a/libdbusmenu-gtk/genericmenuitem-enum-types.h.in +++ b/libdbusmenu-gtk/genericmenuitem-enum-types.h.in @@ -43,7 +43,7 @@ G_END_DECLS /*** END file-tail ***/ /*** BEGIN file-production ***/ -/* Enumerations from file: "@filename@" */ +/* Enumerations from file: "@basename@" */ #include "@basename@" /*** END file-production ***/ -- cgit v1.2.3 From 6dd001a7708575f123797dae492891c1af35a308 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jun 2012 10:55:34 -0500 Subject: Escape the text we are using for markup --- libdbusmenu-gtk/genericmenuitem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c index 81d67fe..91004c0 100644 --- a/libdbusmenu-gtk/genericmenuitem.c +++ b/libdbusmenu-gtk/genericmenuitem.c @@ -279,7 +279,7 @@ set_label (GtkMenuItem * menu_item, const gchar * in_label) gchar * local_label = NULL; switch (GENERICMENUITEM(menu_item)->priv->disposition) { case GENERICMENUITEM_DISPOSITION_NORMAL: - local_label = g_strdup(in_label); + local_label = g_markup_escape_text(in_label, -1); break; case GENERICMENUITEM_DISPOSITION_INFORMATIONAL: case GENERICMENUITEM_DISPOSITION_WARNING: -- cgit v1.2.3 From 6552cd19a5472c47e2cb89a2d597bcc90e36d3bf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 13 Jun 2012 14:12:03 -0500 Subject: 0.6.2 --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 94bba0c..cd35002 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.6.1, ted@canonical.com) +AC_INIT(libdbusmenu, 0.6.2, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.6.1, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 0.6.2, [-Wno-portability]) AM_MAINTAINER_MODE @@ -166,7 +166,7 @@ AC_PATH_PROG([XSLT_PROC], [xsltproc]) ########################### LIBDBUSMENU_CURRENT=4 -LIBDBUSMENU_REVISION=12 +LIBDBUSMENU_REVISION=13 LIBDBUSMENU_AGE=0 AC_SUBST(LIBDBUSMENU_CURRENT) -- cgit v1.2.3 From 09e7b1ae2c772ddedc848db0f3d563ae0362cb95 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 13 Jun 2012 14:45:02 -0500 Subject: releasing version 0.6.2-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ad9abd9..87488c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdbusmenu (0.6.2-0ubuntu1~ppa1) UNRELEASED; urgency=low +libdbusmenu (0.6.2-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Fixed duplicated underscores in menus (LP: #979301) @@ -6,7 +6,7 @@ libdbusmenu (0.6.2-0ubuntu1~ppa1) UNRELEASED; urgency=low * DbusmenuServer leaks private string (LP: #981766) * Ensure menuitems with '&' show them properly (LP: #994564) - -- Ted Gould Wed, 13 Jun 2012 14:30:02 -0500 + -- Ted Gould Wed, 13 Jun 2012 14:44:52 -0500 libdbusmenu (0.6.1-0ubuntu3) precise-proposed; urgency=low -- cgit v1.2.3