diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libindicator/indicator-desktop-shortcuts.c | 2 | ||||
| -rw-r--r-- | libindicator/indicator-image-helper.c | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 504002a..6a72e0b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ dist-hook: echo Creating ChangeLog && \ ( cd "$(top_srcdir)" && \ echo '# Generated by Makefile. Do not edit.'; echo; \ - $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \ + $(ac_aux_dir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \ && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ || (rm -f ChangeLog.tmp; \ echo Failed to generate ChangeLog >&2 ); \ @@ -36,7 +36,7 @@ dist-hook: echo Creating AUTHORS && \ ( cd "$(top_srcdir)" && \ echo '# Generated by Makefile. Do not edit.'; echo; \ - $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ + $(ac_aux_dir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ || (rm -f AUTHORS.tmp; \ echo Failed to generate AUTHORS >&2 ); \ diff --git a/configure.ac b/configure.ac index 435b67c..bdeac71 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([libindicator], - [0.4.93], + [0.4.94], [http://bugs.launchpad.net/libindicator], [libindicator], [http://launchpad.net/libindicator]) @@ -9,6 +9,7 @@ AC_PREREQ([2.64]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) +AC_SUBST([ac_aux_dir]) AM_INIT_AUTOMAKE([1.11 -Wall tar-pax]) diff --git a/libindicator/indicator-desktop-shortcuts.c b/libindicator/indicator-desktop-shortcuts.c index 13c1667..0a4e026 100644 --- a/libindicator/indicator-desktop-shortcuts.c +++ b/libindicator/indicator-desktop-shortcuts.c @@ -199,7 +199,7 @@ set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec /* But fallback if we can't */ if (priv->actions == ACTIONS_NONE && g_key_file_has_key(keyfile, G_KEY_FILE_DESKTOP_GROUP, OLD_SHORTCUTS_KEY, NULL)) { priv->actions = ACTIONS_XAYATANA; - g_warning("Desktop file '%s' is using a depracted format for it's actions that will be dropped soon.", g_value_get_string(value)); + g_warning("Desktop file '%s' is using a deprecated format for its actions that will be dropped soon.", g_value_get_string(value)); } if (priv->actions == ACTIONS_NONE) { diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 23b08d0..6ad2a44 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -74,6 +74,7 @@ refresh_image (GtkImage * image) if (pixbuf == NULL) { g_warning("Unable to load icon from file '%s' because: %s", icon_filename, error == NULL ? "I don't know" : error->message); + g_clear_error (&error); gtk_image_clear(image); return; } |