diff options
-rw-r--r-- | debian/changelog | 13 | ||||
-rw-r--r-- | libindicator/indicator-desktop-shortcuts.c | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 22dd56d..ad342ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,9 @@ -libindicator (0.3.6-0ubuntu1~ppa2~shortcutdomain2) lucid; urgency=low +libindicator (0.3.6-0ubuntu1~ppa2) UNRELEASED; urgency=low * Upstream merge - * Chnages requested by pitt + * Use the domain in desktop files for shortcuts (LP: #549322) - -- Ted Gould <ted@ubuntu.com> Mon, 05 Apr 2010 15:37:13 -0500 - -libindicator (0.3.6-0ubuntu1~ppa2~shortcutdomain1) lucid; urgency=low - - * Upstream merge - * Use the domain in desktop files for shortcuts - - -- Ted Gould <ted@ubuntu.com> Fri, 02 Apr 2010 10:51:59 -0500 + -- Ted Gould <ted@ubuntu.com> Tue, 06 Apr 2010 15:58:33 -0500 libindicator (0.3.6-0ubuntu1~ppa1) lucid; urgency=low diff --git a/libindicator/indicator-desktop-shortcuts.c b/libindicator/indicator-desktop-shortcuts.c index cfd8eef..b04b482 100644 --- a/libindicator/indicator-desktop-shortcuts.c +++ b/libindicator/indicator-desktop-shortcuts.c @@ -235,7 +235,7 @@ parse_keyfile (IndicatorDesktopShortcuts * ids) } /* Remove a previous translation domain if we had one - from a perviously parsed file. */ + from a previously parsed file. */ if (priv->domain != NULL) { g_free(priv->domain); priv->domain = NULL; |