summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-07-25 23:04:00 +0200
committerinfirit <[email protected]>2014-07-25 23:05:39 +0200
commit9ce85a9895d14305eda3e782d047cf7ca49354a5 (patch)
tree6d5c5bb9f966a2f3e7b9989effc4edfed3fc04b5
parent05df59dfe2af74e0f934d3341330a5439f1365af (diff)
downloadeom-9ce85a9895d14305eda3e782d047cf7ca49354a5.tar.bz2
eom-9ce85a9895d14305eda3e782d047cf7ca49354a5.tar.xz
Fix Makefile for ui files.
-rw-r--r--data/Makefile.am15
-rw-r--r--plugins/statusbar-date/eom-statusbar-date-plugin.c2
2 files changed, 6 insertions, 11 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index a5b6cdc..8038766 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -19,17 +19,13 @@ convertdir = $(datadir)/MateConf/gsettings
convert_DATA = eom.convert
uidir = $(pkgdatadir)
-ui_DATA = eom-image-properties-dialog.ui \
- eom-multiple-save-as-dialog.ui \
- eom-preferences-dialog.ui
-
-uidir = $(pkgdatadir)
-UI_FILES = \
+ui_DATA = \
+ eom-image-properties-dialog.ui \
+ eom-multiple-save-as-dialog.ui \
+ eom-preferences-dialog.ui \
eom-ui.xml \
eom-toolbar.xml
-ui_DATA = $(UI_FILES)
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = eom.pc
@@ -41,8 +37,7 @@ EXTRA_DIST = \
$(ui_DATA) \
$(convert_DATA) \
$(DESKTOP_IN_FILES) \
- $(gsettings_SCHEMAS).in.in \
- $(UI_FILES)
+ $(gsettings_SCHEMAS).in.in
DISTCLEANFILES = \
$(DESKTOP_FILES) \
diff --git a/plugins/statusbar-date/eom-statusbar-date-plugin.c b/plugins/statusbar-date/eom-statusbar-date-plugin.c
index c874688..fc3e152 100644
--- a/plugins/statusbar-date/eom-statusbar-date-plugin.c
+++ b/plugins/statusbar-date/eom-statusbar-date-plugin.c
@@ -82,7 +82,7 @@ static void statusbar_set_date(GtkStatusbar* statusbar, EomThumbView* view)
if (exif_data)
{
date = eom_exif_util_format_date(eom_exif_data_get_value(exif_data, EXIF_TAG_DATE_TIME_ORIGINAL, time_buffer, 32));
- exif_data_free (exif_data);
+ eom_exif_data_free (exif_data);
}
if (date)